diff --git a/.cirrus.yml b/.cirrus.yml
index 1fa9e0a526..59d592be5e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -276,6 +276,20 @@ ubuntu24_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
+# Same as above, but running the ZAM tests instead of the regular tests.
+ubuntu24_zam_task:
+  container:
+    # Ubuntu 24.04 EOL: Jun 2029
+    dockerfile: ci/ubuntu-24.04/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+  env:
+    ZEEK_CI_SKIP_UNIT_TESTS: 1
+    ZEEK_CI_SKIP_EXTERNAL_BTESTS: 1
+    ZEEK_CI_BTEST_EXTRA_ARGS: -a zam
+    # Use a lower number of jobs due to OOM issues with ZAM tasks
+    ZEEK_CI_BTEST_JOBS: 3
+
 # Same as above, but using Clang and libc++
 ubuntu24_clang_libcpp_task:
   container:
diff --git a/testing/btest/Baseline.zam/bifs.to_count/err b/testing/btest/Baseline.zam/bifs.to_count/err
index c35b90b21b..ef4fefc58d 100644
--- a/testing/btest/Baseline.zam/bifs.to_count/err
+++ b/testing/btest/Baseline.zam/bifs.to_count/err
@@ -1,4 +1,4 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 error in <...>/to_count.zeek, line 8: bad conversion to count (int_to_count(-2) and -2)
-error in <...>/to_count.zeek, line 20: bad conversion to count (to_count() and )
-error in <...>/to_count.zeek, line 25: bad conversion to count (to_count(not a count) and not a count)
+error in <...>/to_count.zeek, line 20: bad conversion to count (to_count(, 10) and )
+error in <...>/to_count.zeek, line 29: bad conversion to count (to_count(not a count, 10) and not a count)
diff --git a/testing/btest/Baseline.zam/bifs.to_count/out b/testing/btest/Baseline.zam/bifs.to_count/out
index d727a32bbe..7404ddbeb0 100644
--- a/testing/btest/Baseline.zam/bifs.to_count/out
+++ b/testing/btest/Baseline.zam/bifs.to_count/out
@@ -8,6 +8,10 @@
 18446744073709551611
 205
 206
+172
+35
+195
+195
 0
 123
 9223372036854775808 and 9223372036854775808 are the same
diff --git a/testing/btest/Baseline.zam/language.assert-3/out b/testing/btest/Baseline.zam/language.assert-3/out
index 5a58147fa5..5194c63015 100644
--- a/testing/btest/Baseline.zam/language.assert-3/out
+++ b/testing/btest/Baseline.zam/language.assert-3/out
@@ -1,3 +1,3 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error in <...>/assert.zeek, line 3: assertion failure: (coerce to_count("42") to double) == 42.5 (always failing)
+error in <...>/assert.zeek, line 3: assertion failure: (coerce to_count("42", 10) to double) == 42.5 (always failing)
 fatal error: errors occurred while initializing
diff --git a/testing/btest/Baseline.zam/language.assert-hook-2/out b/testing/btest/Baseline.zam/language.assert-hook-2/out
index 32d490fa18..773ee6ce3c 100644
--- a/testing/btest/Baseline.zam/language.assert-hook-2/out
+++ b/testing/btest/Baseline.zam/language.assert-hook-2/out
@@ -1,4 +1,4 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-assertion_failure, to_count("5") == 4, 5 is not 4
+assertion_failure, to_count("5", 10) == 4, 5 is not 4
 assert <...>/assert-hook.zeek:21
  zeek_init <none>:0
diff --git a/testing/btest/Baseline.zam/language.assert-misc/out b/testing/btest/Baseline.zam/language.assert-misc/out
index b53a1c6bf7..3bbd0140d2 100644
--- a/testing/btest/Baseline.zam/language.assert-misc/out
+++ b/testing/btest/Baseline.zam/language.assert-misc/out
@@ -1,7 +1,7 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 f, lambda_<10820400278317158366>: function() : void
 ZAM-code lambda_<10820400278317158366>
-g, lambda_<9730512750166342063>: function() : void
-ZAM-code lambda_<9730512750166342063>
+g, lambda_<16208386833253569415>: function() : void
+ZAM-code lambda_<16208386833253569415>
 test_function, test_function: function() : void
 ZAM-code test_function