diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b05d7d0e3..b490df2166 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -410,8 +410,10 @@ endif ()
 if (ENABLE_ZEEK_UNIT_TESTS)
     enable_testing()
     add_definitions(-DDOCTEST_CONFIG_SUPER_FAST_ASSERTS)
+    target_compile_definitions(zeek_dynamic_plugin_base INTERFACE DOCTEST_CONFIG_SUPER_FAST_ASSERTS)
 else ()
     add_definitions(-DDOCTEST_CONFIG_DISABLE)
+    target_compile_definitions(zeek_dynamic_plugin_base INTERFACE DOCTEST_CONFIG_DISABLE)
 endif ()
 
 if (ENABLE_CCACHE)
diff --git a/src/Options.cc b/src/Options.cc
index ac4da88099..86e8d01e51 100644
--- a/src/Options.cc
+++ b/src/Options.cc
@@ -301,7 +301,7 @@ Options parse_cmdline(int argc, char** argv)
 		fprintf(stderr, "ERROR: C++ unit tests are disabled for this build.\n"
 		                "       Please re-compile with ENABLE_ZEEK_UNIT_TESTS "
 		                "to run the C++ unit tests.\n");
-		usage(argv[0], 1);
+		exit(1);
 #endif
 
 		auto is_separator = [](const char* cstr)