diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go
index 3c95cb227b..f03c953e89 100644
--- a/p2p/simulations/network.go
+++ b/p2p/simulations/network.go
@@ -841,7 +841,7 @@ func (net *Network) snapshot(addServices []string, removeServices []string) (*Sn
 }
 
 // longrunning tests may need a longer timeout
-var snapshotLoadTimeout = 7200 * time.Second
+var snapshotLoadTimeout = 900 * time.Second
 
 // Load loads a network snapshot
 func (net *Network) Load(snap *Snapshot) error {
diff --git a/swarm/network/stream/delivery_test.go b/swarm/network/stream/delivery_test.go
index f551389bee..50b7881504 100644
--- a/swarm/network/stream/delivery_test.go
+++ b/swarm/network/stream/delivery_test.go
@@ -534,14 +534,6 @@ func testDeliveryFromNodes(t *testing.T, nodes, chunkCount int, skipCheck bool)
 				return err
 			}
 
-			log.Debug("Waiting for kademlia")
-			// TODO this does not seem to be correct usage of the function, as the simulation may have no kademlias
-			/*
-				if _, err := sim.WaitTillHealthy(ctx); err != nil {
-					return err
-				}
-			*/
-
 			//get the pivot node's filestore
 			item, ok := sim.NodeItem(pivot, bucketKeyFileStore)
 			if !ok {
diff --git a/swarm/network/stream/snapshot_retrieval_test.go b/swarm/network/stream/snapshot_retrieval_test.go
index 79cf56ed72..2fdf8e9e37 100644
--- a/swarm/network/stream/snapshot_retrieval_test.go
+++ b/swarm/network/stream/snapshot_retrieval_test.go
@@ -86,7 +86,7 @@ func TestRetrieval(t *testing.T) {
 		chnkCnt := []int{32}
 
 		if *longrunning {
-			nodeCnt = []int{16, 32, 128}
+			nodeCnt = []int{16, 32, 64}
 			chnkCnt = []int{4, 32, 256}
 		} else if testutil.RaceEnabled {
 			nodeCnt = []int{4}