diff --git a/.travis.yml b/.travis.yml
index 8c81563c98..7285586d58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,26 +9,14 @@ node_js:
   - "6.1"
   - "node"
 
-cache:
-  directories:
-    - "travis-phantomjs"
-
 before_install:
   - "if [[ `node -v` == v0.8.* ]]; then npm install -g npm || exit 0; fi"
 
 script:
-  - "if [ $INTEGRATION ]; then cucumber.js -f pretty; else npm test; fi"
-  - "cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"
-
-env:
-  matrix:
-    - COVERAGE=1
+  - npm run lint
+  - npm run coverage
+  - npm run buildertest
+  - npm run browsertest
+  - node ./node_modules/.bin/codecov
 
 sudo: false
-
-# env:
-#   global:
-#     - secure: "..."
-#   matrix:
-#     - UNIT=1
-#     - AWS_REGION=us-east-1 INTEGRATION=1
diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 0000000000..a0b8078251
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1,5 @@
+coverage:
+  status:
+    project:
+      default:
+        target: 90.5%
diff --git a/package.json b/package.json
index 16f51e6799..ae80831dcd 100644
--- a/package.json
+++ b/package.json
@@ -16,9 +16,9 @@
     "@types/node": "^6.0.46",
     "browserify": "13.1.0",
     "chai": "*",
+    "codecov": "^1.0.1",
     "coffee-script": "1.6.3",
     "coffeeify": "*",
-    "coveralls": "2.x",
     "cucumber": "0.5.x",
     "eslint": "1.x",
     "insert-module-globals": "^7.0.0",
@@ -111,8 +111,8 @@
   ],
   "scripts": {
     "test": "npm -s run-script lint && npm -s run-script unit && npm -s run-script buildertest && npm -s run-script browsertest && ([ -f configuration ] && npm -s run-script integration || true)",
-    "unit": "istanbul `[ $COVERAGE ] && echo 'cover _mocha' || echo 'test mocha'` -- test test/json test/model test/protocol test/query test/services test/signers test/xml test/s3 test/cloudfront test/dynamodb test/polly",
-    "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha -- test test/json test/dynamodb test/cloudfront test/model test/protocol test/query test/services test/signers test/xml",
+    "unit": "mocha -- test test/json test/model test/protocol test/query test/services test/signers test/xml test/s3 test/cloudfront test/dynamodb test/polly",
+    "coverage": "istanbul cover ./node_modules/mocha/bin/_mocha --reporter=lcovonly -- test test/json test/model test/protocol test/query test/services test/signers test/xml test/s3 test/cloudfront test/dynamodb test/polly",
     "browsertest": "rake browser:test && karma start",
     "buildertest": "mocha --compilers coffee:coffee-script -s 1000 -t 10000 dist-tools/test",
     "integration": "cucumber.js",
@@ -122,4 +122,4 @@
     "tstest": "tsc -p ./ts",
     "add-change": "node ./scripts/changelog/add-change.js"
   }
-}
\ No newline at end of file
+}