More test tweaks

3 files changed, 4 insertions, 1 deletions

diff --git a/lib/B/Deparse-core.t b/lib/B/Deparse-core.t
index f839e88d8b..60702c6d9d 100644
--- a/lib/B/Deparse-core.t
+++ b/lib/B/Deparse-core.t
@@ -40,6 +40,7 @@ plan tests => 2071;
 
 use feature (sprintf(":%vd", $^V)); # to avoid relying on the feature
                                     # logic to add CORE::
+no warnings 'experimental::aggref';
 use B::Deparse;
 my $deparse = new B::Deparse;
 
@@ -92,6 +93,7 @@ sub testit {
 
 	unless ($got_text =~ /^{
     package test;
+    BEGIN {\${\^WARNING_BITS} = "[^"]*"}
     use strict 'refs', 'subs';
     use feature [^\n]+
     \Q$vars\E\(\) = (.*)
diff --git a/lib/B/Deparse.t b/lib/B/Deparse.t
index 904251a93b..47feb4be24 100644
--- a/lib/B/Deparse.t
+++ b/lib/B/Deparse.t
@@ -10,7 +10,6 @@ BEGIN {
 }
 
 use warnings;
-no  warnings 'experimental::aggref';
 use strict;
 use Test::More;
 
@@ -977,6 +976,7 @@ tr/a/b/r;
 <a,>;
 ####
 # [perl #91008]
+# CONTEXT no warnings 'experimental::aggref';
 each $@;
 keys $~;
 values $!;
diff --git a/lib/locale.t b/lib/locale.t
index fee2fc885a..641e858a5a 100644
--- a/lib/locale.t
+++ b/lib/locale.t
@@ -2035,6 +2035,7 @@ foreach $test_num ($first_locales_test_number..$final_locales_test_number) {
 	    print "# not in Perl itself.\n";
 	}
         if ($Okay{$test_num} && grep { $_ == $test_num } @problematical_tests) {
+            no warnings 'experimental::aggref';
             # Round to nearest .1%
             my $percent_fail = (int(.5 + (1000 * scalar(keys $Problem{$test_num})
                                           / scalar(@Locale))))