diff --git a/.aegir.js b/.aegir.js
index 891e4374..51e31c89 100644
--- a/.aegir.js
+++ b/.aegir.js
@@ -7,7 +7,7 @@ const PeerId = require('peer-id')
 const PeerInfo = require('peer-info')
 const WebSockets = require('libp2p-websockets')
 const Muxer = require('libp2p-mplex')
-const Crypto = require('./src/insecure/plaintext')
+const Crypto = require('libp2p-secio')
 const pipe = require('it-pipe')
 let libp2p
 
diff --git a/package.json b/package.json
index 14d4e7b0..0487022d 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "libp2p-mdns": "^0.12.3",
     "libp2p-mplex": "^0.9.1",
     "libp2p-pnet": "~0.1.0",
-    "libp2p-secio": "^0.11.1",
+    "libp2p-secio": "^0.12.1",
     "libp2p-spdy": "^0.13.2",
     "libp2p-tcp": "^0.14.1",
     "libp2p-websockets": "^0.13.1",
diff --git a/src/transport-manager.js b/src/transport-manager.js
index 9fe86349..722049a4 100644
--- a/src/transport-manager.js
+++ b/src/transport-manager.js
@@ -82,7 +82,7 @@ class TransportManager {
     try {
       return await transport.dial(ma, options)
     } catch (err) {
-      throw errCode(new Error('Transport dial failed'), codes.ERR_TRANSPORT_DIAL_FAILED, err)
+      throw errCode(err, codes.ERR_TRANSPORT_DIAL_FAILED)
     }
   }
 
diff --git a/test/dialing/direct.node.js b/test/dialing/direct.node.js
index 73eee1ba..6734fb5f 100644
--- a/test/dialing/direct.node.js
+++ b/test/dialing/direct.node.js
@@ -7,7 +7,7 @@ const { expect } = chai
 const sinon = require('sinon')
 const Transport = require('libp2p-tcp')
 const Muxer = require('libp2p-mplex')
-const Crypto = require('../../src/insecure/plaintext')
+const Crypto = require('libp2p-secio')
 const multiaddr = require('multiaddr')
 const PeerId = require('peer-id')
 const PeerInfo = require('peer-info')
diff --git a/test/dialing/direct.spec.js b/test/dialing/direct.spec.js
index 8a16fbab..eb1b158b 100644
--- a/test/dialing/direct.spec.js
+++ b/test/dialing/direct.spec.js
@@ -9,7 +9,7 @@ const pDefer = require('p-defer')
 const delay = require('delay')
 const Transport = require('libp2p-websockets')
 const Muxer = require('libp2p-mplex')
-const Crypto = require('../../src/insecure/plaintext')
+const Crypto = require('libp2p-secio')
 const multiaddr = require('multiaddr')
 const PeerId = require('peer-id')
 const PeerInfo = require('peer-info')
diff --git a/test/upgrading/upgrader.spec.js b/test/upgrading/upgrader.spec.js
index 69d0686f..35d87006 100644
--- a/test/upgrading/upgrader.spec.js
+++ b/test/upgrading/upgrader.spec.js
@@ -13,7 +13,7 @@ const pipe = require('it-pipe')
 const { collect } = require('streaming-iterables')
 const pSettle = require('p-settle')
 const Transport = require('libp2p-websockets')
-const Crypto = require('../../src/insecure/plaintext')
+const Crypto = require('libp2p-secio')
 const Protector = require('../../src/pnet')
 const swarmKeyBuffer = Buffer.from(require('../fixtures/swarm.key'))
 
diff --git a/test/utils/base-options.browser.js b/test/utils/base-options.browser.js
index 3a1337a0..1c1a4255 100644
--- a/test/utils/base-options.browser.js
+++ b/test/utils/base-options.browser.js
@@ -2,7 +2,7 @@
 
 const Transport = require('libp2p-websockets')
 const Muxer = require('libp2p-mplex')
-const Crypto = require('../../src/insecure/plaintext')
+const Crypto = require('libp2p-secio')
 
 module.exports = {
   modules: {
diff --git a/test/utils/base-options.js b/test/utils/base-options.js
index 68163eee..ca7a037c 100644
--- a/test/utils/base-options.js
+++ b/test/utils/base-options.js
@@ -2,7 +2,7 @@
 
 const Transport = require('libp2p-tcp')
 const Muxer = require('libp2p-mplex')
-const Crypto = require('../../src/insecure/plaintext')
+const Crypto = require('libp2p-secio')
 
 module.exports = {
   modules: {