2 files changed, 15 insertions, 11 deletions
diff --git a/test/system/001-basic.bats b/test/system/001-basic.bats
index 50735f576..78b8ecdfd 100644
--- a/test/system/001-basic.bats
+++ b/test/system/001-basic.bats
@@ -94,22 +94,21 @@ function setup() {
 }
 
 @test "podman-remote: defaults" {
-    if is_remote; then
-        skip "only applicable on a local run"
-    fi
+    skip_if_remote "only applicable on a local run"
+
+    # By default, podman should include '--remote' in its help output
+    run_podman --help
+    is "$output" ".* --remote " "podman --help includes the --remote option"
 
+    # When it detects CONTAINER_HOST or _CONNECTION, --remote is not an option
     CONTAINER_HOST=foobar run_podman --help
-    # Should not have --remote flag
-    echo $output  |  grep -v -qw -- "--remote"
-    if [ $? -ne 0 ]; then
-        die "Should not have --remote flag"
+    if grep -- " --remote " <<<"$output"; then
+        die "podman --help, with CONTAINER_HOST set, is showing --remote"
     fi
 
     CONTAINER_CONNECTION=foobar run_podman --help
-    # Should not have --remote flag
-    echo $output  |  grep -v -qw -- "--remote"
-    if [ $? -ne 0 ]; then
-        die "Should not have --remote flag"
+    if grep -- " --remote " <<<"$output"; then
+        die "podman --help, with CONTAINER_CONNECTION set, is showing --remote"
     fi
 }
 
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 44c2ee509..2c8d08b99 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -67,6 +67,11 @@ echo $rand        |   0 | $rand
     is "$output" ".*invalidflag" "failed when passing undefined flags to the runtime"
 }
 
+@test "podman run --memory=0 runtime option" {
+    run_podman run --memory=0 --rm $IMAGE echo hello
+    is "$output" "hello" "failed to run when --memory is set to 0"
+}
+
 # 'run --preserve-fds' passes a number of additional file descriptors into the container
 @test "podman run --preserve-fds" {
     skip_if_remote "preserve-fds is meaningless over remote"