diff --git a/testing/btest/Baseline/core.mmdb.lookup/out.db b/testing/btest/Baseline/core.mmdb.lookup/out.db
new file mode 100644
index 0000000000..d9fce7f5b6
--- /dev/null
+++ b/testing/btest/Baseline/core.mmdb.lookup/out.db
@@ -0,0 +1,9 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+128.3.0.1, location, [country_code=US, region=<uninitialized>, city=Berkeley, latitude=37.751, longitude=-97.822]
+128.3.0.1, asn, [number=16, organization=Lawrence Berkeley National Laboratory]
+2607:f140::1, location, [country_code=US, region=<uninitialized>, city=Berkeley, latitude=37.751, longitude=-97.822]
+2607:f140::1, asn, [number=16, organization=Lawrence Berkeley National Laboratory]
+10.0.0.1, location, [country_code=<uninitialized>, region=<uninitialized>, city=<uninitialized>, latitude=<uninitialized>, longitude=<uninitialized>]
+10.0.0.1, asn, [number=<uninitialized>, organization=<uninitialized>]
+fc00::1, location, [country_code=<uninitialized>, region=<uninitialized>, city=<uninitialized>, latitude=<uninitialized>, longitude=<uninitialized>]
+fc00::1, asn, [number=<uninitialized>, organization=<uninitialized>]
diff --git a/testing/btest/Baseline/core.mmdb.lookup/out.nodb b/testing/btest/Baseline/core.mmdb.lookup/out.nodb
new file mode 100644
index 0000000000..b90a148c49
--- /dev/null
+++ b/testing/btest/Baseline/core.mmdb.lookup/out.nodb
@@ -0,0 +1,9 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+128.3.0.1, location, [country_code=<uninitialized>, region=<uninitialized>, city=<uninitialized>, latitude=<uninitialized>, longitude=<uninitialized>]
+128.3.0.1, asn, [number=<uninitialized>, organization=<uninitialized>]
+2607:f140::1, location, [country_code=<uninitialized>, region=<uninitialized>, city=<uninitialized>, latitude=<uninitialized>, longitude=<uninitialized>]
+2607:f140::1, asn, [number=<uninitialized>, organization=<uninitialized>]
+10.0.0.1, location, [country_code=<uninitialized>, region=<uninitialized>, city=<uninitialized>, latitude=<uninitialized>, longitude=<uninitialized>]
+10.0.0.1, asn, [number=<uninitialized>, organization=<uninitialized>]
+fc00::1, location, [country_code=<uninitialized>, region=<uninitialized>, city=<uninitialized>, latitude=<uninitialized>, longitude=<uninitialized>]
+fc00::1, asn, [number=<uninitialized>, organization=<uninitialized>]
diff --git a/testing/btest/core/mmdb/lookup.zeek b/testing/btest/core/mmdb/lookup.zeek
new file mode 100644
index 0000000000..26a7fe299c
--- /dev/null
+++ b/testing/btest/core/mmdb/lookup.zeek
@@ -0,0 +1,28 @@
+# @TEST-DOC: Test basic DB lookups for success/failure.
+#
+# @TEST-REQUIRES: grep -q "#define USE_GEOIP" $BUILD/zeek-config.h
+#
+# @TEST-EXEC: zeek -b %INPUT >out.nodb
+# @TEST-EXEC: btest-diff out.nodb
+# @TEST-EXEC: cp -R $FILES/mmdb ./mmdb
+# @TEST-EXEC: zeek -b %INPUT >out.db
+# @TEST-EXEC: btest-diff out.db
+
+redef mmdb_dir = "./mmdb";
+
+function do_lookups(a: addr)
+	{
+	print a, "location", lookup_location(a);
+	print a, "asn", lookup_autonomous_system(a);
+	}
+
+event zeek_init()
+	{
+	# Succeeding calls:
+	do_lookups(128.3.0.1);
+	do_lookups([2607:f140::1]);
+
+	# Failing ones:
+	do_lookups(10.0.0.1);
+	do_lookups([fc00::1]);
+	}