5 files changed, 36 insertions, 1 deletions
diff --git a/test/system/010-images.bats b/test/system/010-images.bats
index 638910302..aa390f236 100644
--- a/test/system/010-images.bats
+++ b/test/system/010-images.bats
@@ -317,4 +317,11 @@ Deleted: $pauseID"
     is "$output" ""
 }
 
+@test "podman image rm --force bogus" {
+    run_podman 1 image rm bogus
+    is "$output" "Error: bogus: image not known" "Should print error"
+    run_podman image rm --force bogus
+    is "$output" "" "Should print no output"
+}
+
 # vim: filetype=sh
diff --git a/test/system/055-rm.bats b/test/system/055-rm.bats
index 0ef2216b8..dcd679a1f 100644
--- a/test/system/055-rm.bats
+++ b/test/system/055-rm.bats
@@ -96,4 +96,11 @@ load helpers
     run_podman 137 run --name $rand $IMAGE sleep 30
 }
 
+@test "podman container rm --force bogus" {
+    run_podman 1 container rm bogus
+    is "$output" "Error: no container with name or ID \"bogus\" found: no such container" "Should print error"
+    run_podman container rm --force bogus
+    is "$output" "" "Should print no output"
+}
+
 # vim: filetype=sh
diff --git a/test/system/160-volumes.bats b/test/system/160-volumes.bats
index da60112a0..dfc1a8413 100644
--- a/test/system/160-volumes.bats
+++ b/test/system/160-volumes.bats
@@ -473,4 +473,11 @@ EOF
     run_podman image rm --force localhost/volume_image
 }
 
+@test "podman volume rm --force bogus" {
+    run_podman 1 volume rm bogus
+    is "$output" "Error: no volume with name \"bogus\" found: no such volume" "Should print error"
+    run_podman volume rm --force bogus
+    is "$output" "" "Should print no output"
+}
+
 # vim: filetype=sh
diff --git a/test/system/200-pod.bats b/test/system/200-pod.bats
index 7b7f5e8bb..8d884f6af 100644
--- a/test/system/200-pod.bats
+++ b/test/system/200-pod.bats
@@ -517,4 +517,11 @@ spec:
     wait
 }
 
+@test "podman pod rm --force bogus" {
+    run_podman 1 pod rm bogus
+    is "$output" "Error: .*bogus.*: no such pod" "Should print error"
+    run_podman pod rm --force bogus
+    is "$output" "" "Should print no output"
+}
+
 # vim: filetype=sh
diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats
index 50eb15216..d0f9266ba 100644
--- a/test/system/500-networking.bats
+++ b/test/system/500-networking.bats
@@ -259,7 +259,7 @@ load helpers
 
     run_podman rm -t 0 -f $cid
     run_podman network rm $mynetname
-    run_podman 1 network rm -f $mynetname
+    run_podman 1 network rm $mynetname
 }
 
 @test "podman network reload" {
@@ -758,4 +758,11 @@ EOF
     done
 }
 
+@test "podman network rm --force bogus" {
+    run_podman 1 network rm bogus
+    is "$output" "Error: unable to find network with name or ID bogus: network not found" "Should print error"
+    run_podman network rm --force bogus
+    is "$output" "" "Should print no output"
+}
+
 # vim: filetype=sh