diff --git a/testing/btest/core/mmdb/explicit-open.zeek b/testing/btest/core/mmdb/explicit-open.zeek
index 9b8c6ddebb..8300ef1604 100644
--- a/testing/btest/core/mmdb/explicit-open.zeek
+++ b/testing/btest/core/mmdb/explicit-open.zeek
@@ -3,7 +3,7 @@
 # Like other MMDB tests, this uses a pcap to use each packet as a driver to
 # touch the DBs involved upon each packet, triggering DB reloads.
 #
-# @TEST-REQUIRES: grep -q "#define USE_GEOIP" $BUILD/zeek-config.h
+# @TEST-REQUIRES: $BUILD/zeek-config --have-geoip
 #
 # @TEST-EXEC: cp -R $FILES/mmdb ./mmdb
 # @TEST-EXEC: zeek -b -r $TRACES/rotation.trace %INPUT >out
diff --git a/testing/btest/core/mmdb/lookup.zeek b/testing/btest/core/mmdb/lookup.zeek
index 26a7fe299c..de819914a0 100644
--- a/testing/btest/core/mmdb/lookup.zeek
+++ b/testing/btest/core/mmdb/lookup.zeek
@@ -1,6 +1,6 @@
 # @TEST-DOC: Test basic DB lookups for success/failure.
 #
-# @TEST-REQUIRES: grep -q "#define USE_GEOIP" $BUILD/zeek-config.h
+# @TEST-REQUIRES: $BUILD/zeek-config --have-geoip
 #
 # @TEST-EXEC: zeek -b %INPUT >out.nodb
 # @TEST-EXEC: btest-diff out.nodb
diff --git a/testing/btest/core/mmdb/reopen.zeek b/testing/btest/core/mmdb/reopen.zeek
index f764097e85..5a11e8e0b1 100644
--- a/testing/btest/core/mmdb/reopen.zeek
+++ b/testing/btest/core/mmdb/reopen.zeek
@@ -1,6 +1,6 @@
 # @TEST-DOC: Change the modification time of the mmdb database on every packet. This triggers reopening of the MMDB database.
 #
-# @TEST-REQUIRES: grep -q "#define USE_GEOIP" $BUILD/zeek-config.h
+# @TEST-REQUIRES: $BUILD/zeek-config --have-geoip
 #
 # @TEST-EXEC: cp -R $FILES/mmdb ./mmdb
 # @TEST-EXEC: zeek -b -r $TRACES/rotation.trace %INPUT >out
diff --git a/testing/btest/core/mmdb/temporary-error.zeek b/testing/btest/core/mmdb/temporary-error.zeek
index 78dea4af2a..6399b50dd9 100644
--- a/testing/btest/core/mmdb/temporary-error.zeek
+++ b/testing/btest/core/mmdb/temporary-error.zeek
@@ -1,6 +1,6 @@
 # @TEST-DOC: Test a few error and recovery cases (corrupted, removed and restored MMDB databases).
 #
-# @TEST-REQUIRES: grep -q "#define USE_GEOIP" $BUILD/zeek-config.h
+# @TEST-REQUIRES: $BUILD/zeek-config --have-geoip
 # @TEST-REQUIRES: command -v truncate
 #
 # @TEST-EXEC: cp -R $FILES/mmdb ./mmdb