diff --git a/test/fixture.h b/test/fixture.h
index d2ec804f41d..10f72972c4c 100644
--- a/test/fixture.h
+++ b/test/fixture.h
@@ -272,7 +272,7 @@ class TestFixture : public ErrorLogger {
 };
 
 // TODO: most asserts do not actually assert i.e. do not return
-#define TEST_CASE( NAME )  do { if (prepareTest(#NAME)) { setVerbose(false); NAME(); teardownTest(); } } while (false)
+#define TEST_CASE( NAME )  do { if (prepareTest(#NAME)) { setVerbose(false); try { NAME(); } catch (...) { assertNoThrowFail(__FILE__, __LINE__); } teardownTest(); } } while (false)
 #define ASSERT( CONDITION )  if (!assert_(__FILE__, __LINE__, (CONDITION))) return
 #define ASSERT_LOC( CONDITION, FILE_, LINE_ )  assert_(FILE_, LINE_, (CONDITION))
 #define CHECK_EQUALS( EXPECTED, ACTUAL )  assertEquals(__FILE__, __LINE__, (EXPECTED), (ACTUAL))