3 files changed, 24 insertions, 2 deletions
diff --git a/test/system/055-rm.bats b/test/system/055-rm.bats
index c8475c3e9..7176ae4b8 100644
--- a/test/system/055-rm.bats
+++ b/test/system/055-rm.bats
@@ -33,6 +33,21 @@ load helpers
     run_podman rm -f $cid
 }
 
+@test "podman rm container from storage" {
+    if is_remote; then
+        skip "only applicable for local podman"
+    fi
+    rand=$(random_string 30)
+    run_podman create --name $rand $IMAGE /bin/true
+
+    # Create a container that podman does not know about
+    run buildah from $IMAGE
+    cid="$output"
+
+    # rm should succeed
+    run_podman rm $rand $cid
+}
+
 # I'm sorry! This test takes 13 seconds. There's not much I can do about it,
 # please know that I think it's justified: podman 1.5.0 had a strange bug
 # in with exit status was not preserved on some code paths with 'rm -f'
diff --git a/test/system/060-mount.bats b/test/system/060-mount.bats
index cd3b8ff5b..ece87acf6 100644
--- a/test/system/060-mount.bats
+++ b/test/system/060-mount.bats
@@ -61,7 +61,7 @@ load helpers
 
     # 'image mount', no args, tells us what's mounted
     run_podman image mount
-    is "$output" "$IMAGE $mount_path" "podman image mount with no args"
+    is "$output" "$IMAGE *$mount_path" "podman image mount with no args"
 
     # Clean up
     run_podman image umount $IMAGE
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 1329c6168..287323bbf 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -174,12 +174,19 @@ EOF
     run_podman build -t build_test -f build-test/Containerfile build-test
     local iid="${lines[-1]}"
 
+
+    if is_remote; then
+        ENVHOST=""
+    else
+	ENVHOST="--env-host"
+    fi
+
     # Run without args - should run the above script. Verify its output.
     export MYENV2="$s_env2"
     export MYENV3="env-file-should-override-env-host!"
     run_podman run --rm \
                --env-file=$PODMAN_TMPDIR/env-file \
-               --env-host \
+               ${ENVHOST} \
                -e MYENV4="$s_env4" \
                build_test
     is "${lines[0]}" "$workdir" "container default command: pwd"