diff --git a/kitty_tests/shell_integration.py b/kitty_tests/shell_integration.py
index 0af1589672b..b98a13dd592 100644
--- a/kitty_tests/shell_integration.py
+++ b/kitty_tests/shell_integration.py
@@ -26,9 +26,9 @@ def safe_env_for_running_shell(home_dir, rc='', shell='zsh'):
     if shell == 'zsh':
         ans['ZLE_RPROMPT_INDENT'] = '0'
         with open(os.path.join(home_dir, '.zshenv'), 'w') as f:
-            print('unset GLOBAL_RCS', file=f)
+            print('autoload -Uz compinit && compinit -u\nunset GLOBAL_RCS', file=f)
         with open(os.path.join(home_dir, '.zshrc'), 'w') as f:
-            print(rc, file=f)
+            print(rc + '\n', file=f)
         setup_zsh_env(ans)
     return ans
 
diff --git a/test.py b/test.py
index 1383415ea34..26e48450750 100755
--- a/test.py
+++ b/test.py
@@ -5,8 +5,8 @@
 import os
 import sys
 import warnings
-from tempfile import TemporaryDirectory
 from contextlib import contextmanager
+from tempfile import TemporaryDirectory
 from typing import Iterator
 
 base = os.path.dirname(os.path.abspath(__file__))