diff --git a/tests/conftest.py b/tests/conftest.py
index 8f633d47a7..0e592543b6 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -120,10 +120,7 @@ def run_and_wait(
             assert not self.get_warnings(logs)
         if no_errors:
             assert not self.get_errors(logs)
-        if no_failure:
-            assert rv == 0 or rv["StatusCode"] == 0
-        else:
-            assert rv != 0 and rv["StatusCode"] != 0
+        assert no_failure == (rv["StatusCode"] == 0)
         return logs
 
     @staticmethod