diff --git a/.travis.yml b/.travis.yml
index d63ba09569..ce65d4b99b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,3 +3,11 @@ node_js:
   - 0.8
   - 0.10
   - 0.11
+
+before_script: "npm install -g codeclimate-test-reporter"
+script: "make test-travis"
+
+addons:
+  code_climate:
+    repo_token:
+      secure: "M3qeb0ZYfdBY1CxOQGH2tWz8XhPwp58F/XWvnVX2XjPUcEWI8/CDAZCwf1cr6o8A3HvzTF2/krukbEtqS6T/LKnFX33OfL/VzwIP1a+7rgkxV5FH+eB14nX3JWIv7Bn4xESVcX9aBVh4ESymwkB0g/q1kc6/WauV0Uv7pSfxYS8="
diff --git a/Makefile b/Makefile
index a045827787..fa9f3be1e5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+ISTANBUL_CMD = node_modules/istanbul/lib/cli.js
 MOCHA_CMD = node_modules/mocha/bin/_mocha
 
 export NODE_ENV = test
@@ -12,7 +13,11 @@ test:
 
 test-cov:
 	make clean
-	node node_modules/istanbul/lib/cli.js cover $(MOCHA_CMD) --
+	node $(ISTANBUL_CMD) cover $(MOCHA_CMD) --
+
+test-travis:
+	node $(ISTANBUL_CMD) $(MOCHA_CMD) --report lcovonly -- --reporter spec
+	cat ./coverage/lcov.info | codeclimate
 
 publish:
 	make clean