diff --git a/cmd/image-builder/main_test.go b/cmd/image-builder/main_test.go
index 98260f9..5263de7 100644
--- a/cmd/image-builder/main_test.go
+++ b/cmd/image-builder/main_test.go
@@ -378,7 +378,6 @@ func TestBuildIntegrationHappy(t *testing.T) {
 
 	script := makeFakeOsbuildScript()
 	fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", script)
-	defer fakeOsbuildCmd.Restore()
 
 	var err error
 	// run inside the tmpdir to validate that the default output dir
@@ -466,7 +465,6 @@ func TestBuildIntegrationArgs(t *testing.T) {
 
 			script := makeFakeOsbuildScript()
 			fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", script)
-			defer fakeOsbuildCmd.Restore()
 
 			err := main.Run()
 			require.NoError(t, err)
@@ -522,8 +520,7 @@ func TestBuildIntegrationErrorsProgressVerbose(t *testing.T) {
 	})
 	defer restore()
 
-	fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", failingOsbuild)
-	defer fakeOsbuildCmd.Restore()
+	testutil.MockCommand(t, "osbuild", failingOsbuild)
 
 	var err error
 	stdout, stderr := testutil.CaptureStdio(t, func() {
@@ -563,8 +560,7 @@ echo "error on stdout"
 >&2 echo "error on stderr"
 exit 1
 `
-	fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", failingOsbuild)
-	defer fakeOsbuildCmd.Restore()
+	testutil.MockCommand(t, "osbuild", failingOsbuild)
 
 	var err error
 	stdout, _ := testutil.CaptureStdio(t, func() {
@@ -611,8 +607,7 @@ func TestBuildIntegrationErrorsProgressTerm(t *testing.T) {
 			restore = main.MockOsArgs(cmd)
 			defer restore()
 
-			fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", failingOsbuild)
-			defer fakeOsbuildCmd.Restore()
+			testutil.MockCommand(t, "osbuild", failingOsbuild)
 
 			var err error
 			stdout, stderr := testutil.CaptureStdio(t, func() {
@@ -867,7 +862,6 @@ func TestBuildCrossArchSmoke(t *testing.T) {
 
 		script := makeFakeOsbuildScript()
 		fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", script)
-		defer fakeOsbuildCmd.Restore()
 
 		var err error
 		_, stderr := testutil.CaptureStdio(t, func() {
@@ -925,8 +919,7 @@ func TestBuildIntegrationOutputFilename(t *testing.T) {
 	defer restore()
 
 	script := makeFakeOsbuildScript()
-	fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", script)
-	defer fakeOsbuildCmd.Restore()
+	testutil.MockCommand(t, "osbuild", script)
 
 	err := main.Run()
 	assert.NoError(t, err)
diff --git a/cmd/image-builder/upload_test.go b/cmd/image-builder/upload_test.go
index c20c4f4..46c6f8b 100644
--- a/cmd/image-builder/upload_test.go
+++ b/cmd/image-builder/upload_test.go
@@ -175,8 +175,7 @@ func TestBuildAndUploadWithAWSMock(t *testing.T) {
 
 	outputDir := t.TempDir()
 	fakeOsbuildScript := makeFakeOsbuildScript()
-	fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", fakeOsbuildScript)
-	defer fakeOsbuildCmd.Restore()
+	testutil.MockCommand(t, "osbuild", fakeOsbuildScript)
 
 	var fakeStdout bytes.Buffer
 	restore = main.MockOsStdout(&fakeStdout)
@@ -224,8 +223,7 @@ func TestBuildAmiButNotUpload(t *testing.T) {
 
 	outputDir := t.TempDir()
 	fakeOsbuildScript := makeFakeOsbuildScript()
-	fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", fakeOsbuildScript)
-	defer fakeOsbuildCmd.Restore()
+	testutil.MockCommand(t, "osbuild", fakeOsbuildScript)
 
 	var fakeStdout bytes.Buffer
 	restore = main.MockOsStdout(&fakeStdout)
@@ -255,8 +253,7 @@ func TestBuildAndUploadWithAWSPartialCmdlineErrors(t *testing.T) {
 
 	outputDir := t.TempDir()
 	fakeOsbuildScript := makeFakeOsbuildScript()
-	fakeOsbuildCmd := testutil.MockCommand(t, "osbuild", fakeOsbuildScript)
-	defer fakeOsbuildCmd.Restore()
+	testutil.MockCommand(t, "osbuild", fakeOsbuildScript)
 
 	restore := main.MockOsArgs([]string{
 		"build",
diff --git a/internal/testutil/testutil.go b/internal/testutil/testutil.go
index efa27d3..65f2ff1 100644
--- a/internal/testutil/testutil.go
+++ b/internal/testutil/testutil.go
@@ -41,10 +41,6 @@ func (mc *MockCmd) Path() string {
 	return filepath.Join(mc.binDir, mc.name)
 }
 
-func (mc *MockCmd) Restore() error {
-	return os.RemoveAll(mc.binDir)
-}
-
 func (mc *MockCmd) Calls() [][]string {
 	b, err := os.ReadFile(mc.Path() + ".run")
 	if os.IsNotExist(err) {
diff --git a/internal/testutil/testutil_test.go b/internal/testutil/testutil_test.go
index 3067946..020baf0 100644
--- a/internal/testutil/testutil_test.go
+++ b/internal/testutil/testutil_test.go
@@ -13,7 +13,6 @@ import (
 
 func TestMockCommand(t *testing.T) {
 	fakeCmd := testutil.MockCommand(t, "false", "exit 0")
-	defer fakeCmd.Restore()
 
 	err := exec.Command("false", "run1-arg1", "run1-arg2").Run()
 	assert.NoError(t, err)