diff --git a/kitty/prewarm.py b/kitty/prewarm.py
index 3e98de5ed..3ebe24ace 100644
--- a/kitty/prewarm.py
+++ b/kitty/prewarm.py
@@ -38,7 +38,7 @@ if TYPE_CHECKING:
 
 
 error_events = select.POLLERR | select.POLLNVAL | select.POLLHUP
-TIMEOUT = 15.0 if os.environ.get('CI') == 'true' else 5.0
+TIMEOUT = 5.0
 
 
 def restore_python_signal_handlers() -> None:
diff --git a/kitty_tests/prewarm.py b/kitty_tests/prewarm.py
index 5f1a4a6c2..eb9889171 100644
--- a/kitty_tests/prewarm.py
+++ b/kitty_tests/prewarm.py
@@ -50,7 +50,7 @@ import os, json; from kitty.utils import *; from kitty.fast_data_types import ge
         'pid': os.getpid(),
         'font_family': get_options().font_family,
         'stdin': sys.stdin.read(),
-        }, indent=2), "ALL_OUTPUT_PRESENT", sep="")"""], cwd=cwd, env=env, stdin_data=stdin_data)
+        }, indent=2), "ALL_OUTPUT_PRESENT", sep="")"""], cwd=cwd, env=env, stdin_data=stdin_data, timeout=15.0)
         self.assertFalse(pty.screen_contents().strip())
         p.mark_child_as_ready(child.child_id)
         pty.wait_till(lambda: 'ALL_OUTPUT_PRESENT' in pty.screen_contents())