diff --git a/testing/btest/coverage/find-bro-logs.test b/testing/btest/coverage/find-bro-logs.test
index 1dd68d1492..d475ab1482 100644
--- a/testing/btest/coverage/find-bro-logs.test
+++ b/testing/btest/coverage/find-bro-logs.test
@@ -18,7 +18,7 @@ fi
 
 python3 find_logs.py "${BROSCRIPTS}" | sort > out
 
-@TEST-START-FILE find_logs.py
+# @TEST-START-FILE find_logs.py
 import os, sys
 import re
 
@@ -70,4 +70,4 @@ for fname in find_scripts():
         if idx > 0:
             m = re.match('.*\$path\s*=\s*"?(\w+)"?.*', line[idx:])
             print(m.group(1))
-@TEST-END-FILE
+# @TEST-END-FILE
diff --git a/testing/btest/coverage/test-all-policy-cluster.test b/testing/btest/coverage/test-all-policy-cluster.test
index b91e96a75e..7bbe320789 100644
--- a/testing/btest/coverage/test-all-policy-cluster.test
+++ b/testing/btest/coverage/test-all-policy-cluster.test
@@ -20,7 +20,7 @@
 # calls in some scripts.
 redef Cluster::backend = Cluster::CLUSTER_BACKEND_BROKER;
 
-@TEST-START-FILE cluster-layout.zeek
+# @TEST-START-FILE cluster-layout.zeek
 redef Cluster::nodes = {
 	["manager"]  = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
 	["logger-1"] = [$node_type=Cluster::LOGGER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2"))],
@@ -28,7 +28,7 @@ redef Cluster::nodes = {
 	["worker-1"] = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT4"))],
 };
 
-@TEST-END-FILE
+# @TEST-END-FILE
 
 # Make this a single-node cluster-layout so no connection attempts happen
 # to other nodes.
diff --git a/testing/btest/coverage/test-all-policy.test b/testing/btest/coverage/test-all-policy.test
index 46571d967e..a497843729 100644
--- a/testing/btest/coverage/test-all-policy.test
+++ b/testing/btest/coverage/test-all-policy.test
@@ -4,9 +4,9 @@
 # This test will fail if new zeek scripts are added to the scripts/policy/
 # directory.  Correcting that just involves updating
 # scripts/test-all-policy.zeek to @load the new zeek scripts.
-
-@TEST-EXEC: test -e $DIST/scripts/test-all-policy.zeek
-@TEST-EXEC: test -d $DIST/scripts
-@TEST-EXEC: ( cd $DIST/scripts/policy && find . -name '*.zeek' ) | sort >"all scripts found"
-@TEST-EXEC: cat $DIST/scripts/test-all-policy.zeek | grep '@load' | sed 'sm^\( *# *\)\{0,\}@load *m./mg' | sort >test-all-policy.zeek
-@TEST-EXEC: diff -u "all scripts found" test-all-policy.zeek 1>&2
+#
+# @TEST-EXEC: test -e $DIST/scripts/test-all-policy.zeek
+# @TEST-EXEC: test -d $DIST/scripts
+# @TEST-EXEC: ( cd $DIST/scripts/policy && find . -name '*.zeek' ) | sort >"all scripts found"
+# @TEST-EXEC: cat $DIST/scripts/test-all-policy.zeek | grep '@load' | sed 'sm^\( *# *\)\{0,\}@load *m./mg' | sort >test-all-policy.zeek
+# @TEST-EXEC: diff -u "all scripts found" test-all-policy.zeek 1>&2
diff --git a/testing/btest/scripts/base/files/x509/log-caching-cluster.test b/testing/btest/scripts/base/files/x509/log-caching-cluster.test
index 540c9e8fed..5416562886 100644
--- a/testing/btest/scripts/base/files/x509/log-caching-cluster.test
+++ b/testing/btest/scripts/base/files/x509/log-caching-cluster.test
@@ -13,13 +13,13 @@
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff manager-1/x509.log
 
-@TEST-START-FILE cluster-layout.zeek
+# @TEST-START-FILE cluster-layout.zeek
 redef Cluster::nodes = {
 	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
 	["worker-1"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],
 	["worker-2"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"],
 };
-@TEST-END-FILE
+# @TEST-END-FILE
 
 @load base/protocols/ssl
 @load base/frameworks/cluster
diff --git a/testing/btest/scripts/base/files/x509/log-caching-disabled-cluster.test b/testing/btest/scripts/base/files/x509/log-caching-disabled-cluster.test
index 639fd5f332..051fe9dfce 100644
--- a/testing/btest/scripts/base/files/x509/log-caching-disabled-cluster.test
+++ b/testing/btest/scripts/base/files/x509/log-caching-disabled-cluster.test
@@ -13,13 +13,13 @@
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff manager-1/x509.log
 
-@TEST-START-FILE cluster-layout.zeek
+# @TEST-START-FILE cluster-layout.zeek
 redef Cluster::nodes = {
 	["manager-1"] = [$node_type=Cluster::MANAGER, $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT1"))],
 	["worker-1"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT2")), $manager="manager-1"],
 	["worker-2"]  = [$node_type=Cluster::WORKER,  $ip=127.0.0.1, $p=to_port(getenv("BROKER_PORT3")), $manager="manager-1"],
 };
-@TEST-END-FILE
+# @TEST-END-FILE
 
 @load base/protocols/ssl
 @load base/frameworks/cluster
diff --git a/testing/btest/scripts/base/utils/dir.test b/testing/btest/scripts/base/utils/dir.test
index 64823a1aaf..d82173a2c1 100644
--- a/testing/btest/scripts/base/utils/dir.test
+++ b/testing/btest/scripts/base/utils/dir.test
@@ -7,7 +7,7 @@
 # @TEST-EXEC: btest-bg-wait 20
 # @TEST-EXEC: btest-diff zeek/.stdout
 
-@TEST-START-FILE dirtest.zeek
+# @TEST-START-FILE dirtest.zeek
 
 @load base/utils/dir
 redef exit_only_after_terminate = T;
@@ -51,16 +51,16 @@ event zeek_init()
 	Dir::monitor("../testdir", new_file, .25sec);
 	}
 
-@TEST-END-FILE
+# @TEST-END-FILE
 
-@TEST-START-FILE testdir/hi
+# @TEST-START-FILE testdir/hi
 123
-@TEST-END-FILE
+# @TEST-END-FILE
 
-@TEST-START-FILE testdir/howsitgoing
+# @TEST-START-FILE testdir/howsitgoing
 abc
-@TEST-END-FILE
+# @TEST-END-FILE
 
-@TEST-START-FILE testdir/bye
+# @TEST-START-FILE testdir/bye
 !@#
-@TEST-END-FILE
+# @TEST-END-FILE
diff --git a/testing/btest/scripts/base/utils/exec.test b/testing/btest/scripts/base/utils/exec.test
index 7cf64908ae..b68d1a28c3 100644
--- a/testing/btest/scripts/base/utils/exec.test
+++ b/testing/btest/scripts/base/utils/exec.test
@@ -2,7 +2,7 @@
 # @TEST-EXEC: btest-bg-wait 15
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff zeek/.stdout
 
-@TEST-START-FILE exectest.zeek
+# @TEST-START-FILE exectest.zeek
 
 @load base/utils/exec
 redef exit_only_after_terminate = T;
@@ -59,9 +59,9 @@ event zeek_init()
 	                   $read_files=set("out3", "out4")]);
 	}
 
-@TEST-END-FILE
+# @TEST-END-FILE
 
-@TEST-START-FILE somescript.sh
+# @TEST-START-FILE somescript.sh
 #! /usr/bin/env bash
 echo "insert text here" > out1
 echo "and here" >> out1
@@ -70,9 +70,9 @@ echo "and there" >> out2
 echo "done"
 echo "exit"
 echo "stop"
-@TEST-END-FILE
+# @TEST-END-FILE
 
-@TEST-START-FILE nofiles.sh
+# @TEST-START-FILE nofiles.sh
 #! /usr/bin/env bash
 echo "here's something on stdout"
 echo "some more stdout"
@@ -81,23 +81,23 @@ echo "and some stderr" 1>&2
 echo "more stderr" 1>&2
 echo "last stderr" 1>&2
 exit 1
-@TEST-END-FILE
+# @TEST-END-FILE
 
-@TEST-START-FILE suicide.sh
+# @TEST-START-FILE suicide.sh
 #! /usr/bin/env bash
 echo "FML"
 kill -9 $$
 echo "nope"
-@TEST-END-FILE
+# @TEST-END-FILE
 
-@TEST-START-FILE stdin.sh
+# @TEST-START-FILE stdin.sh
 #! /usr/bin/env bash
 read -r line
 echo "$line"
-@TEST-END-FILE
+# @TEST-END-FILE
 
-@TEST-START-FILE empty_file.sh
+# @TEST-START-FILE empty_file.sh
 #! /usr/bin/env bash
 touch out3
 echo "test" > out4
-@TEST-END-FILE
+# @TEST-END-FILE
diff --git a/testing/btest/scripts/base/utils/site-defaults.test b/testing/btest/scripts/base/utils/site-defaults.test
index 7ff587e8e1..c32ff89a73 100644
--- a/testing/btest/scripts/base/utils/site-defaults.test
+++ b/testing/btest/scripts/base/utils/site-defaults.test
@@ -6,7 +6,7 @@
 # @TEST-EXEC: zeek -b %INPUT > output
 # @TEST-EXEC: btest-diff output
 
-@TEST-START-FILE common.zeek
+# @TEST-START-FILE common.zeek
 function check_addr(ip: addr)
 	{
 	print fmt("%s is private: %s", ip, Site::is_private_addr(ip));
@@ -23,36 +23,36 @@ event zeek_init()
 	check_addr(10.0.0.1);
 	check_addr(1.2.3.4);
 	}
-@TEST-END-FILE
+# @TEST-END-FILE
 
 # (1) The common case: 10/8 is private, implying local, and 1/8 is not.
 @load ./common
 
-@TEST-START-NEXT
+# @TEST-START-NEXT
 
 # (2) Removing 10/8 from private space implies we remove it from local, too.
 @load ./common
 redef Site::private_address_space -= { 10.0.0.0/8 };
 
-@TEST-START-NEXT
+# @TEST-START-NEXT
 
 # (3) Adding 1/8 to private space implies we add it to local, too.
 @load ./common
 redef Site::private_address_space = { 1.0.0.0/8 };
 
-@TEST-START-NEXT
+# @TEST-START-NEXT
 
 # (4) Adding 1/8 to local space doesn't change the private one.
 @load ./common
 redef Site::local_nets += { 1.0.0.0/8 };
 
-@TEST-START-NEXT
+# @TEST-START-NEXT
 
 # (5) Resetting the local space to 1/8 does not lose the private space.
 @load ./common
 redef Site::local_nets = { 1.0.0.0/8 };
 
-@TEST-START-NEXT
+# @TEST-START-NEXT
 
 # (6) Resetting the private space dynamically does propagate into local space.
 @load ./common
@@ -62,7 +62,7 @@ event zeek_init() &priority=5
 	Config::set_value("Site::private_address_space", set(1.0.0.0/8));
 	}
 
-@TEST-START-NEXT
+# @TEST-START-NEXT
 
 # (7) Resetting local space dynamically does not lose the private space.
 @load ./common
@@ -72,14 +72,14 @@ event zeek_init() &priority=5
 	Config::set_value("Site::local_nets", set(1.0.0.0/8));
 	}
 
-@TEST-START-NEXT
+# @TEST-START-NEXT
 
 # (8) Disable the private-means-local implication and verify defaults.
 @load ./common
 
 redef Site::private_address_space_is_local = F;
 
-@TEST-START-NEXT
+# @TEST-START-NEXT
 
 # (9) Disable the private-means-local implication and alter both.
 @load ./common
diff --git a/testing/btest/scripts/site/local-compat.test b/testing/btest/scripts/site/local-compat.test
index 5162013b15..854021b596 100644
--- a/testing/btest/scripts/site/local-compat.test
+++ b/testing/btest/scripts/site/local-compat.test
@@ -15,7 +15,7 @@
 # # simply update this test's TEST-START-FILE with the latest contents
 # site/local.zeek.
 
-@TEST-START-FILE local-7.2.zeek
+# @TEST-START-FILE local-7.2.zeek
 ##! Local site policy. Customize as appropriate.
 ##!
 ##! This file will not be overwritten when upgrading or reinstalling!
@@ -122,4 +122,4 @@ redef digest_salt = "Please change this value.";
 
 # Uncomment this to source zkg's package state
 # @load packages
-@TEST-END-FILE
+# @TEST-END-FILE