4 files changed, 33 insertions, 1 deletions
diff --git a/test/system/001-basic.bats b/test/system/001-basic.bats
index 1d5eb066b..d276cfda1 100644
--- a/test/system/001-basic.bats
+++ b/test/system/001-basic.bats
@@ -61,7 +61,7 @@ function setup() {
     is "$output" ".*Server:" "podman --remote: contacts server"
 
     # This was failing: "podman --foo --bar --remote".
-    PODMAN="${podman_non_remote} --tmpdir /var/tmp --log-level=error ${podman_args[@]} --remote" run_podman version
+    PODMAN="${podman_non_remote} --log-level=error ${podman_args[@]} --remote" run_podman version
     is "$output" ".*Server:" "podman [flags] --remote: contacts server"
 
     # ...but no matter what, --remote is never allowed after subcommand
diff --git a/test/system/020-tag.bats b/test/system/020-tag.bats
index 7593ad68f..1f5eede39 100644
--- a/test/system/020-tag.bats
+++ b/test/system/020-tag.bats
@@ -32,4 +32,23 @@ function _tag_and_check() {
 	is "$output" "Error: \"registry.com/foo:bar\": no such tag"
 }
 
+@test "podman untag all" {
+	# First get the image ID
+	run_podman inspect --format '{{.ID}}' $IMAGE
+	iid=$output
+
+	# Add a couple of tags
+	run_podman tag $IMAGE registry.com/1:latest registry.com/2:latest registry.com/3:latest
+
+	# Untag with arguments to for all tags to be removed
+	run_podman untag $iid
+
+	# Now make sure all tags are removed
+	run_podman image inspect $iid --format "{{.RepoTags}}"
+	is "$output" "\[\]" "untag by ID leaves empty set of tags"
+
+	# Restore image
+	run_podman tag $iid $IMAGE
+}
+
 # vim: filetype=sh
diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats
index cbb2091e5..130bc5243 100644
--- a/test/system/035-logs.bats
+++ b/test/system/035-logs.bats
@@ -50,4 +50,15 @@ ${cid[1]} c
 ${cid[0]} d"   "Sequential output from logs"
 }
 
+@test "podman logs over journald" {
+    msg=$(random_string 20)
+
+    run_podman run --name myctr --log-driver journald $IMAGE echo $msg
+
+    run_podman logs myctr
+    is "$output" "$msg" "check that log output equals the container output"
+
+    run_podman rm myctr
+}
+
 # vim: filetype=sh
diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats
index 150626ded..a923402ac 100644
--- a/test/system/500-networking.bats
+++ b/test/system/500-networking.bats
@@ -82,6 +82,8 @@ load helpers
 
 # "network create" now works rootless, with the help of a special container
 @test "podman network create" {
+    skip_if_remote "FIXME: pending #7808"
+
     local mynetname=testnet-$(random_string 10)
     local mysubnet=$(random_rfc1918_subnet)