diff --git a/peer/peer_test.go b/peer/peer_test.go
index 5dea9871..53f7c62c 100644
--- a/peer/peer_test.go
+++ b/peer/peer_test.go
@@ -426,11 +426,18 @@ func TestPeerListeners(t *testing.T) {
 		select {
 		case <-verack:
 		case <-time.After(time.Second * 1):
-			t.Errorf("TestPeerListeners: verack timeout\n")
+			t.Error("TestPeerListeners: verack timeout\n")
 			return
 		}
 	}
 
+	select {
+	case <-ok:
+	case <-time.After(time.Second * 1):
+		t.Error("TestPeerListeners: version timeout")
+		return
+	}
+
 	tests := []struct {
 		listener string
 		msg      wire.Message