diff --git a/test/basicserver/testbasicserver.cpp b/test/basicserver/testbasicserver.cpp
index 2bbe5374c..1ff1e37a4 100644
--- a/test/basicserver/testbasicserver.cpp
+++ b/test/basicserver/testbasicserver.cpp
@@ -489,6 +489,10 @@ int test(int argc, const char *argv[])
 	// Timing information is very useful for debugging race conditions during this test,
 	// so enable it unconditionally:
 	Console::SetShowTime(true);
+	if(Logging::GetConsole().GetLevel() < Log::INFO)
+	{
+		Logging::FilterConsole(Log::INFO);
+	}
 
 	// Server launching stuff
 	if(argc >= 2)
@@ -858,6 +862,8 @@ int test(int argc, const char *argv[])
 					}
 					else
 					{
+						TEST_FAIL_WITH_MESSAGE("Caught unexpected exception: " <<
+							e.what());
 						throw;
 					}
 				}