diff --git a/src/connection-manager/index.js b/src/connection-manager/index.js
index 8df9521b..cc64468d 100644
--- a/src/connection-manager/index.js
+++ b/src/connection-manager/index.js
@@ -171,18 +171,22 @@ class ConnectionManager extends EventEmitter {
    * @param {Connection} connection
    */
   onConnect (connection) {
-    const peerId = connection.remotePeer.toB58String()
-    const storedConn = this.connections.get(peerId)
+    const peerId = connection.remotePeer
+    const peerIdStr = peerId.toB58String()
+    const storedConn = this.connections.get(peerIdStr)
 
     if (storedConn) {
       storedConn.push(connection)
     } else {
-      this.connections.set(peerId, [connection])
+      this.connections.set(peerIdStr, [connection])
       this.emit('peer:connect', connection)
     }
 
-    if (!this._peerValues.has(peerId)) {
-      this._peerValues.set(peerId, this._options.defaultPeerValue)
+    this._libp2p.peerStore.addressBook.add(peerId, [connection.remoteAddr])
+    this._libp2p.peerStore.keyBook.set(peerId, peerId.pubKey)
+
+    if (!this._peerValues.has(peerIdStr)) {
+      this._peerValues.set(peerIdStr, this._options.defaultPeerValue)
     }
 
     this._checkLimit('maxConnections', this.size)
diff --git a/test/identify/index.spec.js b/test/identify/index.spec.js
index 9ca892ff..abcbbeb3 100644
--- a/test/identify/index.spec.js
+++ b/test/identify/index.spec.js
@@ -242,8 +242,8 @@ describe('Identify', () => {
       expect(connection).to.exist()
 
       // Wait for peer store to be updated
-      // Dialer._createDialTarget (add), Identify (replace)
-      await pWaitFor(() => peerStoreSpySet.callCount === 1 && peerStoreSpyAdd.callCount === 1)
+      // Dialer._createDialTarget (add), Connected (add), Identify (replace)
+      await pWaitFor(() => peerStoreSpySet.callCount === 1 && peerStoreSpyAdd.callCount === 2)
       expect(libp2p.identifyService.identify.callCount).to.equal(1)
 
       // The connection should have no open streams
diff --git a/test/peer-store/peer-store.node.js b/test/peer-store/peer-store.node.js
index 4b151424..30c2230e 100644
--- a/test/peer-store/peer-store.node.js
+++ b/test/peer-store/peer-store.node.js
@@ -3,7 +3,7 @@
 
 const chai = require('chai')
 chai.use(require('dirty-chai'))
-chai.use(require('chai-as-promised'))
+chai.use(require('chai-bytes'))
 const { expect } = chai
 const sinon = require('sinon')
 
@@ -23,12 +23,29 @@ describe('libp2p.peerStore', () => {
     })
   })
 
-  it('adds peer address to AddressBook when establishing connection', async () => {
+  it('adds peer address to AddressBook and keys to the keybook when establishing connection', async () => {
+    const idStr = libp2p.peerId.toB58String()
+    const remoteIdStr = remoteLibp2p.peerId.toB58String()
+
     const spyAddressBook = sinon.spy(libp2p.peerStore.addressBook, 'add')
-    const remoteMultiaddr = `${remoteLibp2p.multiaddrs[0]}/p2p/${remoteLibp2p.peerId.toB58String()}`
+    const spyKeyBook = sinon.spy(libp2p.peerStore.keyBook, 'set')
+
+    const remoteMultiaddr = `${remoteLibp2p.multiaddrs[0]}/p2p/${remoteIdStr}`
     const conn = await libp2p.dial(remoteMultiaddr)
 
     expect(conn).to.exist()
-    expect(spyAddressBook).to.have.property('callCount', 1)
+    expect(spyAddressBook).to.have.property('called', true)
+    expect(spyKeyBook).to.have.property('called', true)
+
+    const localPeers = libp2p.peerStore.peers
+    expect(localPeers.size).to.equal(1)
+    // const publicKeyInLocalPeer = localPeers.get(remoteIdStr).id.pubKey
+    // expect(publicKeyInLocalPeer.bytes).to.equalBytes(remoteLibp2p.peerId.pubKey.bytes)
+
+    const remotePeers = remoteLibp2p.peerStore.peers
+    expect(remotePeers.size).to.equal(1)
+    const publicKeyInRemotePeer = remotePeers.get(idStr).id.pubKey
+    expect(publicKeyInRemotePeer).to.exist()
+    expect(publicKeyInRemotePeer.bytes).to.equalBytes(libp2p.peerId.pubKey.bytes)
   })
 })