diff --git a/.travis.yml b/.travis.yml
index a152bd2c..5cc672b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,25 @@
 sudo: false
 language: node_js
+
 matrix:
   include:
   - node_js: 4
     env: CXX=g++-4.8
   - node_js: 6
     env:
-      - SAUCE=true
       - CXX=g++-4.8
   - node_js: stable
     env: CXX=g++-4.8
 
 # Make sure we have new NPM.
 before_install:
-  - npm install -g npm
+  - npm install -g npm@4
 
 script:
   - npm run lint
   - npm test
   - npm run coverage
+  - make test
 
 before_script:
   - export DISPLAY=:99.0
diff --git a/README.md b/README.md
index cb682d26..4029fc37 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,6 @@
 ![](https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square)
 ![](https://img.shields.io/badge/Node.js-%3E%3D4.0.0-orange.svg?style=flat-square)
 
-[![Sauce Test Status](https://saucelabs.com/browser-matrix/js-ipfs-unixfs.svg)](https://saucelabs.com/u/js-ipfs-unixfs)
-
 > JavaScript implementation of IPFS' unixfs (a Unix FileSystem representation on top of a MerkleDAG)
 
 [The unixfs spec can be found inside the ipfs/specs repository](http://github.com/ipfs/specs)
diff --git a/circle.yml b/circle.yml
index 434211a7..56f7efbe 100644
--- a/circle.yml
+++ b/circle.yml
@@ -5,8 +5,10 @@ machine:
 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'
+    - curl -L -o google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+    - sudo dpkg -i google-chrome.deb || true
     - sudo apt-get update
-    - sudo apt-get --only-upgrade install google-chrome-stable
+    - sudo apt-get install -f
+    - sudo apt-get install --only-upgrade lsb-base
+    - sudo dpkg -i google-chrome.deb
     - google-chrome --version