diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go
index a78b7a3c19..d834d35d3d 100644
--- a/test/e2e/cp_test.go
+++ b/test/e2e/cp_test.go
@@ -73,10 +73,12 @@ var _ = Describe("Podman cp", func() {
 
 		destFile, err := os.CreateTemp("", "")
 		Expect(err).ToNot(HaveOccurred())
-		defer destFile.Close()
-		defer os.Remove(destFile.Name())
+		destFileName := destFile.Name()
+		destFile.Close()
+		os.Remove(destFileName)
+		defer os.Remove(destFileName)
 
-		session = podmanTest.Podman([]string{"cp", name + ":foo", destFile.Name()})
+		session = podmanTest.Podman([]string{"cp", name + ":foo", destFileName})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
 
@@ -85,7 +87,7 @@ var _ = Describe("Podman cp", func() {
 		Expect(session).Should(Exit(0))
 
 		// Now make sure the content matches.
-		roundtripContent, err := os.ReadFile(destFile.Name())
+		roundtripContent, err := os.ReadFile(destFileName)
 		Expect(err).ToNot(HaveOccurred())
 		Expect(roundtripContent).To(Equal(originalContent))
 	})
@@ -122,15 +124,17 @@ var _ = Describe("Podman cp", func() {
 
 		destFile, err := os.CreateTemp("", "")
 		Expect(err).ToNot(HaveOccurred())
-		defer destFile.Close()
-		defer os.Remove(destFile.Name())
+		destFileName := destFile.Name()
+		destFile.Close()
+		os.Remove(destFileName)
+		defer os.Remove(destFileName)
 
-		session = podmanTest.Podman([]string{"cp", name + ":foo", destFile.Name()})
+		session = podmanTest.Podman([]string{"cp", name + ":foo", destFileName})
 		session.WaitWithDefaultTimeout()
 		Expect(session).Should(Exit(0))
 
 		// Now make sure the content matches.
-		roundtripContent, err := os.ReadFile(destFile.Name())
+		roundtripContent, err := os.ReadFile(destFileName)
 		Expect(err).ToNot(HaveOccurred())
 		Expect(roundtripContent).To(Equal(originalContent))
 	})