diff --git a/internal/command/command_test.go b/internal/command/command_test.go
index 70da240e8..d1a43cf65 100644
--- a/internal/command/command_test.go
+++ b/internal/command/command_test.go
@@ -716,6 +716,10 @@ func testInputMap(t *testing.T, answers map[string]string) func() {
 
 	// Return the cleanup
 	return func() {
+		if len(testInputResponseMap) > 0 {
+			t.Fatalf("expected no unused answers provided to command.testInputMap, got: %v", testInputResponseMap)
+		}
+
 		test = true
 		testInputResponseMap = nil
 	}
diff --git a/internal/command/init_test.go b/internal/command/init_test.go
index a0a5e0b51..b75da1f4f 100644
--- a/internal/command/init_test.go
+++ b/internal/command/init_test.go
@@ -540,11 +540,6 @@ func TestInit_backendConfigFileChange(t *testing.T) {
 	defer os.RemoveAll(td)
 	defer testChdir(t, td)()
 
-	// Ask input
-	defer testInputMap(t, map[string]string{
-		"backend-migrate-to-new": "no",
-	})()
-
 	ui := new(cli.MockUi)
 	view, _ := testView(t)
 	c := &InitCommand{
diff --git a/internal/command/ui_input.go b/internal/command/ui_input.go
index 930bbd842..071982dec 100644
--- a/internal/command/ui_input.go
+++ b/internal/command/ui_input.go
@@ -90,6 +90,7 @@ func (i *UIInput) Input(ctx context.Context, opts *terraform.InputOpts) (string,
 			return "", fmt.Errorf("unexpected input request in test: %s", opts.Id)
 		}
 
+		delete(testInputResponseMap, opts.Id)
 		return v, nil
 	}