diff --git a/.coveralls.yml b/.coveralls.yml
index 8951ac7b73..51544bf56e 100644
--- a/.coveralls.yml
+++ b/.coveralls.yml
@@ -1,3 +1,2 @@
 src_dir: .
-coverage_clover: tests/_output/coverage.xml
-json_path: tests/_output/coveralls-upload.json
+coverage_clover: storage/coverage/clover.xml
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index a5d9249137..c91cbb81f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,3 +18,6 @@ script:
   - phpunit
 
 after_script:
+  - php vendor/bin/coveralls
+  - vendor/bin/test-reporter --stdout > codeclimate.json
+  - "curl -X POST -d @codeclimate.json -H 'Content-Type: application/json' -H 'User-Agent: Code Climate (PHP Test Reporter v0.1.1)' https://codeclimate.com/test_reports"
diff --git a/phpunit.xml b/phpunit.xml
index 910d6195f7..e7af1a2623 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -14,6 +14,11 @@
             <directory>./tests/</directory>
         </testsuite>
     </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./app</directory>
+        </whitelist>
+    </filter>
     <php>
         <env name="APP_ENV" value="testing"/>
         <env name="CACHE_DRIVER" value="array"/>