diff --git a/testing/btest/Baseline/core.load-file-extension/bro_only b/testing/btest/Baseline/core.load-file-extension/bro_only
deleted file mode 100644
index c9ea63ad07..0000000000
--- a/testing/btest/Baseline/core.load-file-extension/bro_only
+++ /dev/null
@@ -1,2 +0,0 @@
-### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-Bro script loaded
diff --git a/testing/btest/Baseline/core.load-file-extension/bro_preferred b/testing/btest/Baseline/core.load-file-extension/bro_preferred
deleted file mode 100644
index c9ea63ad07..0000000000
--- a/testing/btest/Baseline/core.load-file-extension/bro_preferred
+++ /dev/null
@@ -1,2 +0,0 @@
-### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-Bro script loaded
diff --git a/testing/btest/Baseline/core.load-file-extension/bro_preferred_2 b/testing/btest/Baseline/core.load-file-extension/bro_preferred_2
deleted file mode 100644
index c9ea63ad07..0000000000
--- a/testing/btest/Baseline/core.load-file-extension/bro_preferred_2
+++ /dev/null
@@ -1,2 +0,0 @@
-### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-Bro script loaded
diff --git a/testing/btest/Baseline/core.load-file-extension/zeek_preferred b/testing/btest/Baseline/core.load-file-extension/zeek_preferred
deleted file mode 100644
index 578c99152b..0000000000
--- a/testing/btest/Baseline/core.load-file-extension/zeek_preferred
+++ /dev/null
@@ -1,2 +0,0 @@
-### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-Zeek script loaded
diff --git a/testing/btest/Baseline/core.load-pkg/output2 b/testing/btest/Baseline/core.load-pkg/output2
deleted file mode 100644
index eb4e83a1fb..0000000000
--- a/testing/btest/Baseline/core.load-pkg/output2
+++ /dev/null
@@ -1,3 +0,0 @@
-### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-test.zeek loaded
-__load__.bro loaded
diff --git a/testing/btest/Baseline/core.load-unload/output2 b/testing/btest/Baseline/core.load-unload/output2
deleted file mode 100644
index 49d861c74c..0000000000
--- a/testing/btest/Baseline/core.load-unload/output2
+++ /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.closure-binding-errors/out b/testing/btest/Baseline/language.closure-binding-errors/out
deleted file mode 100644
index 49d861c74c..0000000000
--- a/testing/btest/Baseline/language.closure-binding-errors/out
+++ /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.common-mistakes/3.err b/testing/btest/Baseline/language.common-mistakes/3.err
deleted file mode 100644
index 41ae45fdce..0000000000
--- a/testing/btest/Baseline/language.common-mistakes/3.err
+++ /dev/null
@@ -1,2 +0,0 @@
-### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-expression error in ./3.zeek, line 5: type-checking failed in vector append (v += ok)
diff --git a/testing/btest/Baseline/language.common-mistakes/3.out b/testing/btest/Baseline/language.common-mistakes/3.out
deleted file mode 100644
index 8e1dd6eefb..0000000000
--- a/testing/btest/Baseline/language.common-mistakes/3.out
+++ /dev/null
@@ -1,2 +0,0 @@
-### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-in foo
diff --git a/testing/btest/Baseline/plugins.meta-hook/out1 b/testing/btest/Baseline/plugins.meta-hook/out1
deleted file mode 100644
index 33cf95de62..0000000000
--- a/testing/btest/Baseline/plugins.meta-hook/out1
+++ /dev/null
@@ -1,5 +0,0 @@
-### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-0.000000   HookQueueEvent zeek_init()
-zeek_init()
-0.000000   HookQueueEvent net_done()
-0.000000   HookQueueEvent Broker::log_flush()
diff --git a/testing/btest/Baseline/plugins.publish-event-metadata/output b/testing/btest/Baseline/plugins.publish-event-metadata/output
deleted file mode 100644
index b88529121f..0000000000
--- a/testing/btest/Baseline/plugins.publish-event-metadata/output
+++ /dev/null
@@ -1,4 +0,0 @@
-### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-0.000000   InitPostScript
-0.000000   HookPublishEvent backend=Broker topic=/test/topic event=App::test_event
-0.000000   HookPublishEvent /test/topic(App::test_event)