diff --git a/internal/p2p/router.go b/internal/p2p/router.go
index 7b3b2505c..f608cada8 100644
--- a/internal/p2p/router.go
+++ b/internal/p2p/router.go
@@ -476,8 +476,6 @@ func (r *Router) routeChannel(
 				}
 
 				if !contains {
-					r.logger.Error("tried to send message across a channel that the peer doesn't have available",
-						"peer", envelope.To, "channel", chID)
 					continue
 				}
 
diff --git a/internal/statesync/snapshots.go b/internal/statesync/snapshots.go
index b819c405c..11cd78394 100644
--- a/internal/statesync/snapshots.go
+++ b/internal/statesync/snapshots.go
@@ -80,7 +80,7 @@ func newSnapshotPool(stateProvider StateProvider) *snapshotPool {
 // snapshot height is verified using the light client, and the expected app hash
 // is set for the snapshot.
 func (p *snapshotPool) Add(peerID types.NodeID, snapshot *snapshot) (bool, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	ctx, cancel := context.WithTimeout(context.TODO(), 30*time.Second)
 	defer cancel()
 
 	appHash, err := p.stateProvider.AppHash(ctx, snapshot.Height)
diff --git a/test/e2e/runner/rpc.go b/test/e2e/runner/rpc.go
index 7b2549d48..d86c02e93 100644
--- a/test/e2e/runner/rpc.go
+++ b/test/e2e/runner/rpc.go
@@ -55,7 +55,7 @@ func waitForHeight(testnet *e2e.Testnet, height int64) (*types.Block, *types.Blo
 		if len(clients) == 0 {
 			return nil, nil, errors.New("unable to connect to any network nodes")
 		}
-		if time.Since(lastIncrease) >= 20*time.Second {
+		if time.Since(lastIncrease) >= 30*time.Second {
 			if maxResult == nil {
 				return nil, nil, errors.New("chain stalled at unknown height")
 			}
diff --git a/test/e2e/runner/start.go b/test/e2e/runner/start.go
index 5a1768b32..5d7c88529 100644
--- a/test/e2e/runner/start.go
+++ b/test/e2e/runner/start.go
@@ -43,7 +43,7 @@ func Start(testnet *e2e.Testnet) error {
 		if err := execCompose(testnet.Dir, "up", "-d", node.Name); err != nil {
 			return err
 		}
-		if _, err := waitForNode(node, 0, 15*time.Second); err != nil {
+		if _, err := waitForNode(node, 0, 30*time.Second); err != nil {
 			return err
 		}
 		logger.Info(fmt.Sprintf("Node %v up on http://127.0.0.1:%v", node.Name, node.ProxyPort))
diff --git a/test/e2e/runner/wait.go b/test/e2e/runner/wait.go
index b1967cb9b..1ae9050e2 100644
--- a/test/e2e/runner/wait.go
+++ b/test/e2e/runner/wait.go
@@ -30,5 +30,5 @@ func WaitUntil(testnet *e2e.Testnet, height int64) error {
 // waitingTime estimates how long it should take for a node to reach the height.
 // More nodes in a network implies we may expect a slower network and may have to wait longer.
 func waitingTime(nodes int) time.Duration {
-	return time.Duration(20+(nodes*4)) * time.Second
+	return time.Duration(30+(nodes*5)) * time.Second
 }