2 files changed, 15 insertions, 26 deletions
diff --git a/test/system/010-images.bats b/test/system/010-images.bats
index 76caf282b..e7c88408e 100644
--- a/test/system/010-images.bats
+++ b/test/system/010-images.bats
@@ -228,4 +228,17 @@ Labels.created_at | 20[0-9-]\\\+T[0-9:]\\\+Z
     run_podman rmi ${aaa_name}:${aaa_tag} ${zzz_name}:${zzz_tag}
 }
 
+# Regression test for #8931
+@test "podman images - bare manifest list" {
+    # Create an empty manifest list and list images.
+
+    run_podman inspect --format '{{.ID}}' $IMAGE
+    iid=$output
+
+    run_podman manifest create test:1.0
+    run_podman images --format '{{.ID}}' --no-trunc
+    [[ "$output" == *"sha256:$iid"* ]]
+
+    run_podman rmi test:1.0
+}
 # vim: filetype=sh
diff --git a/test/system/120-load.bats b/test/system/120-load.bats
index 272e2ae93..902cd9f5e 100644
--- a/test/system/120-load.bats
+++ b/test/system/120-load.bats
@@ -59,15 +59,13 @@ verify_iid_and_name() {
     local new_tag=t1$(random_string 6 | tr A-Z a-z)
     run_podman rmi $fqin
 
-    new_fqin=localhost/$new_name:$new_tag
-    run_podman load -i $archive $new_fqin
+    run_podman load -i $archive
     run_podman images --format '{{.Repository}}:{{.Tag}}' --sort tag
     is "${lines[0]}" "$IMAGE"     "image is preserved"
     is "${lines[1]}" "$fqin"      "image is reloaded with old fqin"
-    is "${lines[2]}" "$new_fqin"  "image is reloaded with new fqin too"
 
     # Clean up
-    run_podman rmi $fqin $new_fqin
+    run_podman rmi $fqin
 }
 
 
@@ -118,28 +116,6 @@ verify_iid_and_name() {
     verify_iid_and_name $img_name
 }
 
-@test "podman load - NAME and NAME:TAG arguments work" {
-    get_iid_and_name
-    run_podman save $iid -o $archive
-    run_podman rmi $iid
-
-    # Load with just a name (note: names must be lower-case)
-    random_name=$(random_string 20 | tr A-Z a-z)
-    run_podman load -i $archive $random_name
-    verify_iid_and_name "localhost/$random_name:latest"
-
-    # Load with NAME:TAG arg
-    run_podman rmi $iid
-    random_tag=$(random_string 10 | tr A-Z a-z)
-    run_podman load -i $archive $random_name:$random_tag
-    verify_iid_and_name "localhost/$random_name:$random_tag"
-
-    # Cleanup: restore desired image name
-    run_podman tag $iid $img_name
-    run_podman rmi "$random_name:$random_tag"
-}
-
-
 @test "podman load - will not read from tty" {
     if [ ! -t 0 ]; then
         skip "STDIN is not a tty"