diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py
index 42e182741a..2dcd640581 100644
--- a/test_runner/fixtures/neon_fixtures.py
+++ b/test_runner/fixtures/neon_fixtures.py
@@ -479,8 +479,12 @@ class NeonEnvBuilder:
         Configuring pageserver with remote storage is now the default. There will be a warning if pageserver is created without one.
         """
         env = self.init_configs(default_remote_storage_if_missing=default_remote_storage_if_missing)
-        if (timeout_in_seconds is None) and (os.getenv("BUILD_TYPE") == "debug"):
-            timeout_in_seconds = 30
+        if timeout_in_seconds is None:
+            if os.getenv("BUILD_TYPE") == "release":
+                timeout_in_seconds = 15
+            elif os.getenv("BUILD_TYPE") == "debug":
+                timeout_in_seconds = 30
+
         env.start(timeout_in_seconds=timeout_in_seconds)
 
         # Prepare the default branch to start the postgres on later.