diff --git a/src/main.cc b/src/main.cc
index f1b393310b..c2d61e7c60 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -931,9 +931,8 @@ int main(int argc, char** argv)
 
 	if ( dead_handlers->length() > 0 && check_for_unused_event_handlers )
 		{
-		reporter->Warning("event handlers never invoked:");
 		for ( int i = 0; i < dead_handlers->length(); ++i )
-			reporter->Warning("\t", (*dead_handlers)[i]);
+			reporter->Warning("event handler never invoked: %s", (*dead_handlers)[i]);
 		}
 
 	delete dead_handlers;
diff --git a/testing/btest/Baseline/core.check-unused-event-handlers/.stderr b/testing/btest/Baseline/core.check-unused-event-handlers/.stderr
new file mode 100644
index 0000000000..8d8bf1a85b
--- /dev/null
+++ b/testing/btest/Baseline/core.check-unused-event-handlers/.stderr
@@ -0,0 +1 @@
+warning in <params>, line 1: event handler never invoked: this_is_never_used
diff --git a/testing/btest/core/check-unused-event-handlers.test b/testing/btest/core/check-unused-event-handlers.test
new file mode 100644
index 0000000000..f9ad105ff6
--- /dev/null
+++ b/testing/btest/core/check-unused-event-handlers.test
@@ -0,0 +1,8 @@
+# This test should print a warning that the event handler is never invoked.
+# @TEST-EXEC: bro -b %INPUT check_for_unused_event_handlers=T
+# @TEST-EXEC: btest-diff .stderr
+
+event this_is_never_used()
+	{
+	print "not even once";
+	}