diff --git a/test_runner/batch_others/test_pageserver_restart.py b/test_runner/batch_others/test_pageserver_restart.py
index 4de940e417..56dcf58b4a 100644
--- a/test_runner/batch_others/test_pageserver_restart.py
+++ b/test_runner/batch_others/test_pageserver_restart.py
@@ -7,9 +7,6 @@ from fixtures.log_helper import log
 def test_fixture_restart(neon_env_builder: NeonEnvBuilder):
     env = neon_env_builder.init_start()
 
-    env.neon_cli.create_branch('test_fixture_restart')
-    pg = env.postgres.create_start('test_fixture_restart')
-
     for i in range(3):
         env.pageserver.stop()
         env.pageserver.start()
diff --git a/test_runner/fixtures/neon_fixtures.py b/test_runner/fixtures/neon_fixtures.py
index d5b0af3813..4d7c79535d 100644
--- a/test_runner/fixtures/neon_fixtures.py
+++ b/test_runner/fixtures/neon_fixtures.py
@@ -1495,6 +1495,10 @@ class NeonPageserver(PgProtocol):
         """
         if self.running:
             self.env.neon_cli.pageserver_stop(immediate)
+            # HACK This fixes https://github.com/neondatabase/neon/issues/2247
+            #      in most cases, but we should probably wait on some event rather
+            #      than wait 0.1 seconds.
+            time.sleep(0.1)
             self.running = False
         return self