diff --git a/CHANGES b/CHANGES
index c456cfb96d..ae8c2971af 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+8.0.0-dev.17 | 2025-04-30 17:23:06 +0200
+
+  * ZAM-bif-tracking: Remove ZeroMQ dependency (Arne Welzel, Corelight)
+
 8.0.0-dev.15 | 2025-04-29 17:50:31 -0700
 
   * fixed incorrect ZAM optimization of expressions seen in single-statement inlined functions (Vern Paxson, Corelight)
diff --git a/VERSION b/VERSION
index 4578cd5b1d..07ec0e3791 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.0.0-dev.15
+8.0.0-dev.17
diff --git a/testing/btest/Baseline/opt.ZAM-bif-tracking/output b/testing/btest/Baseline/opt.ZAM-bif-tracking/output
index 67cc8f4838..c20efb9801 100644
--- a/testing/btest/Baseline/opt.ZAM-bif-tracking/output
+++ b/testing/btest/Baseline/opt.ZAM-bif-tracking/output
@@ -1,2 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-559 seen BiFs, 0 unseen BiFs (), 0 new BiFs ()
+558 seen BiFs, 0 unseen BiFs (), 0 new BiFs ()
diff --git a/testing/btest/opt/ZAM-bif-tracking.zeek b/testing/btest/opt/ZAM-bif-tracking.zeek
index 5184cd68a6..8ad644ac5a 100644
--- a/testing/btest/opt/ZAM-bif-tracking.zeek
+++ b/testing/btest/opt/ZAM-bif-tracking.zeek
@@ -1,7 +1,6 @@
 # @TEST-DOC: ZAM maintenance script for tracking changes in BiFs.
 #
 # @TEST-REQUIRES: have-spicy
-# @TEST-REQUIRES: have-zeromq
 #
 # @TEST-EXEC: zeek -b %INPUT >output
 # @TEST-EXEC: btest-diff output
@@ -213,7 +212,6 @@ global known_BiFs = set(
 	"Telemetry::__histogram_observe",
 	"Telemetry::__histogram_sum",
 	"WebSocket::__configure_analyzer",
-	"Cluster::Backend::ZeroMQ::spawn_zmq_proxy_thread",
 	"__init_primary_bifs",
 	"__init_secondary_bifs",
 	"active_file",
@@ -585,6 +583,13 @@ function fmt_str_set(s: set[string]): string
 	return set_str;
 	}
 
+
+const ignored_module_patterns: table[pattern] of bool = {
+	# ZeroMQ is only an optional dependency and the BiFs it
+	# provides aren't performance critical, ignore it.
+	[/^Cluster::Backend::ZeroMQ.*/] = T,
+};
+
 event zeek_init()
 	{
 	local unseen_bifs = known_BiFs;
@@ -597,6 +602,9 @@ event zeek_init()
 		     # format to that plus their body.
 		     fmt("%s", gi$value) == gn )
 			{
+			if ( |ignored_module_patterns[gn]| > 0 )
+				next;
+
 			if ( gn in unseen_bifs )
 				{
 				add seen_bifs[gn];