diff --git a/kernel/driver.cc b/kernel/driver.cc
index 74f53901e..398c89e03 100644
--- a/kernel/driver.cc
+++ b/kernel/driver.cc
@@ -558,8 +558,9 @@ int main(int argc, char **argv)
 		fprintf(f, "\n");
 	}
 
-	if (log_expect_no_warnings && log_warnings_count)
-		log_error("Warnings: %d unique messages, %d total\n", GetSize(log_warnings), log_warnings_count);
+	if (log_expect_no_warnings && log_warnings_count_noexpect)
+		log_error("Unexpected warnings found: %d unique messages, %d total, %d expected\n", GetSize(log_warnings),
+					log_warnings_count, log_warnings_count - log_warnings_count_noexpect);
 
 	if (print_stats)
 	{
diff --git a/kernel/log.cc b/kernel/log.cc
index 9e103855f..1785809e4 100644
--- a/kernel/log.cc
+++ b/kernel/log.cc
@@ -45,6 +45,7 @@ std::vector<std::regex> log_warn_regexes, log_nowarn_regexes, log_werror_regexes
 std::vector<std::pair<std::regex,LogExpectedItem>> log_expect_log, log_expect_warning, log_expect_error;
 std::set<std::string> log_warnings, log_experimentals, log_experimentals_ignored;
 int log_warnings_count = 0;
+int log_warnings_count_noexpect = 0;
 bool log_expect_no_warnings = false;
 bool log_hdump_all = false;
 FILE *log_errfile = NULL;
@@ -253,9 +254,12 @@ static void logv_warning_with_prefix(const char *prefix,
 			if (std::regex_search(message, re))
 				log_error("%s",  message.c_str());
 
+		bool warning_match = false;
 		for (auto &item : log_expect_warning)
-			if (std::regex_search(message, item.first))
+			if (std::regex_search(message, item.first)) {
 				item.second.current_count++;
+				warning_match = true;
+			}
 
 		if (log_warnings.count(message))
 		{
@@ -276,6 +280,8 @@ static void logv_warning_with_prefix(const char *prefix,
 			log_warnings.insert(message);
 		}
 
+		if (!warning_match)
+			log_warnings_count_noexpect++;
 		log_warnings_count++;
 		log_make_debug = bak_log_make_debug;
 	}
@@ -661,7 +667,7 @@ void log_check_expected()
 	check_expected_logs = false;
 
 	for (auto &item : log_expect_warning) {
-		if (item.second.current_count != item.second.expected_count) {
+		if (item.second.current_count == 0) {
 			log_error("Expected warning pattern '%s' not found !\n", item.second.pattern.c_str());
 		}
 		if (item.second.current_count != item.second.expected_count) {
diff --git a/kernel/log.h b/kernel/log.h
index 79de1a20a..603938f4c 100644
--- a/kernel/log.h
+++ b/kernel/log.h
@@ -52,6 +52,7 @@ extern std::map<std::string, std::set<std::string>> log_hdump;
 extern std::vector<std::regex> log_warn_regexes, log_nowarn_regexes, log_werror_regexes;
 extern std::set<std::string> log_warnings, log_experimentals, log_experimentals_ignored;
 extern int log_warnings_count;
+extern int log_warnings_count_noexpect;
 extern bool log_expect_no_warnings;
 extern bool log_hdump_all;
 extern FILE *log_errfile;