diff --git a/tests/browser/LocalSettings.php b/tests/browser/LocalSettings.php
index 40a87347c..f71be2f57 100644
--- a/tests/browser/LocalSettings.php
+++ b/tests/browser/LocalSettings.php
@@ -19,6 +19,11 @@ $wgHooks['InterwikiLoadPrefix'][] = function ( $prefix, &$iwdata ) {
 };
 $wgInterwikiCache = false;
 
+$wgMinervaPageIssuesNewTreatment = [
+	"base" => true,
+	"beta" => true,
+];
+
 $wgMFEnableBeta = true;
 
 // Set the desktop skin to MinervaNeue. Otherwise, it will try to guess the skin name using the
diff --git a/tests/browser/features/support/pages/article_page.rb b/tests/browser/features/support/pages/article_page.rb
index 80930d76d..b66ea6055 100644
--- a/tests/browser/features/support/pages/article_page.rb
+++ b/tests/browser/features/support/pages/article_page.rb
@@ -178,7 +178,10 @@ class ArticlePage
   h2(:third_section, css: '.collapsible-block', index: 2)
 
   # issues
-  a(:issues_stamp, css: '.mw-mf-cleanup')
+  # We use 2 selectors here - the first relates to the old treatment (A) and
+  # the 2nd relates to the new treatment (.ambox)
+  # see https://phabricator.wikimedia.org/T206647
+  a(:issues_stamp, css: '.mw-mf-cleanup, .ambox')
 
   # page info (action=info)
   td(:edit_count, css: '#mw-pageinfo-edits td', index: 1)