diff --git a/testing/btest/cluster/broker/publish-any.zeek b/testing/btest/cluster/broker/publish-any.zeek
index 818d153ce4..3a9289676c 100644
--- a/testing/btest/cluster/broker/publish-any.zeek
+++ b/testing/btest/cluster/broker/publish-any.zeek
@@ -19,15 +19,15 @@ redef Cluster::nodes = {
 };
 # @TEST-END-FILE
 
-# # @TEST-START-FILE common.zeek
+# @TEST-START-FILE common.zeek
 redef Log::default_rotation_interval = 0sec;
 
 global finish: event() &is_used;
 global ping: event(c: count, what: string, val: any) &is_used;
 global pong: event(c: count, what: string, val: any) &is_used;
-# # @TEST-END-FILE
+# @TEST-END-FILE
 
-# # @TEST-START-FILE manager.zeek
+# @TEST-START-FILE manager.zeek
 @load ./common.zeek
 
 global i = 0;
@@ -86,10 +86,10 @@ event Cluster::node_down(name: string, id: string)
 	{
 	terminate();
 	}
-# # @TEST-END-FILE
+# @TEST-END-FILE
 
 
-# # @TEST-START-FILE worker.zeek
+# @TEST-START-FILE worker.zeek
 @load ./common.zeek
 
 event ping(c: count, what: string, val: any)
@@ -109,4 +109,4 @@ event finish()
 	print "got finish!";
 	terminate();
 	}
-# # @TEST-END-FILE
+# @TEST-END-FILE
diff --git a/testing/btest/cluster/generic/logging-rr.zeek b/testing/btest/cluster/generic/logging-rr.zeek
index 3af8d1d310..a5560d1cd5 100644
--- a/testing/btest/cluster/generic/logging-rr.zeek
+++ b/testing/btest/cluster/generic/logging-rr.zeek
@@ -32,7 +32,7 @@
 # @TEST-EXEC: sort -n rr2.log > rr2.log.sorted
 # @TEST-EXEC: btest-diff rr2.log.sorted
 
-# # @TEST-START-FILE common.zeek
+# @TEST-START-FILE common.zeek
 @load ./zeromq-test-bootstrap.zeek
 
 redef Log::default_rotation_interval = 0sec;
@@ -62,9 +62,9 @@ event finish()
 	{
 	terminate();
 	}
-# # @TEST-END-FILE
+# @TEST-END-FILE
 
-# # @TEST-START-FILE manager.zeek
+# @TEST-START-FILE manager.zeek
 @load ./common.zeek
 
 event check_ready()
@@ -103,10 +103,10 @@ event Cluster::node_down(name: string, id: string)
 	if ( |nodes_down| == 4 )  # both loggers down
 		terminate();
 	}
-# # @TEST-END-FILE
+# @TEST-END-FILE
 
 
-# # @TEST-START-FILE worker.zeek
+# @TEST-START-FILE worker.zeek
 @load ./common.zeek
 
 global do_write2 = F;
@@ -147,7 +147,7 @@ event zeek_init()
 	event write_log1(0);
 	}
 
-# # @TEST-END-FILE
+# @TEST-END-FILE
 
 # @TEST-START-FILE check-log.sh
 #!/usr/bin/env bash
diff --git a/testing/btest/cluster/websocket/bad-event-args.zeek b/testing/btest/cluster/websocket/bad-event-args.zeek
index 17c3065d89..ad938e1b84 100644
--- a/testing/btest/cluster/websocket/bad-event-args.zeek
+++ b/testing/btest/cluster/websocket/bad-event-args.zeek
@@ -25,7 +25,7 @@
 # @TEST-EXEC: btest-diff ./client/out
 # @TEST-EXEC: btest-diff ./client/.stderr
 
-# # @TEST-START-FILE manager.zeek
+# @TEST-START-FILE manager.zeek
 @load ./zeromq-test-bootstrap
 redef exit_only_after_terminate = T;
 
@@ -55,7 +55,7 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
 	print "Cluster::websocket_client_lost";
 	terminate();
 	}
-# # @TEST-END-FILE
+# @TEST-END-FILE
 
 
 # @TEST-START-FILE client.py
diff --git a/testing/btest/cluster/websocket/bad-subscriptions.zeek b/testing/btest/cluster/websocket/bad-subscriptions.zeek
index e70e70f7e3..7b32248793 100644
--- a/testing/btest/cluster/websocket/bad-subscriptions.zeek
+++ b/testing/btest/cluster/websocket/bad-subscriptions.zeek
@@ -25,7 +25,7 @@
 # @TEST-EXEC: btest-diff ./client/out
 # @TEST-EXEC: btest-diff ./client/.stderr
 
-# # @TEST-START-FILE manager.zeek
+# @TEST-START-FILE manager.zeek
 @load ./zeromq-test-bootstrap
 redef exit_only_after_terminate = T;
 
@@ -54,7 +54,7 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
 	if ( lost == 4 )
 		terminate();
 	}
-# # @TEST-END-FILE
+# @TEST-END-FILE
 
 
 # @TEST-START-FILE client.py
diff --git a/testing/btest/cluster/websocket/bad-url.zeek b/testing/btest/cluster/websocket/bad-url.zeek
index d70acf751a..27215835a3 100644
--- a/testing/btest/cluster/websocket/bad-url.zeek
+++ b/testing/btest/cluster/websocket/bad-url.zeek
@@ -25,7 +25,7 @@
 # @TEST-EXEC: btest-diff ./client/out
 # @TEST-EXEC: btest-diff ./client/.stderr
 
-# # @TEST-START-FILE manager.zeek
+# @TEST-START-FILE manager.zeek
 @load ./zeromq-test-bootstrap
 redef exit_only_after_terminate = T;
 
@@ -58,7 +58,7 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
 	print "Cluster::websocket_client_lost";
 	terminate();
 	}
-# # @TEST-END-FILE
+# @TEST-END-FILE
 
 
 # @TEST-START-FILE client.py
diff --git a/testing/btest/cluster/websocket/cluster-log.zeek b/testing/btest/cluster/websocket/cluster-log.zeek
index 5770543b85..544e363ee5 100644
--- a/testing/btest/cluster/websocket/cluster-log.zeek
+++ b/testing/btest/cluster/websocket/cluster-log.zeek
@@ -27,7 +27,7 @@
 # @TEST-EXEC: btest-diff ./client/out
 # @TEST-EXEC: btest-diff ./client/.stderr
 
-# # @TEST-START-FILE manager.zeek
+# @TEST-START-FILE manager.zeek
 @load ./zeromq-test-bootstrap
 redef exit_only_after_terminate = T;
 
@@ -70,7 +70,7 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
 	if ( lost == 3 )
 		terminate();
 	}
-# # @TEST-END-FILE
+# @TEST-END-FILE
 
 
 # @TEST-START-FILE client.py
diff --git a/testing/btest/cluster/websocket/one-pipelining.zeek b/testing/btest/cluster/websocket/one-pipelining.zeek
index 6253e07b00..c73c530993 100644
--- a/testing/btest/cluster/websocket/one-pipelining.zeek
+++ b/testing/btest/cluster/websocket/one-pipelining.zeek
@@ -25,7 +25,7 @@
 # @TEST-EXEC: btest-diff ./client/out
 # @TEST-EXEC: btest-diff ./client/.stderr
 
-# # @TEST-START-FILE manager.zeek
+# @TEST-START-FILE manager.zeek
 @load ./zeromq-test-bootstrap
 redef exit_only_after_terminate = T;
 
@@ -58,7 +58,7 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
 	print "Cluster::websocket_client_lost";
 	terminate();
 	}
-# # @TEST-END-FILE
+# @TEST-END-FILE
 
 
 # @TEST-START-FILE client.py
diff --git a/testing/btest/cluster/websocket/one.zeek b/testing/btest/cluster/websocket/one.zeek
index 1f2ba6919a..420b63716e 100644
--- a/testing/btest/cluster/websocket/one.zeek
+++ b/testing/btest/cluster/websocket/one.zeek
@@ -25,7 +25,7 @@
 # @TEST-EXEC: btest-diff ./client/out
 # @TEST-EXEC: btest-diff ./client/.stderr
 
-# # @TEST-START-FILE manager.zeek
+# @TEST-START-FILE manager.zeek
 @load ./zeromq-test-bootstrap
 redef exit_only_after_terminate = T;
 
@@ -58,7 +58,7 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
 	print "Cluster::websocket_client_lost";
 	terminate();
 	}
-# # @TEST-END-FILE
+# @TEST-END-FILE
 
 
 # @TEST-START-FILE client.py
diff --git a/testing/btest/cluster/websocket/three.zeek b/testing/btest/cluster/websocket/three.zeek
index ab8d68aaa2..05e85d5708 100644
--- a/testing/btest/cluster/websocket/three.zeek
+++ b/testing/btest/cluster/websocket/three.zeek
@@ -26,7 +26,7 @@
 # @TEST-EXEC: btest-diff ./client/out
 # @TEST-EXEC: btest-diff ./client/.stderr
 
-# # @TEST-START-FILE manager.zeek
+# @TEST-START-FILE manager.zeek
 @load ./zeromq-test-bootstrap
 redef exit_only_after_terminate = T;
 
@@ -74,7 +74,7 @@ event zeek_init()
 	Cluster::listen_websocket([$listen_host="127.0.0.1", $listen_port=to_port(getenv("WEBSOCKET_PORT"))]);
 	Cluster::subscribe("/test/manager");
 	}
-# # @TEST-END-FILE
+# @TEST-END-FILE
 
 
 # @TEST-START-FILE client.py
diff --git a/testing/btest/cluster/websocket/tls.zeek b/testing/btest/cluster/websocket/tls.zeek
index 73b3be5572..4e9015cca3 100644
--- a/testing/btest/cluster/websocket/tls.zeek
+++ b/testing/btest/cluster/websocket/tls.zeek
@@ -27,7 +27,7 @@
 # @TEST-EXEC: btest-diff ./client/out
 # @TEST-EXEC: btest-diff ./client/.stderr
 
-# # @TEST-START-FILE manager.zeek
+# @TEST-START-FILE manager.zeek
 @load ./zeromq-test-bootstrap
 redef exit_only_after_terminate = T;
 
@@ -72,7 +72,7 @@ event Cluster::websocket_client_lost(info: Cluster::EndpointInfo)
 	print "Cluster::websocket_client_lost";
 	terminate();
 	}
-# # @TEST-END-FILE
+# @TEST-END-FILE
 
 
 # @TEST-START-FILE client.py
diff --git a/testing/btest/cluster/websocket/two-pipelining.zeek b/testing/btest/cluster/websocket/two-pipelining.zeek
index 4f3b54e900..e70c3f2fff 100644
--- a/testing/btest/cluster/websocket/two-pipelining.zeek
+++ b/testing/btest/cluster/websocket/two-pipelining.zeek
@@ -26,7 +26,7 @@
 # @TEST-EXEC: btest-diff ./client/out
 # @TEST-EXEC: btest-diff ./client/.stderr
 
-# # @TEST-START-FILE manager.zeek
+# @TEST-START-FILE manager.zeek
 @load ./zeromq-test-bootstrap
 redef exit_only_after_terminate = T;
 
@@ -106,7 +106,7 @@ event zeek_init()
 	Cluster::listen_websocket([$listen_host="127.0.0.1", $listen_port=to_port(getenv("WEBSOCKET_PORT"))]);
 	Cluster::subscribe("/test/manager");
 	}
-# # @TEST-END-FILE
+# @TEST-END-FILE
 
 
 # @TEST-START-FILE client.py
diff --git a/testing/btest/core/record-field-redef-errors.zeek b/testing/btest/core/record-field-redef-errors.zeek
index 449b4bbb40..7093ea2799 100644
--- a/testing/btest/core/record-field-redef-errors.zeek
+++ b/testing/btest/core/record-field-redef-errors.zeek
@@ -45,7 +45,7 @@ redef record M::Info$no_such_field -= { &log };
 # This isn't reported very nicely: It's a syntax error rather than an unknown attribute
 redef record M::Info$ts += { &unknown };
 
-# # @TEST-START-FILE setup.zeek
+# @TEST-START-FILE setup.zeek
 module M;
 export {
 	type ErrCode: enum {
diff --git a/testing/btest/scripts/base/files/x509/disable-certificate-events-known-certs.zeek b/testing/btest/scripts/base/files/x509/disable-certificate-events-known-certs.zeek
index 22615b4efb..a34b2cac15 100644
--- a/testing/btest/scripts/base/files/x509/disable-certificate-events-known-certs.zeek
+++ b/testing/btest/scripts/base/files/x509/disable-certificate-events-known-certs.zeek
@@ -27,7 +27,7 @@ hook X509::x509_certificate_cache_replay(f: fa_file, e: X509::Info, sha256: stri
 
 # First: Plain, no changes - certificate event caching won't even engage.
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 
 # Second - engage certificate caching.
 # Log files and events are unchanged - but the replay hook engages
@@ -35,7 +35,7 @@ hook X509::x509_certificate_cache_replay(f: fa_file, e: X509::Info, sha256: stri
 redef X509::caching_required_encounters = 1;
 redef X509::certificate_cache_minimum_eviction_interval = 11min;
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 
 # Third - load policy script to not raise events
 # Log files are unchanged; events are not raised from the third time.
diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.zeek b/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.zeek
index fec3645fee..2c4b83ca9b 100644
--- a/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.zeek
+++ b/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-prefix.zeek
@@ -28,7 +28,7 @@ event zeek_init()
 			  $destination=destination, $want_record=F]);
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 #
 # The same test, but using event streams for input.
 
@@ -41,7 +41,7 @@ event zeek_init()
 			  $fields=Val, $ev=inputev]);
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 #
 # The same test again, but using file analysis w/ binary readers.
 
diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.zeek b/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.zeek
index e36ea62e05..09605d5c64 100644
--- a/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.zeek
+++ b/testing/btest/scripts/base/frameworks/input/path-prefix/absolute-source.zeek
@@ -22,7 +22,7 @@ event zeek_init()
 			  $destination=destination, $want_record=F]);
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 #
 # The same test, but using event streams for input.
 
@@ -35,7 +35,7 @@ event zeek_init()
 			  $fields=Val, $ev=inputev]);
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 #
 # The same test again, but using file analysis w/ binary readers.
 
diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.zeek b/testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.zeek
index 57cf5993c0..9c7f467c56 100644
--- a/testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.zeek
+++ b/testing/btest/scripts/base/frameworks/input/path-prefix/no-paths.zeek
@@ -19,7 +19,7 @@ event zeek_init()
 			  $destination=destination, $want_record=F]);
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 #
 # The same test, but using event streams for input.
 
@@ -31,7 +31,7 @@ event zeek_init()
                           $fields=Val, $ev=inputev]);
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 #
 # The same test again, but using file analysis w/ binary readers.
 
diff --git a/testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.zeek b/testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.zeek
index 8d376cc3fb..51c994923c 100644
--- a/testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.zeek
+++ b/testing/btest/scripts/base/frameworks/input/path-prefix/relative-prefix.zeek
@@ -22,7 +22,7 @@ event zeek_init()
 			  $destination=destination, $want_record=F]);
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 #
 # The same test, but using event streams for input.
 
@@ -35,7 +35,7 @@ event zeek_init()
                           $fields=Val, $ev=inputev]);
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 #
 # The same test again, but using file analysis w/ binary readers.
 
diff --git a/testing/btest/scripts/base/frameworks/logging/delay/delay-cb.zeek b/testing/btest/scripts/base/frameworks/logging/delay/delay-cb.zeek
index 658c406936..1096514f1d 100644
--- a/testing/btest/scripts/base/frameworks/logging/delay/delay-cb.zeek
+++ b/testing/btest/scripts/base/frameworks/logging/delay/delay-cb.zeek
@@ -80,7 +80,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
 		}
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 # Basic delay() test with delay_finish(), expect callback to be invoked
 # right at Log::delay_finish()
 hook Log::log_stream_policy(rec: Info, id: Log::ID)
@@ -109,7 +109,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
 		}
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 # Basic delay() test with two callbacks but just one Log::delay_finish() call.
 hook Log::log_stream_policy(rec: Info, id: Log::ID)
 	{
@@ -142,7 +142,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
 		}
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 # Basic delay() test two callbacks and two Log::delay_finish() calls.
 hook Log::log_stream_policy(rec: Info, id: Log::ID)
 	{
@@ -176,7 +176,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
 		}
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 # The delay callback suppresses the log by return F.
 hook Log::log_stream_policy(rec: Info, id: Log::ID)
 	{
@@ -203,7 +203,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
 		}
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 # Do a delay and immediate release with a callback.
 hook Log::log_stream_policy(rec: Info, id: Log::ID)
 	{
diff --git a/testing/btest/scripts/base/frameworks/logging/delay/queue-setter.zeek b/testing/btest/scripts/base/frameworks/logging/delay/queue-setter.zeek
index ad3eb50a35..0c3ea211d1 100644
--- a/testing/btest/scripts/base/frameworks/logging/delay/queue-setter.zeek
+++ b/testing/btest/scripts/base/frameworks/logging/delay/queue-setter.zeek
@@ -84,7 +84,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
 
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 #
 # Delay records for a long time, reduce queue size after 10 packets to 3,
 # re-delay all records once, provoking failure to free any space in the
diff --git a/testing/btest/scripts/base/frameworks/logging/delay/queue-test.zeek b/testing/btest/scripts/base/frameworks/logging/delay/queue-test.zeek
index fddc3a33fb..4416a9df56 100644
--- a/testing/btest/scripts/base/frameworks/logging/delay/queue-test.zeek
+++ b/testing/btest/scripts/base/frameworks/logging/delay/queue-test.zeek
@@ -75,7 +75,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
 
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 #
 # Delay every record, but call Log::delay_finish() immediately afterwards
 # through an event.
@@ -114,7 +114,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
 	event release_delay(rec, token);
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 #
 # Delay every record, and for every other record call Log::delay_finish()
 # immediately afterwards via an event.
@@ -159,7 +159,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
 
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 
 # Delay every entry by 10 seconds, but set queue size to 5 such that
 # entries are evicted when the queue size is reached.
@@ -193,7 +193,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
 	}
 
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 
 # Re-delaying works even if that results in more forceful expiration.
 redef record Info += {
@@ -239,7 +239,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
 	Log::delay(id, rec, post_delay_cb);
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 
 # Re-delay once after the delay expired.
 redef record Info += {
@@ -284,7 +284,7 @@ hook Log::log_stream_policy(rec: Info, id: Log::ID)
 	Log::delay(id, rec, post_delay_cb);
 	}
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 
 # Re-delay once after Log::delay_finish()
 redef record Info += {
diff --git a/testing/btest/scripts/base/frameworks/logging/delay/static-errors.zeek b/testing/btest/scripts/base/frameworks/logging/delay/static-errors.zeek
index 29a6057078..457db24919 100644
--- a/testing/btest/scripts/base/frameworks/logging/delay/static-errors.zeek
+++ b/testing/btest/scripts/base/frameworks/logging/delay/static-errors.zeek
@@ -17,7 +17,7 @@ hook Log::log_stream_policy(rec: Conn::Info, id: Log::ID)
 	}
 
 
-# # @TEST-START-NEXT
+# @TEST-START-NEXT
 @load base/protocols/conn
 
 # PostDelayCallback needs to return a bool