diff --git a/integration_tests/tests/test_pageserver.rs b/integration_tests/tests/test_pageserver.rs
index 79d8593315..fd4e8dac67 100644
--- a/integration_tests/tests/test_pageserver.rs
+++ b/integration_tests/tests/test_pageserver.rs
@@ -3,7 +3,6 @@ use control_plane::compute::ComputeControlPlane;
 use control_plane::local_env;
 use control_plane::local_env::PointInTime;
 use control_plane::storage::TestStorageControlPlane;
-use std::{thread, time};
 
 // XXX: force all redo at the end
 // -- restart + seqscan won't read deleted stuff
@@ -113,9 +112,6 @@ fn test_pageserver_two_timelines() {
     node1.start().unwrap();
     node2.start().unwrap();
 
-    //give walreceiver time to connect
-    thread::sleep(time::Duration::from_secs(3));
-
     // check node1
     node1.safe_psql(
         "postgres",
diff --git a/pageserver/src/page_cache.rs b/pageserver/src/page_cache.rs
index 0af7141712..0a9eca57b3 100644
--- a/pageserver/src/page_cache.rs
+++ b/pageserver/src/page_cache.rs
@@ -463,7 +463,9 @@ impl PageCache {
                         self.db.delete_range_cf(cf, &minbuf[..], &maxbuf[..])?;
 
                         maxkey = minkey;
-                    }
+                    } else {
+						break;
+					}
                 }
             }
         }