diff --git a/src/main.cc b/src/main.cc
index ec32de1060..6e852c7e0b 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -962,6 +962,7 @@ int main(int argc, char** argv)
 	// Queue events reporting loaded scripts.
 	for ( std::list<ScannedFile>::iterator i = files_scanned.begin(); i != files_scanned.end(); i++ )
 		{
+		if ( i->skipped ) continue;
 		val_list* vl = new val_list;
 		vl->append(new StringVal(i->name.c_str()));
 		vl->append(new Val(i->include_level, TYPE_COUNT));
diff --git a/testing/btest/Baseline/core.load-unload/loaded_scripts.log b/testing/btest/Baseline/core.load-unload/loaded_scripts.log
deleted file mode 100644
index 70a219ce1a..0000000000
--- a/testing/btest/Baseline/core.load-unload/loaded_scripts.log
+++ /dev/null
@@ -1,24 +0,0 @@
-# depth	name
-0	/Users/seth/bro.git9/policy/bro.init
-1	/Users/seth/bro.git9/build/src/const.bif.bro
-1	/Users/seth/bro.git9/build/src/types.bif.bro
-1	/Users/seth/bro.git9/build/src/strings.bif.bro
-1	/Users/seth/bro.git9/build/src/bro.bif.bro
-1	/Users/seth/bro.git9/build/src/reporter.bif.bro
-1	/Users/seth/bro.git9/build/src/event.bif.bro
-1	/Users/seth/bro.git9/policy/utils/site.bro
-2	/Users/seth/bro.git9/policy/utils/pattern.bro
-1	/Users/seth/bro.git9/policy/frameworks/logging/__load__.bro
-2	/Users/seth/bro.git9/policy/frameworks/logging/base.bro
-3	/Users/seth/bro.git9/build/src/logging.bif.bro
-2	/Users/seth/bro.git9/policy/frameworks/logging/plugins/ascii.bro
-1	/Users/seth/bro.git9/policy/frameworks/packet-filter/__load__.bro
-2	/Users/seth/bro.git9/policy/frameworks/packet-filter/base.bro
-3	/Users/seth/bro.git9/policy/frameworks/notice/__load__.bro
-4	/Users/seth/bro.git9/policy/frameworks/notice/base.bro
-4	/Users/seth/bro.git9/policy/frameworks/notice/weird.bro
-5	/Users/seth/bro.git9/policy/utils/conn-ids.bro
-2	/Users/seth/bro.git9/policy/frameworks/packet-filter/netstats.bro
-0	/Users/seth/bro.git9/testing/btest/.tmp/core.load-unload/load-unload.bro
-1	./dontloadmebro.bro
-0	/Users/seth/bro.git9/policy/misc/loaded-scripts.bro
diff --git a/testing/btest/core/load-unload.bro b/testing/btest/core/load-unload.bro
index 553260f395..f76e9e337d 100644
--- a/testing/btest/core/load-unload.bro
+++ b/testing/btest/core/load-unload.bro
@@ -1,8 +1,11 @@
 # This tests the @unload directive
 #
-# @TEST-EXEC: echo 'print "oops12345";' >dontloadmebro.bro
 # @TEST-EXEC: bro %INPUT misc/loaded-scripts dontloadmebro > output
 # @TEST-EXEC: btest-diff output
-# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff loaded_scripts.log
+# @TEST-EXEC: grep -q dontloadmebro loaded_scripts.log && exit 1 || exit 0
 
 @unload dontloadmebro
+
+@TEST-START-FILE dontloadmebro.bro
+print "FAIL";
+@TEST-END-FILE