diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 5c4fdc44c4..a0cce8389e 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -1638,7 +1638,7 @@ search               | $IMAGE           |
            "$command --authfile=nonexistent-path"
 
         if [[ "$command" != "logout" ]]; then
-           REGISTRY_AUTH_FILE=$bogus run_podman ? $command $args
+           REGISTRY_AUTH_FILE=$bogus run_podman '?' $command $args
            assert "$output" !~ "credential file is not accessible" \
               "$command REGISTRY_AUTH_FILE=nonexistent-path"
 
diff --git a/test/system/130-kill.bats b/test/system/130-kill.bats
index 8a50ba2f53..5ce67abb57 100644
--- a/test/system/130-kill.bats
+++ b/test/system/130-kill.bats
@@ -114,7 +114,9 @@ load helpers
     run_podman run --rm -d --name $cname $IMAGE top
     run_podman kill $cname
     is "$output" $cname
-    run_podman ? wait $cname
+    # Wait for the container to get removed to avoid the leak check from triggering,
+    # since it might have already been removed here ignore the exit code check.
+    run_podman '?' wait --condition=removing $cname
 }
 
 # bats test_tags=ci:parallel