diff --git a/.github/ci-test-each-commit-exec.py b/.github/ci-test-each-commit-exec.py
index 3b2eaeeb596..8f02d423ee8 100755
--- a/.github/ci-test-each-commit-exec.py
+++ b/.github/ci-test-each-commit-exec.py
@@ -10,10 +10,11 @@ import shlex
 
 def run(cmd, **kwargs):
     print("+ " + shlex.join(cmd), flush=True)
+    kwargs.setdefault("check", True)
     try:
-        return subprocess.run(cmd, check=True, **kwargs)
+        return subprocess.run(cmd, **kwargs)
     except Exception as e:
-        sys.exit(e)
+        sys.exit(str(e))
 
 
 def main():
diff --git a/ci/test/02_run_container.py b/ci/test/02_run_container.py
index 513ecacaca8..e7777b324af 100755
--- a/ci/test/02_run_container.py
+++ b/ci/test/02_run_container.py
@@ -14,7 +14,7 @@ def run(cmd, **kwargs):
     try:
         return subprocess.run(cmd, check=True, **kwargs)
     except Exception as e:
-        sys.exit(e)
+        sys.exit(str(e))
 
 
 def main():