diff --git a/.gitignore b/.gitignore
index 347bedb..02593a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ primus-proxy.js
 tes.js
 npm-debug.log
 .nyc_output
+coverage
diff --git a/.travis.yml b/.travis.yml
index c687bb0..956c0fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,10 +3,12 @@ language: node_js
 node_js:
   - "6"
   - "8"
-
 script:
   - npm test
-
+after_success:
+  - bash <(curl -s https://codecov.io/bash)
+matrix:
+  fast_finish: true
 notifications:
   email:
     - travis@nodejitsu.com
diff --git a/README.md b/README.md
index 40367e1..c66a58a 100644
--- a/README.md
+++ b/README.md
@@ -5,12 +5,7 @@
 node-http-proxy
 =======
 
-<p align="left">
- <a href="https://travis-ci.org/nodejitsu/node-http-proxy" target="_blank">
-  <img src="https://travis-ci.org/nodejitsu/node-http-proxy.png"/></a>&nbsp;&nbsp;
- <a href="https://coveralls.io/r/nodejitsu/node-http-proxy" target="_blank">
-  <img src="https://coveralls.io/repos/nodejitsu/node-http-proxy/badge.png"/></a>
-</p>
+[![Build Status](https://travis-ci.org/nodejitsu/node-http-proxy.svg?branch=master)](https://travis-ci.org/nodejitsu/node-http-proxy)
 
 `node-http-proxy` is an HTTP programmable proxying library that supports
 websockets. It is suitable for implementing components such as reverse
@@ -341,7 +336,7 @@ proxyServer.listen(8015);
 *  **cookieDomainRewrite**: rewrites domain of `set-cookie` headers. Possible values:
    * `false` (default): disable cookie rewriting
    * String: new domain, for example `cookieDomainRewrite: "new.domain"`. To remove the domain, use `cookieDomainRewrite: ""`.
-   * Object: mapping of domains to new domains, use `"*"` to match all domains.  
+   * Object: mapping of domains to new domains, use `"*"` to match all domains.
      For example keep one domain unchanged, rewrite one domain and remove other domains:
      ```
      cookieDomainRewrite: {
diff --git a/package.json b/package.json
index 950cbfe..8950610 100644
--- a/package.json
+++ b/package.json
@@ -27,8 +27,8 @@
     "ws": "^0.8.0"
   },
   "scripts": {
-    "test": "mocha test/*-test.js",
-    "test-cov": "nyc npm test"
+    "mocha": "mocha test/*-test.js",
+    "test": "nyc --reporter=text --reporter=lcov npm run mocha"
   },
   "engines": {
     "node": ">=4.0.0"