diff --git a/.travis.yml b/.travis.yml
index 5102ee5..476853a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,25 +4,16 @@ language: node_js
 
 matrix:
   include:
-  - node_js: 6
-    env: CXX=g++-4.8
   - node_js: 8
     env: CXX=g++-4.8
-    #  - node_js: stable
-    #    env: CXX=g++-4.8
 
 script:
-  - npm run lint
   - npm run test
-  - npm run coverage
 
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 
-after_success:
-  - npm run coverage-publish
-
 addons:
   firefox: 'latest'
   apt:
diff --git a/circle.yml b/circle.yml
index 0009693..445e40b 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,6 +3,13 @@ machine:
   node:
     version: stable
 
+test:
+  pre:
+    - npm run lint
+  post:
+    - make test
+    - npm run coverage -- --upload --providers coveralls
+
 dependencies:
   pre:
     - google-chrome --version
diff --git a/package.json b/package.json
index c091a75..7a01f27 100644
--- a/package.json
+++ b/package.json
@@ -37,12 +37,12 @@
     "npm": ">=3.0.0"
   },
   "devDependencies": {
-    "aegir": "^12.4.0",
+    "aegir": "^13.0.1",
     "buffer-loader": "0.0.1",
     "chai": "^4.1.2",
     "dirty-chai": "^2.0.1",
     "gulp": "^3.9.1",
-    "libp2p-multiplex": "~0.5.1",
+    "libp2p-mplex": "~0.6.0",
     "libp2p-secio": "~0.9.2",
     "libp2p-spdy": "~0.11.0",
     "libp2p-tcp": "~0.11.5",
diff --git a/test/secio.node.js b/test/secio.node.js
index 5b4b178..6a710a8 100644
--- a/test/secio.node.js
+++ b/test/secio.node.js
@@ -7,7 +7,7 @@ const expect = chai.expect
 chai.use(dirtyChai)
 const parallel = require('async/parallel')
 const TCP = require('libp2p-tcp')
-const multiplex = require('libp2p-multiplex')
+const multiplex = require('libp2p-mplex')
 const pull = require('pull-stream')
 const secio = require('libp2p-secio')
 const PeerBook = require('peer-book')
diff --git a/test/stream-muxers.node.js b/test/stream-muxers.node.js
index f5f2dec..b410e60 100644
--- a/test/stream-muxers.node.js
+++ b/test/stream-muxers.node.js
@@ -9,7 +9,7 @@ chai.use(dirtyChai)
 
 const parallel = require('async/parallel')
 const TCP = require('libp2p-tcp')
-const multiplex = require('libp2p-multiplex')
+const multiplex = require('libp2p-mplex')
 const spdy = require('libp2p-spdy')
 const pull = require('pull-stream')
 const PeerBook = require('peer-book')