diff --git a/routing/dht/dht_test.go b/routing/dht/dht_test.go
index 9e8251a43..84f5f830e 100644
--- a/routing/dht/dht_test.go
+++ b/routing/dht/dht_test.go
@@ -431,6 +431,15 @@ func TestConnectCollision(t *testing.T) {
 		done <- struct{}{}
 	}()
 
-	<-done
-	<-done
+	timeout := time.After(time.Second * 5)
+	select {
+	case <-done:
+	case <-timeout:
+		t.Fatal("Timeout received!")
+	}
+	select {
+	case <-done:
+	case <-timeout:
+		t.Fatal("Timeout received!")
+	}
 }