diff --git a/scripts/base/frameworks/spicy/init-bare.zeek b/scripts/base/frameworks/spicy/init-bare.zeek
index 1dcef1c710..a9f9d2dbd7 100644
--- a/scripts/base/frameworks/spicy/init-bare.zeek
+++ b/scripts/base/frameworks/spicy/init-bare.zeek
@@ -23,7 +23,8 @@ export {
 # doc-options-end
 
 # doc-types-start
-    ## Result type for `Spicy::resource_usage()`.
+    ## Result type for `Spicy::resource_usage()`. The values reflect resource
+    ## usage as reported by the Spicy runtime system.
     type ResourceUsage: record {
         user_time : interval;           ##< user CPU time of the Zeek process
         system_time :interval;          ##< system CPU time of the Zeek process
diff --git a/scripts/base/frameworks/spicy/misc/record-spicy-batch.zeek b/scripts/policy/frameworks/spicy/record-spicy-batch.zeek
similarity index 97%
rename from scripts/base/frameworks/spicy/misc/record-spicy-batch.zeek
rename to scripts/policy/frameworks/spicy/record-spicy-batch.zeek
index 3955077d38..ddea432053 100644
--- a/scripts/base/frameworks/spicy/misc/record-spicy-batch.zeek
+++ b/scripts/policy/frameworks/spicy/record-spicy-batch.zeek
@@ -1,4 +1,4 @@
-# Saves all input traffic in Spicy's batch format.
+##! Saves all input traffic in Spicy's batch format.
 
 module SpicyBatch;
 
diff --git a/scripts/base/frameworks/spicy/misc/resource-usage.zeek b/scripts/policy/frameworks/spicy/resource-usage.zeek
similarity index 85%
rename from scripts/base/frameworks/spicy/misc/resource-usage.zeek
rename to scripts/policy/frameworks/spicy/resource-usage.zeek
index 38a2e87f3b..d5daf8c404 100644
--- a/scripts/base/frameworks/spicy/misc/resource-usage.zeek
+++ b/scripts/policy/frameworks/spicy/resource-usage.zeek
@@ -1,3 +1,5 @@
+##! Logs Spicy-related resource usage continously for debugging purposes.
+
 module Spicy;
 
 event print_usage()
diff --git a/scripts/test-all-policy.zeek b/scripts/test-all-policy.zeek
index 389dd1d442..285d1f1198 100644
--- a/scripts/test-all-policy.zeek
+++ b/scripts/test-all-policy.zeek
@@ -72,6 +72,8 @@
 @load frameworks/packet-filter/shunt.zeek
 @load frameworks/software/version-changes.zeek
 @load frameworks/software/vulnerable.zeek
+# @load frameworks/spicy/record-spicy-batch.zeek
+# @load frameworks/spicy/resource-usage.zeek
 @load frameworks/software/windows-version-detection.zeek
 @load frameworks/telemetry/log.zeek
 @load integration/collective-intel/__load__.zeek
diff --git a/scripts/zeekygen/__load__.zeek b/scripts/zeekygen/__load__.zeek
index e5eb9a45ba..d7280b018c 100644
--- a/scripts/zeekygen/__load__.zeek
+++ b/scripts/zeekygen/__load__.zeek
@@ -13,6 +13,11 @@
 @load policy/misc/dump-events.zeek
 @load policy/protocols/conn/speculative-service.zeek
 
+@if ( have_spicy() )
+@load frameworks/spicy/record-spicy-batch.zeek
+@load frameworks/spicy/resource-usage.zeek
+@endif
+
 @load ./example.zeek
 
 event zeek_init()
diff --git a/testing/btest/Baseline/coverage.init-default/missing_loads b/testing/btest/Baseline/coverage.init-default/missing_loads
index 6bf8ca440c..33a5c60cfb 100644
--- a/testing/btest/Baseline/coverage.init-default/missing_loads
+++ b/testing/btest/Baseline/coverage.init-default/missing_loads
@@ -10,8 +10,6 @@
 -./frameworks/netcontrol/cluster.zeek
 -./frameworks/openflow/cluster.zeek
 -./frameworks/packet-filter/cluster.zeek
--./frameworks/spicy/misc/record-spicy-batch.zeek
--./frameworks/spicy/misc/resource-usage.zeek
 -./frameworks/sumstats/cluster.zeek
 -./frameworks/telemetry/cluster.zeek
 -./init-supervisor.zeek