diff --git a/testing/btest/Traces/ssh-on-port-80.trace b/testing/btest/Traces/ssh-on-port-80.trace
new file mode 100644
index 0000000000..6c0ae22e30
Binary files /dev/null and b/testing/btest/Traces/ssh-on-port-80.trace differ
diff --git a/testing/btest/btest.cfg b/testing/btest/btest.cfg
index 4f888f710b..4a13833094 100644
--- a/testing/btest/btest.cfg
+++ b/testing/btest/btest.cfg
@@ -12,7 +12,7 @@ BRO_SEED_FILE=%(testbase)s/random.seed
 TZ=UTC
 LC_ALL=C
 BTEST_PATH=%(testbase)s/../../aux/btest
-PATH=%(testbase)s/../../build/src:%(testbase)s/../scripts:%(testbase)s/../../aux/btest:%(default_path)s
+PATH=%(testbase)s/../../build/src:%(testbase)s/../scripts:%(testbase)s/../../aux/btest:%(testbase)s/../../aux/bro-aux/bro-cut:%(default_path)s
 TRACES=%(testbase)s/Traces
 SCRIPTS=%(testbase)s/../scripts
 DIST=%(testbase)s/../..
diff --git a/testing/btest/scripts/base/frameworks/analyzer/disable-analyzer.bro b/testing/btest/scripts/base/frameworks/analyzer/disable-analyzer.bro
new file mode 100644
index 0000000000..749236f6c6
--- /dev/null
+++ b/testing/btest/scripts/base/frameworks/analyzer/disable-analyzer.bro
@@ -0,0 +1,14 @@
+#
+# @TEST-EXEC: bro -r ${TRACES}/var-services-std-ports.trace %INPUT
+# @TEST-EXEC: cat conn.log | bro-cut service | grep -vq dns
+# @TEST-EXEC: cat conn.log | bro-cut service | grep -vq ssh
+#
+
+redef Analyzer::disabled_analyzers += { Analyzer::ANALYZER_SSH };
+
+event bro_init()
+	{
+	Analyzer::disable_analyzer(Analyzer::ANALYZER_DNS);
+	}
+
+
diff --git a/testing/btest/scripts/base/frameworks/analyzer/enable-analyzer.bro b/testing/btest/scripts/base/frameworks/analyzer/enable-analyzer.bro
new file mode 100644
index 0000000000..bcee794768
--- /dev/null
+++ b/testing/btest/scripts/base/frameworks/analyzer/enable-analyzer.bro
@@ -0,0 +1,13 @@
+#
+# @TEST-EXEC: bro -r ${TRACES}/var-services-std-ports.trace %INPUT
+# @TEST-EXEC: cat conn.log | bro-cut service | grep -q dns
+#
+
+redef Analyzer::disable_all = T;
+
+event bro_init()
+	{
+	Analyzer::enable_analyzer(Analyzer::ANALYZER_DNS);
+	}
+
+
diff --git a/testing/btest/scripts/base/frameworks/analyzer/register-for-port.bro b/testing/btest/scripts/base/frameworks/analyzer/register-for-port.bro
new file mode 100644
index 0000000000..f3b54177e2
--- /dev/null
+++ b/testing/btest/scripts/base/frameworks/analyzer/register-for-port.bro
@@ -0,0 +1,13 @@
+#
+# @TEST-EXEC: bro -r ${TRACES}/ssh-on-port-80.trace %INPUT dpd_buffer_size=0;
+# @TEST-EXEC: cat conn.log | bro-cut service | grep -q ssh
+#
+# @TEST-EXEC: bro -r ${TRACES}/ssh-on-port-80.trace dpd_buffer_size=0;
+# @TEST-EXEC: cat conn.log | bro-cut service | grep -vq ssh
+
+event bro_init()
+	{
+	Analyzer::register_for_port(Analyzer::ANALYZER_SSH, 80/tcp);
+	}
+
+