diff --git a/testing/btest/Baseline/zam.basic/conn.log b/testing/btest/Baseline/opt.basic/conn.log
similarity index 100%
rename from testing/btest/Baseline/zam.basic/conn.log
rename to testing/btest/Baseline/opt.basic/conn.log
diff --git a/testing/btest/Baseline/zam.basic/dns.log b/testing/btest/Baseline/opt.basic/dns.log
similarity index 100%
rename from testing/btest/Baseline/zam.basic/dns.log
rename to testing/btest/Baseline/opt.basic/dns.log
diff --git a/testing/btest/Baseline/zam.basic/http.log b/testing/btest/Baseline/opt.basic/http.log
similarity index 100%
rename from testing/btest/Baseline/zam.basic/http.log
rename to testing/btest/Baseline/opt.basic/http.log
diff --git a/testing/btest/btest.cfg b/testing/btest/btest.cfg
index 3456accdd8..c99919362b 100644
--- a/testing/btest/btest.cfg
+++ b/testing/btest/btest.cfg
@@ -4,7 +4,7 @@
 build_dir = build
 
 [btest]
-TestDirs    = af_packet doc bifs language core scripts coverage signatures plugins broker spicy supervisor telemetry javascript
+TestDirs    = af_packet doc bifs language core scripts coverage signatures plugins broker spicy supervisor telemetry javascript misc opt
 TmpDir      = %(testbase)s/.tmp
 BaselineDir = %(testbase)s/Baseline
 IgnoreDirs  = .svn CVS .tmp
diff --git a/testing/btest/zam/basic.test b/testing/btest/opt/basic.zeek
similarity index 100%
rename from testing/btest/zam/basic.test
rename to testing/btest/opt/basic.zeek