diff --git a/test/test_main.py b/test/test_main.py
index 0b27f91c..dec9f8d4 100644
--- a/test/test_main.py
+++ b/test/test_main.py
@@ -109,11 +109,11 @@ def wrap_text(text, width):
             print(tabulate.tabulate(table_data, headers=headers, tablefmt='fancy_grid'))
 
         if base.startswith('fail'):
-            assert len(error_outcomes) > 0 or caught_exceptions
+            assert len(error_outcomes) > 0
         elif base.startswith('pass'):
-            assert len(error_outcomes) == 0 and len(activating_outcomes) > 0
+            assert len(error_outcomes) == 0 and len(activating_outcomes) and not caught_exceptions > 0
         elif base.startswith('na'):
-            assert len(error_outcomes) == 0 and len(activating_outcomes) == 0
+            assert len(error_outcomes) == 0 and len(activating_outcomes) == 0 and not caught_exceptions
 
     if error_outcomes:
         tabulate_results = [