diff --git a/.travis.yml b/.travis.yml
index 584f308f..12117133 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,16 +13,11 @@ matrix:
 script:
   - npm run lint
   - npm run test
-  - npm run coverage
-  - make test
 
 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/benchmarks/ephemeral-keys.js b/benchmarks/ephemeral-keys.js
index 9e404028..777691ad 100644
--- a/benchmarks/ephemeral-keys.js
+++ b/benchmarks/ephemeral-keys.js
@@ -22,5 +22,6 @@ curves.forEach((curve) => {
   }, { defer: true })
 })
 
-suite.on('cycle', (event) => console.log(String(event.target)))
-     .run({async: true})
+suite
+  .on('cycle', (event) => console.log(String(event.target)))
+  .run({async: true})
diff --git a/benchmarks/key-stretcher.js b/benchmarks/key-stretcher.js
index 8cf981b5..994b01f4 100644
--- a/benchmarks/key-stretcher.js
+++ b/benchmarks/key-stretcher.js
@@ -22,8 +22,9 @@ async.waterfall([
     setup(cipher, hash, secret)
   }))
 
-  suite.on('cycle', (event) => console.log(String(event.target)))
-       .run({async: true})
+  suite
+    .on('cycle', (event) => console.log(String(event.target)))
+    .run({async: true})
 })
 
 function setup (cipher, hash, secret) {
diff --git a/benchmarks/rsa.js b/benchmarks/rsa.js
index e7cf9fae..59c4b282 100644
--- a/benchmarks/rsa.js
+++ b/benchmarks/rsa.js
@@ -37,5 +37,6 @@ suite.add('sign and verify', (d) => {
   defer: true
 })
 
-suite.on('cycle', (event) => console.log(String(event.target)))
-     .run({async: true})
+suite
+  .on('cycle', (event) => console.log(String(event.target)))
+  .run({async: true})
diff --git a/circle.yml b/circle.yml
index 56f7efbe..e8305206 100644
--- a/circle.yml
+++ b/circle.yml
@@ -2,6 +2,10 @@ machine:
   node:
     version: stable
 
+post:
+  test:
+    - npm run coverage -- --upload
+
 dependencies:
   pre:
     - google-chrome --version
diff --git a/package.json b/package.json
index 46364149..a791d3c7 100644
--- a/package.json
+++ b/package.json
@@ -10,17 +10,16 @@
     "./src/keys/rsa.js": "./src/keys/rsa-browser.js"
   },
   "scripts": {
-    "lint": "aegir-lint",
-    "build": "aegir-build",
+    "lint": "aegir lint",
+    "build": "aegir build",
     "build-proto": "pbjs --wrap commonjs --target static-module src/keys/keys.proto > src/keys/keys.proto.js",
-    "test": "aegir-test",
-    "test:node": "aegir-test --env node",
-    "test:browser": "aegir-test --env browser",
-    "release": "aegir-release",
-    "release-minor": "aegir-release --type minor",
-    "release-major": "aegir-release --type major",
-    "coverage": "aegir-coverage",
-    "coverage-publish": "aegir-coverage publish"
+    "test": "aegir test",
+    "test:node": "aegir test -t node",
+    "test:browser": "aegir test -t browser -t webworker",
+    "release": "aegir release",
+    "release-minor": "aegir release --type minor",
+    "release-major": "aegir release --type major",
+    "coverage": "aegir coverage --ignore src/keys/keys.proto.js"
   },
   "keywords": [
     "IPFS",
@@ -33,19 +32,18 @@
   "dependencies": {
     "asn1.js": "^4.9.1",
     "async": "^2.5.0",
-    "browserify-aes": "^1.0.6",
+    "browserify-aes": "^1.0.8",
     "keypair": "^1.0.1",
     "libp2p-crypto-secp256k1": "~0.2.2",
     "multihashing-async": "~0.4.6",
     "pem-jwk": "^1.5.1",
     "protobufjs": "^6.8.0",
     "rsa-pem-to-jwk": "^1.1.3",
-    "safe-buffer": "^5.1.1",
     "tweetnacl": "^1.0.0",
     "webcrypto-shim": "github:dignifiedquire/webcrypto-shim#master"
   },
   "devDependencies": {
-    "aegir": "^11.0.2",
+    "aegir": "^12.0.5",
     "benchmark": "^2.1.4",
     "chai": "^4.1.2",
     "dirty-chai": "^2.0.1",
@@ -79,4 +77,4 @@
     "greenkeeper[bot] <greenkeeper[bot]@users.noreply.github.com>",
     "nikuda <nikuda@gmail.com>"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/hmac/index-browser.js b/src/hmac/index-browser.js
index 90634c0e..70676a94 100644
--- a/src/hmac/index-browser.js
+++ b/src/hmac/index-browser.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const nodeify = require('../nodeify')
-const Buffer = require('safe-buffer').Buffer
 
 const crypto = require('../webcrypto.js')()
 const lengths = require('./lengths')
diff --git a/src/keys/ecdh-browser.js b/src/keys/ecdh-browser.js
index 959288dc..33713720 100644
--- a/src/keys/ecdh-browser.js
+++ b/src/keys/ecdh-browser.js
@@ -3,7 +3,6 @@
 const webcrypto = require('../webcrypto.js')()
 const nodeify = require('../nodeify')
 const BN = require('asn1.js').bignum
-const Buffer = require('safe-buffer').Buffer
 
 const util = require('../util')
 const toBase64 = util.toBase64
diff --git a/src/keys/ed25519-class.js b/src/keys/ed25519-class.js
index 5aa3c3f3..667f0769 100644
--- a/src/keys/ed25519-class.js
+++ b/src/keys/ed25519-class.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const multihashing = require('multihashing-async')
-const Buffer = require('safe-buffer').Buffer
 
 const crypto = require('./ed25519')
 const pbm = require('./keys.proto.js')
diff --git a/src/keys/ed25519.js b/src/keys/ed25519.js
index dc96acfa..ec5c7c51 100644
--- a/src/keys/ed25519.js
+++ b/src/keys/ed25519.js
@@ -2,7 +2,6 @@
 
 const nacl = require('tweetnacl')
 const setImmediate = require('async/setImmediate')
-const Buffer = require('safe-buffer').Buffer
 
 exports.publicKeyLength = nacl.sign.publicKeyLength
 exports.privateKeyLength = nacl.sign.secretKeyLength
diff --git a/src/keys/key-stretcher.js b/src/keys/key-stretcher.js
index 51e45e82..2d7f9956 100644
--- a/src/keys/key-stretcher.js
+++ b/src/keys/key-stretcher.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const whilst = require('async/whilst')
-const Buffer = require('safe-buffer').Buffer
 const hmac = require('../hmac')
 
 const cipherMap = {
diff --git a/src/keys/rsa-browser.js b/src/keys/rsa-browser.js
index f5a1abae..8568b927 100644
--- a/src/keys/rsa-browser.js
+++ b/src/keys/rsa-browser.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const nodeify = require('../nodeify')
-const Buffer = require('safe-buffer').Buffer
 
 const webcrypto = require('../webcrypto.js')()
 
@@ -18,11 +17,11 @@ exports.generateKey = function (bits, callback) {
     true,
     ['sign', 'verify']
   )
-  .then(exportKey)
-  .then((keys) => ({
-    privateKey: keys[0],
-    publicKey: keys[1]
-  })), callback)
+    .then(exportKey)
+    .then((keys) => ({
+      privateKey: keys[0],
+      publicKey: keys[1]
+    })), callback)
 }
 
 // Takes a jwk key
diff --git a/src/util.js b/src/util.js
index 0f25b8e3..e5f7b6b1 100644
--- a/src/util.js
+++ b/src/util.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const BN = require('asn1.js').bignum
-const Buffer = require('safe-buffer').Buffer
 
 // Convert a BN.js instance to a base64 encoded string without padding
 // Adapted from https://tools.ietf.org/html/draft-ietf-jose-json-web-signature-41#appendix-C
@@ -11,8 +10,8 @@ exports.toBase64 = function toBase64 (bn, len) {
 
   return s
     .replace(/(=*)$/, '') // Remove any trailing '='s
-    .replace(/\+/g, '-')  // 62nd char of encoding
-    .replace(/\//g, '_')  // 63rd char of encoding
+    .replace(/\+/g, '-') // 62nd char of encoding
+    .replace(/\//g, '_') // 63rd char of encoding
 }
 
 // Convert a base64 encoded string to a BN.js instance
diff --git a/test/aes/aes.spec.js b/test/aes/aes.spec.js
index 4c7c5248..25824f7b 100644
--- a/test/aes/aes.spec.js
+++ b/test/aes/aes.spec.js
@@ -7,7 +7,6 @@ const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
 const series = require('async/series')
-const Buffer = require('safe-buffer').Buffer
 
 const crypto = require('../../src')
 const fixtures = require('./../fixtures/aes')
diff --git a/test/fixtures/go-elliptic-key.js b/test/fixtures/go-elliptic-key.js
index 322f5558..8e7d00cd 100644
--- a/test/fixtures/go-elliptic-key.js
+++ b/test/fixtures/go-elliptic-key.js
@@ -1,7 +1,5 @@
 'use strict'
 
-const Buffer = require('safe-buffer').Buffer
-
 module.exports = {
   curve: 'P-256',
   bob: {
diff --git a/test/fixtures/go-key-ed25519.js b/test/fixtures/go-key-ed25519.js
index fac58a95..756bf0eb 100644
--- a/test/fixtures/go-key-ed25519.js
+++ b/test/fixtures/go-key-ed25519.js
@@ -1,7 +1,5 @@
 'use strict'
 
-const Buffer = require('safe-buffer').Buffer
-
 module.exports = {
   // These were generated in a gore (https://github.com/motemen/gore) repl session:
   //
diff --git a/test/fixtures/go-key-rsa.js b/test/fixtures/go-key-rsa.js
index 69a3e9f7..0b260923 100644
--- a/test/fixtures/go-key-rsa.js
+++ b/test/fixtures/go-key-rsa.js
@@ -1,7 +1,5 @@
 'use strict'
 
-const Buffer = require('safe-buffer').Buffer
-
 module.exports = {
   private: {
     hash: Buffer.from([
diff --git a/test/fixtures/go-stretch-key.js b/test/fixtures/go-stretch-key.js
index 83e4b668..141e7877 100644
--- a/test/fixtures/go-stretch-key.js
+++ b/test/fixtures/go-stretch-key.js
@@ -1,7 +1,5 @@
 'use strict'
 
-const Buffer = require('safe-buffer').Buffer
-
 module.exports = [{
   cipher: 'AES-256',
   hash: 'SHA256',
diff --git a/test/fixtures/secp256k1.js b/test/fixtures/secp256k1.js
index 9b10c84a..78517213 100644
--- a/test/fixtures/secp256k1.js
+++ b/test/fixtures/secp256k1.js
@@ -1,9 +1,6 @@
 'use strict'
 
-const Buffer = require('safe-buffer').Buffer
-
 module.exports = {
-
   // protobuf marshaled key pair generated with libp2p-crypto-secp256k1
   // and marshaled with libp2p-crypto.marshalPublicKey / marshalPrivateKey
   pbmPrivateKey: Buffer.from('08021220e0600103010000000100000000000000be1dc82c2e000000e8d6030301000000', 'hex'),
diff --git a/test/hmac/hmac.spec.js b/test/hmac/hmac.spec.js
index 0643cd74..90be5465 100644
--- a/test/hmac/hmac.spec.js
+++ b/test/hmac/hmac.spec.js
@@ -2,7 +2,6 @@
 /* eslint-env mocha */
 'use strict'
 
-const Buffer = require('safe-buffer').Buffer
 const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
diff --git a/test/keys/ed25519.spec.js b/test/keys/ed25519.spec.js
index 68f5a254..5aa62f73 100644
--- a/test/keys/ed25519.spec.js
+++ b/test/keys/ed25519.spec.js
@@ -5,7 +5,6 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
-const Buffer = require('safe-buffer').Buffer
 
 const crypto = require('../../src')
 const ed25519 = crypto.keys.supportedKeys.ed25519
diff --git a/test/keys/rsa.spec.js b/test/keys/rsa.spec.js
index b2f3b4df..d7341bbb 100644
--- a/test/keys/rsa.spec.js
+++ b/test/keys/rsa.spec.js
@@ -5,7 +5,6 @@ const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
-const Buffer = require('safe-buffer').Buffer
 
 const crypto = require('../../src')
 const rsa = crypto.keys.supportedKeys.rsa