diff --git a/src/index.js b/src/index.js
index 4d4c7bcf..22ef3c98 100644
--- a/src/index.js
+++ b/src/index.js
@@ -251,7 +251,7 @@ class Libp2p extends EventEmitter {
    * @returns {Map<string, Connection[]>}
    */
   get connections () {
-    return this.registrar.connections
+    return this.connectionManager.connections
   }
 
   /**
diff --git a/test/connection-manager/index.node.js b/test/connection-manager/index.node.js
index bec44635..3a3d0002 100644
--- a/test/connection-manager/index.node.js
+++ b/test/connection-manager/index.node.js
@@ -7,13 +7,11 @@ chai.use(require('chai-as-promised'))
 const { expect } = chai
 const sinon = require('sinon')
 
-const multiaddr = require('multiaddr')
-
 const peerUtils = require('../utils/creators/peer')
 const mockConnection = require('../utils/mockConnection')
 const baseOptions = require('../utils/base-options.browser')
 
-const listenMultiaddr = multiaddr('/ip4/127.0.0.1/tcp/15002/ws')
+const listenMultiaddr = '/ip4/127.0.0.1/tcp/15002/ws'
 
 describe('Connection Manager', () => {
   let libp2p
@@ -57,7 +55,7 @@ describe('Connection Manager', () => {
     const [remoteLibp2p] = await peerUtils.createPeer({
       config: {
         addresses: {
-          listen: [multiaddr('/ip4/127.0.0.1/tcp/15003/ws')]
+          listen: ['/ip4/127.0.0.1/tcp/15003/ws']
         },
         modules: baseOptions.modules
       }
@@ -67,7 +65,7 @@ describe('Connection Manager', () => {
     sinon.spy(libp2p.connectionManager, 'emit')
     sinon.spy(remoteLibp2p.connectionManager, 'emit')
 
-    libp2p.peerStore.addressBook.set(remoteLibp2p.peerId, remoteLibp2p.addresses.listen)
+    libp2p.peerStore.addressBook.set(remoteLibp2p.peerId, remoteLibp2p.multiaddrs)
     await libp2p.dial(remoteLibp2p.peerId)
 
     // check connect event
@@ -86,3 +84,32 @@ describe('Connection Manager', () => {
     expect(remoteLibp2p.connectionManager.size).to.eql(0)
   })
 })
+
+describe('libp2p.connections', () => {
+  it('libp2p.connections gets the connectionManager conns', async () => {
+    const [libp2p] = await peerUtils.createPeer({
+      config: {
+        addresses: {
+          listen: ['/ip4/127.0.0.1/tcp/15003/ws']
+        },
+        modules: baseOptions.modules
+      }
+    })
+    const [remoteLibp2p] = await peerUtils.createPeer({
+      config: {
+        addresses: {
+          listen: ['/ip4/127.0.0.1/tcp/15004/ws']
+        },
+        modules: baseOptions.modules
+      }
+    })
+
+    libp2p.peerStore.addressBook.set(remoteLibp2p.peerId, remoteLibp2p.multiaddrs)
+    await libp2p.dial(remoteLibp2p.peerId)
+
+    expect(libp2p.connections.size).to.eql(1)
+
+    await libp2p.stop()
+    await remoteLibp2p.stop()
+  })
+})
diff --git a/test/content-routing/dht/configuration.node.js b/test/content-routing/dht/configuration.node.js
index d89f73b7..e4a0bda9 100644
--- a/test/content-routing/dht/configuration.node.js
+++ b/test/content-routing/dht/configuration.node.js
@@ -6,13 +6,12 @@ chai.use(require('dirty-chai'))
 const { expect } = chai
 
 const mergeOptions = require('merge-options')
-const multiaddr = require('multiaddr')
 
 const { create } = require('../../../src')
 const { baseOptions, subsystemOptions } = require('./utils')
 const peerUtils = require('../../utils/creators/peer')
 
-const listenAddr = multiaddr('/ip4/127.0.0.1/tcp/0')
+const listenAddr = '/ip4/127.0.0.1/tcp/0'
 
 describe('DHT subsystem is configurable', () => {
   let libp2p
diff --git a/test/content-routing/dht/operation.node.js b/test/content-routing/dht/operation.node.js
index 7afbdb4a..b9dc7118 100644
--- a/test/content-routing/dht/operation.node.js
+++ b/test/content-routing/dht/operation.node.js
@@ -6,9 +6,9 @@ const chai = require('chai')
 chai.use(require('dirty-chai'))
 const { expect } = chai
 
+const multiaddr = require('multiaddr')
 const pWaitFor = require('p-wait-for')
 const mergeOptions = require('merge-options')
-const multiaddr = require('multiaddr')
 
 const { create } = require('../../../src')
 const { subsystemOptions, subsystemMulticodecs } = require('./utils')
diff --git a/test/core/listening.node.js b/test/core/listening.node.js
index de4bf47b..14622d23 100644
--- a/test/core/listening.node.js
+++ b/test/core/listening.node.js
@@ -5,13 +5,12 @@ const chai = require('chai')
 chai.use(require('dirty-chai'))
 const { expect } = chai
 
-const multiaddr = require('multiaddr')
 const Transport = require('libp2p-tcp')
 
 const { create } = require('../../src')
 const peerUtils = require('../utils/creators/peer')
 
-const listenAddr = multiaddr('/ip4/0.0.0.0/tcp/0')
+const listenAddr = '/ip4/0.0.0.0/tcp/0'
 
 describe('Listening', () => {
   let peerId
diff --git a/test/dialing/relay.node.js b/test/dialing/relay.node.js
index bdf8f1b1..79f8ac37 100644
--- a/test/dialing/relay.node.js
+++ b/test/dialing/relay.node.js
@@ -19,7 +19,7 @@ const baseOptions = require('../utils/base-options')
 const Libp2p = require('../../src')
 const { codes: Errors } = require('../../src/errors')
 
-const listenAddr = multiaddr('/ip4/0.0.0.0/tcp/0')
+const listenAddr = '/ip4/0.0.0.0/tcp/0'
 
 describe('Dialing (via relay, TCP)', () => {
   let srcLibp2p