diff --git a/testing/btest/Baseline/language.blank-local-3/.stderr b/testing/btest/Baseline/language.blank-local-3/.stderr
deleted file mode 100644
index 49d861c74c..0000000000
--- a/testing/btest/Baseline/language.blank-local-3/.stderr
+++ /dev/null
@@ -1 +0,0 @@
-### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
diff --git a/testing/btest/Baseline/language.blank-local-4/.stderr b/testing/btest/Baseline/language.blank-local-4/.stderr
deleted file mode 100644
index 49d861c74c..0000000000
--- a/testing/btest/Baseline/language.blank-local-4/.stderr
+++ /dev/null
@@ -1 +0,0 @@
-### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
diff --git a/testing/btest/Baseline/language.expire-expr-error/output b/testing/btest/Baseline/language.expire-expr-error/.stderr
similarity index 100%
rename from testing/btest/Baseline/language.expire-expr-error/output
rename to testing/btest/Baseline/language.expire-expr-error/.stderr
diff --git a/testing/btest/Baseline/language.blank-local-2/.stderr b/testing/btest/Baseline/language.expire-expr-error/.stdout
similarity index 82%
rename from testing/btest/Baseline/language.blank-local-2/.stderr
rename to testing/btest/Baseline/language.expire-expr-error/.stdout
index 49d861c74c..f26ab9958d 100644
--- a/testing/btest/Baseline/language.blank-local-2/.stderr
+++ b/testing/btest/Baseline/language.expire-expr-error/.stdout
@@ -1 +1,5 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+Run 0
+Run 1
+Run 2
+Run 3
diff --git a/testing/btest/Baseline.cpp/language.expire-expr-error/output b/testing/btest/Baseline/language.record-recursive-table2/output
similarity index 54%
rename from testing/btest/Baseline.cpp/language.expire-expr-error/output
rename to testing/btest/Baseline/language.record-recursive-table2/output
index 1f379ec328..0a6d1007b3 100644
--- a/testing/btest/Baseline.cpp/language.expire-expr-error/output
+++ b/testing/btest/Baseline/language.record-recursive-table2/output
@@ -1,3 +1,7 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-event(), []
-event(s:string), [abc]
+===, 0, {
+
+}
+===, 1, {
+[[id=1, foo=<uninitialized>]] = [id=2, foo=[id=1, foo=<uninitialized>]]
+}
diff --git a/testing/btest/bifs/disable_analyzer-for-conn.zeek b/testing/btest/bifs/disable_analyzer-for-conn.zeek
index 18143e9030..2adab4059e 100644
--- a/testing/btest/bifs/disable_analyzer-for-conn.zeek
+++ b/testing/btest/bifs/disable_analyzer-for-conn.zeek
@@ -1,5 +1,8 @@
 # Verifies analyzer ID retrieval from a connection.
 #
+# Not compatible with -O gen-C++ due to use of multiple scripts.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+#
 # @TEST-EXEC: zeek -b -r ${TRACES}/ssh/ssh-on-port-80.trace %INPUT >output
 # @TEST-EXEC: btest-diff output
 
diff --git a/testing/btest/language/blank-local.zeek b/testing/btest/language/blank-local.zeek
index edede48d08..8c6927c2be 100644
--- a/testing/btest/language/blank-local.zeek
+++ b/testing/btest/language/blank-local.zeek
@@ -7,21 +7,18 @@ event zeek_init()
 	local _ = "1";
 	}
 
-#@TEST-START-NEXT
 event zeek_init()
 	{
 	local _: string = "1";
 	local _: count = 1;
 	}
 
-#@TEST-START-NEXT
 event zeek_init()
 	{
 	local _: string = "1";
 	const _: count = 1;
 	}
 
-#@TEST-START-NEXT
 event zeek_init()
 	{
 	const _: string = "1";
diff --git a/testing/btest/language/expire-expr-error.zeek b/testing/btest/language/expire-expr-error.zeek
index 5e6f0b4e6f..43dff6481a 100644
--- a/testing/btest/language/expire-expr-error.zeek
+++ b/testing/btest/language/expire-expr-error.zeek
@@ -1,6 +1,6 @@
 # @TEST-EXEC: zeek -b %INPUT
-# @TEST-EXEC: cp .stderr output
-# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stdout
 
 redef exit_only_after_terminate = T;
 
diff --git a/testing/btest/language/record-recursive-table.zeek b/testing/btest/language/record-recursive-table.zeek
index 29163912c0..42f037f55a 100644
--- a/testing/btest/language/record-recursive-table.zeek
+++ b/testing/btest/language/record-recursive-table.zeek
@@ -34,23 +34,3 @@ event zeek_init()
 	# This will be size 1
 	print "===", |tbl|, tbl;
 	}
-
-#@TEST-START-NEXT
-
-type Foo: record {
-	id: string;
-};
-
-redef record Foo += {
-	foo: Foo &optional;
-};
-
-event zeek_init()
-	{
-	local tbl: table[Foo] of Foo;
-	local f1 = Foo($id="1");
-	local f2 = Foo($id="2", $foo=f1);
-	print "===", |tbl|, tbl;
-	tbl[f1] = f2;
-	print "===", |tbl|, tbl;
-	}
diff --git a/testing/btest/language/record-recursive-table2.zeek b/testing/btest/language/record-recursive-table2.zeek
new file mode 100644
index 0000000000..366f48d883
--- /dev/null
+++ b/testing/btest/language/record-recursive-table2.zeek
@@ -0,0 +1,20 @@
+# @TEST-EXEC: zeek -b %INPUT >output
+# @TEST-EXEC: btest-diff output
+
+type Foo: record {
+	id: string;
+};
+
+redef record Foo += {
+	foo: Foo &optional;
+};
+
+event zeek_init()
+	{
+	local tbl: table[Foo] of Foo;
+	local f1 = Foo($id="1");
+	local f2 = Foo($id="2", $foo=f1);
+	print "===", |tbl|, tbl;
+	tbl[f1] = f2;
+	print "===", |tbl|, tbl;
+	}