diff --git a/src/zeek-setup.cc b/src/zeek-setup.cc
index c7f90c1ccb..44bae3527d 100644
--- a/src/zeek-setup.cc
+++ b/src/zeek-setup.cc
@@ -648,6 +648,7 @@ SetupResult setup(int argc, char** argv, Options* zopts)
 	zeekygen_mgr = new zeekygen::detail::Manager(zeekygen_cfg, zeek_argv[0]);
 
 	add_essential_input_file("base/init-bare.zeek");
+	add_essential_input_file("builtin-plugins/__preload__.zeek");
 	add_essential_input_file("base/init-frameworks-and-bifs.zeek");
 
 	if ( ! options.bare_mode )
@@ -660,7 +661,6 @@ SetupResult setup(int argc, char** argv, Options* zopts)
 			add_input_file("base/init-default.zeek");
 		}
 
-	add_input_file("builtin-plugins/__preload__.zeek");
 	add_input_file("builtin-plugins/__load__.zeek");
 
 	plugin_mgr->SearchDynamicPlugins(util::zeek_plugin_path());
diff --git a/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log b/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
index e0e40f71bb..429bc44f5a 100644
--- a/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
+++ b/testing/btest/Baseline/coverage.bare-load-baseline/canonified_loaded_scripts.log
@@ -82,6 +82,8 @@ scripts/base/init-bare.zeek
     scripts/base/packet-protocols/gtpv1/__load__.zeek
       scripts/base/packet-protocols/gtpv1/main.zeek
         build/scripts/base/bif/plugins/Zeek_GTPv1.functions.bif.zeek
+build/scripts/builtin-plugins/__preload__.zeek
+  build/scripts/builtin-plugins/Zeek_Spicy/__preload__.zeek
 scripts/base/init-frameworks-and-bifs.zeek
   scripts/base/frameworks/logging/__load__.zeek
     scripts/base/frameworks/logging/main.zeek
@@ -247,8 +249,6 @@ scripts/base/init-frameworks-and-bifs.zeek
     build/scripts/base/bif/plugins/Zeek_Spicy.consts.bif.zeek
     build/scripts/base/bif/plugins/Zeek_Spicy.events.bif.zeek
     build/scripts/base/bif/plugins/Zeek_Spicy.functions.bif.zeek
-build/scripts/builtin-plugins/__preload__.zeek
-  build/scripts/builtin-plugins/Zeek_Spicy/__preload__.zeek
 build/scripts/builtin-plugins/__load__.zeek
   build/scripts/builtin-plugins/Zeek_Spicy/__load__.zeek
     build/scripts/builtin-plugins/Zeek_Spicy/Zeek/Spicy/bare.zeek
diff --git a/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log b/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
index ef71d4ec75..75cc1c72d4 100644
--- a/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
+++ b/testing/btest/Baseline/coverage.default-load-baseline/canonified_loaded_scripts.log
@@ -82,6 +82,8 @@ scripts/base/init-bare.zeek
     scripts/base/packet-protocols/gtpv1/__load__.zeek
       scripts/base/packet-protocols/gtpv1/main.zeek
         build/scripts/base/bif/plugins/Zeek_GTPv1.functions.bif.zeek
+build/scripts/builtin-plugins/__preload__.zeek
+  build/scripts/builtin-plugins/Zeek_Spicy/__preload__.zeek
 scripts/base/init-frameworks-and-bifs.zeek
   scripts/base/frameworks/logging/__load__.zeek
     scripts/base/frameworks/logging/main.zeek
@@ -447,8 +449,6 @@ scripts/base/init-default.zeek
   scripts/base/misc/find-checksum-offloading.zeek
   scripts/base/misc/find-filtered-trace.zeek
   build/scripts/base/misc/installation.zeek
-build/scripts/builtin-plugins/__preload__.zeek
-  build/scripts/builtin-plugins/Zeek_Spicy/__preload__.zeek
 build/scripts/builtin-plugins/__load__.zeek
   build/scripts/builtin-plugins/Zeek_Spicy/__load__.zeek
     build/scripts/builtin-plugins/Zeek_Spicy/Zeek/Spicy/bare.zeek