diff --git a/tests/test_main.py b/tests/test_main.py
index cf4e82e38..6d6eaeae7 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -2,11 +2,10 @@ import os
 import shutil
 import subprocess
 import tempfile
-from io import StringIO
 from unittest import TestCase
 from unittest.mock import patch
 
-from prompt_toolkit.input import create_input
+from prompt_toolkit.input import create_pipe_input
 from prompt_toolkit.output import DummyOutput
 
 from aider.main import main
@@ -28,59 +27,75 @@ class TestMain(TestCase):
         self.patcher.stop()
 
     def test_main_with_empty_dir_no_files_on_command(self):
-        pipe_input = create_input(StringIO(""))
-        main([], input=pipe_input, output=DummyOutput())
-        pipe_input.close()
+        with create_pipe_input() as pipe_input:
+            pipe_input.send_text("/exit\n")
+            try:
+                main([], input=pipe_input, output=DummyOutput())
+            except SystemExit:
+                pass
 
     def test_main_with_empty_dir_new_file(self):
-        pipe_input = create_input(StringIO(""))
-        main(["foo.txt"], input=pipe_input, output=DummyOutput())
-        pipe_input.close()
+        with create_pipe_input() as pipe_input:
+            pipe_input.send_text("/exit\n")
+            try:
+                main(["foo.txt"], input=pipe_input, output=DummyOutput())
+            except SystemExit:
+                pass
         self.assertTrue(os.path.exists("foo.txt"))
 
     def test_main_with_empty_git_dir_new_file(self):
         subprocess.run(["git", "init"])
         subprocess.run(["git", "config", "user.email", "dummy@example.com"])
         subprocess.run(["git", "config", "user.name", "Dummy User"])
-        pipe_input = create_input(StringIO(""))
-        main(["--yes", "foo.txt"], input=pipe_input, output=DummyOutput())
-        pipe_input.close()
+        with create_pipe_input() as pipe_input:
+            pipe_input.send_text("/exit\n")
+            try:
+                main(["--yes", "foo.txt"], input=pipe_input, output=DummyOutput())
+            except SystemExit:
+                pass
         self.assertTrue(os.path.exists("foo.txt"))
 
     def test_main_args(self):
         with patch("aider.main.Coder.create") as MockCoder:
-            main(["--no-auto-commits"])
+            with create_pipe_input() as pipe_input:
+                main(["--no-auto-commits"], input=pipe_input)
             _, kwargs = MockCoder.call_args
             assert kwargs["auto_commits"] is False
 
         with patch("aider.main.Coder.create") as MockCoder:
-            main(["--auto-commits"])
+            with create_pipe_input() as pipe_input:
+                main(["--auto-commits"], input=pipe_input)
             _, kwargs = MockCoder.call_args
             assert kwargs["auto_commits"] is True
 
         with patch("aider.main.Coder.create") as MockCoder:
-            main([])
+            with create_pipe_input() as pipe_input:
+                main([], input=pipe_input)
             _, kwargs = MockCoder.call_args
             assert kwargs["dirty_commits"] is True
             assert kwargs["auto_commits"] is True
             assert kwargs["pretty"] is True
 
         with patch("aider.main.Coder.create") as MockCoder:
-            main(["--no-pretty"])
+            with create_pipe_input() as pipe_input:
+                main(["--no-pretty"], input=pipe_input)
             _, kwargs = MockCoder.call_args
             assert kwargs["pretty"] is False
 
         with patch("aider.main.Coder.create") as MockCoder:
-            main(["--pretty"])
+            with create_pipe_input() as pipe_input:
+                main(["--pretty"], input=pipe_input)
             _, kwargs = MockCoder.call_args
             assert kwargs["pretty"] is True
 
         with patch("aider.main.Coder.create") as MockCoder:
-            main(["--no-dirty-commits"])
+            with create_pipe_input() as pipe_input:
+                main(["--no-dirty-commits"], input=pipe_input)
             _, kwargs = MockCoder.call_args
             assert kwargs["dirty_commits"] is False
 
         with patch("aider.main.Coder.create") as MockCoder:
-            main(["--dirty-commits"])
+            with create_pipe_input() as pipe_input:
+                main(["--dirty-commits"], input=pipe_input)
             _, kwargs = MockCoder.call_args
             assert kwargs["dirty_commits"] is True