diff --git a/CHANGES b/CHANGES
index a90f9ace66..dc705dfab3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+8.0.0-dev.412 | 2025-06-10 18:50:39 +0200
+
+  * btest/opt/ZAM-bif-tracking: Disable by default (Arne Welzel, Corelight)
+
 8.0.0-dev.410 | 2025-06-09 18:00:33 -0700
 
   * Btests: don't use -C in Zeek invocations that don't actually need it (Christian Kreibich, Corelight)
diff --git a/VERSION b/VERSION
index e9b208c9d8..41e096e879 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.0.0-dev.410
+8.0.0-dev.412
diff --git a/testing/btest/opt/ZAM-bif-tracking.zeek b/testing/btest/opt/ZAM-bif-tracking.zeek
index 7a30869274..3a6dcb1c27 100644
--- a/testing/btest/opt/ZAM-bif-tracking.zeek
+++ b/testing/btest/opt/ZAM-bif-tracking.zeek
@@ -2,6 +2,9 @@
 #
 # @TEST-REQUIRES: have-spicy
 #
+# Only run this test when ZEEK_ZAM_MAINTENANCE env is set and not "0".
+# @TEST-REQUIRES: test "${ZEEK_ZAM_MAINTENANCE}" != "" && test "${ZEEK_ZAM_MAINTENANCE}" != "0"
+#
 # @TEST-EXEC: zeek -b %INPUT >output
 # @TEST-EXEC: btest-diff output