diff --git a/kitty/prewarm.py b/kitty/prewarm.py
index d4c711402..7160b8eb5 100644
--- a/kitty/prewarm.py
+++ b/kitty/prewarm.py
@@ -164,7 +164,7 @@ class PrewarmProcess:
             input_buf = b''
             st = time.monotonic()
             while time.monotonic() - st < timeout:
-                for (fd, event) in self.poll.poll(200):
+                for (fd, event) in self.poll.poll(2):
                     if event & error_events:
                         raise PrewarmProcessFailed('Failed doing I/O with prewarm process')
                     if fd == self.read_from_process_fd and event & select.POLLIN:
@@ -192,7 +192,7 @@ class PrewarmProcess:
         st = time.monotonic()
         while time.monotonic() - st < timeout and output_buf:
             self.poll_to_send(bool(output_buf))
-            for (fd, event) in self.poll.poll(200):
+            for (fd, event) in self.poll.poll(2):
                 if event & error_events:
                     raise PrewarmProcessFailed('Failed doing I/O with prewarm process: {event}')
                 if fd == self.write_to_process_fd and event & select.POLLOUT:
diff --git a/kitty_tests/prewarm.py b/kitty_tests/prewarm.py
index 5c479008a..cb3b77e34 100644
--- a/kitty_tests/prewarm.py
+++ b/kitty_tests/prewarm.py
@@ -6,7 +6,9 @@ import json
 import os
 import select
 import signal
+import subprocess
 import tempfile
+import time
 
 from kitty.constants import is_macos, kitty_exe
 from kitty.fast_data_types import (
@@ -62,7 +64,6 @@ import os, json; from kitty.utils import *; from kitty.fast_data_types import ge
         self.ae(int(p.from_worker.readline()), data['pid'])
 
     def test_signal_handling(self):
-        import subprocess
         expecting_code = 0
         found_signal = False
 
@@ -82,12 +83,17 @@ import os, json; from kitty.utils import *; from kitty.fast_data_types import ge
             if signal is not None:
                 p.send_signal(signal)
             if q is not None:
-                for (fd, event) in poll.poll(5000):
-                    read_signals(signal_read_fd, handle_signal)
+                st = time.monotonic()
+                while time.monotonic() - st < 5:
+                    for (fd, event) in poll.poll(10):
+                        if fd == signal_read_fd:
+                            read_signals(signal_read_fd, handle_signal)
+                    if found_signal:
+                        break
                 self.assertTrue(found_signal, f'Failed to to get SIGCHLD for signal {signal}')
 
         poll = select.poll()
-        p = subprocess.Popen([kitty_exe(), '+runpy', 'while True: x=2+2'], stderr=subprocess.DEVNULL, stdin=subprocess.PIPE)
+        p = subprocess.Popen([kitty_exe(), '+runpy', 'while True:\n  x=2+2'], stderr=subprocess.DEVNULL, stdin=subprocess.PIPE)
         signal_read_fd = install_signal_handlers(signal.SIGCHLD)[0]
         try:
             poll.register(signal_read_fd, select.POLLIN)