peerconn.go | 3 ++-
 pex_test.go | 6 +++---

diff --git a/peerconn.go b/peerconn.go
index e13e9fa3735578b389bb2acb75aab9a2954dface..8ff841029ecdfa59f06456f076148fbaf3363962 100644
--- a/peerconn.go
+++ b/peerconn.go
@@ -82,7 +82,6 @@ 	// Indexed by metadata piece, set to true if posted and pending a
 	// response.
 	metadataRequests []bool
 	sentHaves        bitmap.Bitmap
-	pex              pexConnState
 
 	// Stuff controlled by the remote peer.
 	peerInterested        bool
@@ -135,6 +134,8 @@
 	writeBuffer *bytes.Buffer
 	uploadTimer *time.Timer
 	writerCond  sync.Cond
+
+	pex pexConnState
 }
 
 func (cn *PeerConn) connStatusString() string {
diff --git a/pex_test.go b/pex_test.go
index 72d97a64aeadb0bf2e65d0738db69705cfb432bd..161ea1baa67d6b61e33732607a65a9a2b769e1e0 100644
--- a/pex_test.go
+++ b/pex_test.go
@@ -75,7 +75,7 @@
 func TestPexDropped(t *testing.T) {
 	t.Run("belowTarg", func(t *testing.T) {
 		s := &pexState{nc: 1}
-		s.Drop(&PeerConn{peer: peer{RemoteAddr: addrs[0], pex: pexConnState{Listed: true}}})
+		s.Drop(&PeerConn{peer: peer{RemoteAddr: addrs[0]}, pex: pexConnState{Listed: true}})
 		targ := &pexState{
 			hold: []pexEvent{pexEvent{pexDrop, addrs[0], 0}},
 			nc:   0,
@@ -84,7 +84,7 @@ 		require.EqualValues(t, targ, s)
 	})
 	t.Run("aboveTarg", func(t *testing.T) {
 		s := &pexState{nc: pexTargAdded + 1}
-		s.Drop(&PeerConn{peer: peer{RemoteAddr: addrs[0], pex: pexConnState{Listed: true}}})
+		s.Drop(&PeerConn{peer: peer{RemoteAddr: addrs[0]}, pex: pexConnState{Listed: true}})
 		targ := &pexState{
 			ev: []pexEvent{pexEvent{pexDrop, addrs[0], 0}},
 			nc: pexTargAdded,
@@ -93,7 +93,7 @@ 		require.EqualValues(t, targ, s)
 	})
 	t.Run("aboveTargNotListed", func(t *testing.T) {
 		s := &pexState{nc: pexTargAdded + 1}
-		s.Drop(&PeerConn{peer: peer{RemoteAddr: addrs[0], pex: pexConnState{Listed: false}}})
+		s.Drop(&PeerConn{peer: peer{RemoteAddr: addrs[0]}, pex: pexConnState{Listed: false}})
 		targ := &pexState{nc: pexTargAdded + 1}
 		require.EqualValues(t, targ, s)
 	})