diff --git a/whisper/whisperv5/peer_test.go b/whisper/whisperv5/peer_test.go
index 8c54e0ada..6fab4fd72 100644
--- a/whisper/whisperv5/peer_test.go
+++ b/whisper/whisperv5/peer_test.go
@@ -67,7 +67,7 @@ var keys = []string{
 	"7184c1701569e3a4c4d2ddce691edd983b81e42e09196d332e1ae2f1e062cff4",
 }
 
-const NumNodes = 16 // must not exceed the number of keys (32)
+const NumNodes = 3 // must not exceed the number of keys (32)
 
 type TestData struct {
 	counter [NumNodes]int
diff --git a/whisper/whisperv5/whisper_test.go b/whisper/whisperv5/whisper_test.go
index a7bd17e4d..b19954156 100644
--- a/whisper/whisperv5/whisper_test.go
+++ b/whisper/whisperv5/whisper_test.go
@@ -525,7 +525,7 @@ func TestExpiry(t *testing.T) {
 	}
 
 	// wait till expired or timeout
-	for j := 0; j < 20; j++ {
+	for j := 0; j < 50; j++ {
 		time.Sleep(100 * time.Millisecond)
 		if len(w.Envelopes()) == 0 {
 			expired = true