diff --git a/test/system/090-events.bats b/test/system/090-events.bats
index 1f5752521c..ff3ffb8b61 100644
--- a/test/system/090-events.bats
+++ b/test/system/090-events.bats
@@ -355,7 +355,15 @@ EOF
     local cname=c-$1-$(safename)
     t0=$(date --iso-8601=seconds)
 
-    CONTAINERS_CONF_OVERRIDE=$containersConf run_podman create --name=$cname $IMAGE
+    # Create a base image, airgapped from $IMAGE so this test is
+    # isolated from tag/label changes.
+    baseimage=i-$1-$(safename)
+    run_podman create -q $IMAGE true
+    local tmpcid=$output
+    run_podman commit -q $tmpcid $baseimage
+    run_podman rm $tmpcid
+
+    CONTAINERS_CONF_OVERRIDE=$containersConf run_podman create --name=$cname $baseimage
     CONTAINERS_CONF_OVERRIDE=$containersConf run_podman container inspect --size=true $cname
     inspect_json=$(jq -r --tab . <<< "$output")
 
@@ -379,6 +387,7 @@ EOF
     assert "$output" != ".*EffectiveCaps.*"
 
     run_podman rm $cname
+    run_podman rmi $baseimage
 }
 
 # bats test_tags=ci:parallel
diff --git a/test/system/252-quadlet.bats b/test/system/252-quadlet.bats
index 7353c09121..c7a80277e1 100644
--- a/test/system/252-quadlet.bats
+++ b/test/system/252-quadlet.bats
@@ -1140,10 +1140,10 @@ EOF
     # Generate a test image and push it to the registry.
     # For safety in parallel runs, test image must be isolated
     # from $IMAGE. A simple add-tag will not work. (#23756)
-    tmpcname=c-tmp-$(safename)
-    run_podman run --name $tmpcname $IMAGE true
-    run_podman commit -q $tmpcname $image_for_test
-    run_podman rm $tmpcname
+    run_podman create -q $IMAGE true
+    local tmpcid=$output
+    run_podman commit -q $tmpcid $image_for_test
+    run_podman rm $tmpcid
     run_podman image push --tls-verify=false --authfile=$authfile $image_for_test
 
     # Remove the local image to make sure it will be pulled again
@@ -1440,10 +1440,10 @@ EOF
     # Generate a test image, save it into a file, and remove it.
     # For safety in parallel runs, test image must be isolated
     # from $IMAGE. A simple add-tag will not work. (#23756)
-    tmpcname=c-tmp-$(safename)
-    run_podman run --name $tmpcname $IMAGE true
-    run_podman commit -q $tmpcname $image_for_test
-    run_podman rm $tmpcname
+    run_podman create -q $IMAGE true
+    local tmpcid=$output
+    run_podman commit -q $tmpcid $image_for_test
+    run_podman rm $tmpcid
     run_podman image save --format docker-archive --output $archive_file $image_for_test
     run_podman image rm $image_for_test