diff --git a/p2p/peer_test.go b/p2p/peer_test.go
index 0994683a22..d9640292f7 100644
--- a/p2p/peer_test.go
+++ b/p2p/peer_test.go
@@ -6,6 +6,7 @@ import (
 	"encoding/hex"
 	"io/ioutil"
 	"net"
+	"reflect"
 	"testing"
 	"time"
 )
@@ -222,3 +223,17 @@ func TestPeerActivity(t *testing.T) {
 		t.Fatal("peer error", err)
 	}
 }
+
+func TestNewPeer(t *testing.T) {
+	id := NewSimpleClientIdentity("clientid", "version", "customid", "pubkey")
+	caps := []Cap{{"foo", 2}, {"bar", 3}}
+	p := NewPeer(id, caps)
+	if !reflect.DeepEqual(p.Caps(), caps) {
+		t.Errorf("Caps mismatch: got %v, expected %v", p.Caps(), caps)
+	}
+	if p.Identity() != id {
+		t.Errorf("Identity mismatch: got %v, expected %v", p.Identity(), id)
+	}
+	// Should not hang.
+	p.Disconnect(DiscAlreadyConnected)
+}