2 files changed, 25 insertions, 20 deletions
diff --git a/test/system/010-images.bats b/test/system/010-images.bats
index 3224c9b42..6957d4830 100644
--- a/test/system/010-images.bats
+++ b/test/system/010-images.bats
@@ -27,11 +27,11 @@ load helpers
 @test "podman images - json" {
     # 'created': podman includes fractional seconds, podman-remote does not
     tests="
-names[0]   | $PODMAN_TEST_IMAGE_FQN
-id         |        [0-9a-f]\\\{64\\\}
-digest     | sha256:[0-9a-f]\\\{64\\\}
-created    | [0-9-]\\\+T[0-9:.]\\\+Z
-size       | [0-9]\\\+
+Names[0]    | $PODMAN_TEST_IMAGE_FQN
+ID          |        [0-9a-f]\\\{64\\\}
+Digest      | sha256:[0-9a-f]\\\{64\\\}
+CreatedAt   | [0-9-]\\\+T[0-9:.]\\\+Z
+Size        | [0-9]\\\+
 "
 
     run_podman images -a --format json
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index b89c76981..98c65f788 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -136,21 +136,26 @@ echo $rand        |   0 | $rand
     run_podman rmi busybox
 }
 
-# 'run --rmi' deletes the image in the end unless it's used by another container.
-@test "podman run --rmi - remove image" {
-    skip_if_remote "podman-remote does not emit 'Trying to pull' msgs"
-    run_podman 0 run --rmi --rm redis /bin/true
-    run_podman 1 image exists redis
-}
-
-
-@test "podman run --rmi - not remove image" {
-    skip_if_remote "podman-remote does not emit 'Trying to pull' msgs"
-    run_podman run redis /bin/true
-    run_podman images | grep redis
-    run_podman run --rmi --rm redis /bin/true
-    run_podman images | grep redis
-    run_podman 0 rm -a
+# 'run --rmi' deletes the image in the end unless it's used by another container
+@test "podman run --rmi" {
+    skip_if_remote
+
+    # Name of a nonlocal image. It should be pulled in by the first 'run'
+    NONLOCAL_IMAGE=busybox
+    run_podman 1 image exists $NONLOCAL_IMAGE
+
+    # Run a container, without --rm; this should block subsequent --rmi
+    run_podman run --name keepme $NONLOCAL_IMAGE /bin/true
+    run_podman image exists $NONLOCAL_IMAGE
+
+    # Now try running with --rmi : it should succeed, but not remove the image
+    run_podman run --rmi --rm $NONLOCAL_IMAGE /bin/true
+    run_podman image exists $NONLOCAL_IMAGE
+
+    # Remove the stray container, and run one more time with --rmi.
+    run_podman rm keepme
+    run_podman run --rmi --rm $NONLOCAL_IMAGE /bin/true
+    run_podman 1 image exists $NONLOCAL_IMAGE
 }
 
 # vim: filetype=sh