diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index 15bac560c8..89c5362784 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -137,7 +137,7 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 	// Cache images
 	cwd, _ := os.Getwd()
 	INTEGRATION_ROOT = filepath.Join(cwd, "../../")
-	podman := PodmanTestSetup(os.TempDir())
+	podman := PodmanTestSetup(GinkgoT().TempDir())
 
 	// Pull cirros but don't put it into the cache
 	pullImages := []string{CIRROS_IMAGE, fedoraToolbox, volumeTest}
@@ -180,6 +180,9 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 		podman.StopRemoteService()
 	}
 
+	// remove temporary podman files, images are now cached in ImageCacheDir
+	podman.removeCache(podman.TempDir)
+
 	return []byte(path)
 }, func(data []byte) {
 	cwd, _ := os.Getwd()