diff --git a/.travis.yml b/.travis.yml
index 7a830727..e1d6320b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,17 @@
+sudo: false
 language: node_js
 node_js:
-  - '4'
-  - '5'
-  - stable
+  - 4
+  - 5
 
-# always use npm latest
+# Make sure we have new NPM.
 before_install:
-  - npm i -g npm
+  - npm install -g npm
+
+script:
+  - npm run lint
+  - npm test
+  - npm run coverage
 
 addons:
   firefox: 'latest'
@@ -15,6 +20,5 @@ before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 
-script:
-  - npm run lint
-  - npm run test
+after_success:
+  - npm run coverage-publish
diff --git a/README.md b/README.md
index ebd77330..3dd23759 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ ipfs-unixfs JavaScript Implementation
 [![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io)
 [![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs)
 [![Build Status](https://travis-ci.org/ipfs/js-ipfs-unixfs.svg?style=flat-square&branch=master)](https://travis-ci.org/ipfs/js-ipfs-unixfs)
-![](https://img.shields.io/badge/coverage-%3F%25-yellow.svg?style=flat-square)
+[![Coverage Status](https://coveralls.io/repos/github/ipfs/js-ipfs-unixfs/badge.svg?branch=master)](https://coveralls.io/github/ipfs/js-ipfs-unixfs?branch=master)
 [![Dependency Status](https://david-dm.org/ipfs/js-ipfs-unixfs.svg?style=flat-square)](https://david-dm.org/ipfs/js-ipfs-unixfs)
 [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)
 
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 00000000..434211a7
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,12 @@
+machine:
+  node:
+    version: stable
+
+dependencies:
+  pre:
+    - google-chrome --version
+    - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+    - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
+    - sudo apt-get update
+    - sudo apt-get --only-upgrade install google-chrome-stable
+    - google-chrome --version
diff --git a/package.json b/package.json
index e2322e17..49391082 100644
--- a/package.json
+++ b/package.json
@@ -5,14 +5,16 @@
   "main": "lib/index.js",
   "jsnext:main": "src/index.js",
   "scripts": {
-    "test": "dignified-test",
-    "test:node": "dignified-test node",
-    "test:browser": "dignified-test browser",
-    "build": "dignified-build",
-    "lint": "dignified-lint",
-    "release": "dignified-release",
-    "release-minor": "dignified-release --minor",
-    "release-major": "dignified-release --major"
+    "test": "aegir-test",
+    "test:node": "aegir-test node",
+    "test:browser": "aegir-test browser",
+    "build": "aegir-build",
+    "lint": "aegir-lint",
+    "release": "aegir-release",
+    "release-minor": "aegir-release --minor",
+    "release-major": "aegir-release --major",
+    "coverage": "aegir-coverage",
+    "coverage-publish": "aegir-coverage publish"
   },
   "repository": {
     "type": "git",
@@ -28,11 +30,15 @@
   },
   "homepage": "https://github.com/ipfs/js-ipfs-unixfs#readme",
   "devDependencies": {
+    "aegir": "^2.1.1",
     "chai": "^3.5.0",
-    "dignified.js": "github:dignifiedquire/dignified.js",
     "pre-commit": "^1.1.2"
   },
   "dependencies": {
     "protocol-buffers": "^3.1.5"
-  }
+  },
+  "pre-commit": [
+    "lint",
+    "test"
+  ]
 }