diff --git a/contrib/amcheck/t/003_cic_2pc.pl b/contrib/amcheck/t/003_cic_2pc.pl
index 2f804efb845..44b425f5587 100644
--- a/contrib/amcheck/t/003_cic_2pc.pl
+++ b/contrib/amcheck/t/003_cic_2pc.pl
@@ -11,7 +11,8 @@ use PostgreSQL::Test::Utils;
 
 use Test::More tests => 5;
 
-local $TODO = 'filesystem bug' if PostgreSQL::Test::Utils::has_wal_read_bug;
+Test::More->builder->todo_start('filesystem bug')
+  if PostgreSQL::Test::Utils::has_wal_read_bug;
 
 my ($node, $result);
 
diff --git a/src/test/recovery/t/027_stream_regress.pl b/src/test/recovery/t/027_stream_regress.pl
index cd8163a4b53..37449006c1c 100644
--- a/src/test/recovery/t/027_stream_regress.pl
+++ b/src/test/recovery/t/027_stream_regress.pl
@@ -8,8 +8,8 @@ use File::Basename;
 
 if (PostgreSQL::Test::Utils::has_wal_read_bug)
 {
-	# We'd prefer to use "local $TODO", but the bug causes this test file to
-	# die(), not merely to fail.
+	# We'd prefer to use Test::More->builder->todo_start, but the bug causes
+	# this test file to die(), not merely to fail.
 	plan skip_all => 'filesystem bug';
 }
 else