diff --git a/test/e2e/containers_conf_test.go b/test/e2e/containers_conf_test.go
index c7e96dfde3..2fa5e83632 100644
--- a/test/e2e/containers_conf_test.go
+++ b/test/e2e/containers_conf_test.go
@@ -37,11 +37,11 @@ var _ = Describe("Verify podman containers.conf usage", func() {
 	})
 
 	AfterEach(func() {
+		os.Unsetenv("CONTAINERS_CONF")
+		os.Unsetenv("CONTAINERS_CONF_OVERRIDE")
 		podmanTest.Cleanup()
 		f := CurrentSpecReport()
 		processTestResult(f)
-		os.Unsetenv("CONTAINERS_CONF")
-		os.Unsetenv("CONTAINERS_CONF_OVERRIDE")
 	})
 
 	It("limits test", func() {