diff --git a/.coveralls.yml b/.coveralls.yml
index 06571ec196..7b7d1beb5f 100644
--- a/.coveralls.yml
+++ b/.coveralls.yml
@@ -1,3 +1,3 @@
 src_dir: .
-coverage_clover: storage/coverage/clover.xml
-json_path: storage/coverage/coveralls-upload.json
+coverage_clover: build/logs/clover.xml
+json_path: build/logs/coveralls-upload.json
diff --git a/.travis.yml b/.travis.yml
index 81cac8830e..f0dd69b122 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,6 @@ php:
   - 5.5
   - 5.6
 
-addons:
-  code_climate:
-    repo_token: 26489f9e854fcdf7e7660ba29c1455694685465b1f90329a79f7d2bf448acb61
-
 install:
   - composer update
   - php artisan env
@@ -20,3 +16,4 @@ script:
 
 after_script:
   - php vendor/bin/coveralls
+  - CODECLIMATE_REPO_TOKEN=26489f9e854fcdf7e7660ba29c1455694685465b1f90329a79f7d2bf448acb61 ./vendor/bin/test-reporter
\ No newline at end of file
diff --git a/app/Http/Middleware/Cleanup.php b/app/Http/Middleware/Cleanup.php
index bb90b9754f..6a4cc4467a 100644
--- a/app/Http/Middleware/Cleanup.php
+++ b/app/Http/Middleware/Cleanup.php
@@ -127,7 +127,6 @@ class Cleanup
     protected function encryptBudgetsAndCategories()
     {
         $count = 0;
-
         // encrypt budget name
         $set = Budget::where('encrypted', 0)->take(5)->get();
         /** @var Budget $entry */
@@ -159,8 +158,6 @@ class Cleanup
     protected function encryptPiggiesAndJournals()
     {
         $count = 0;
-
-
         // encrypt piggy bank name
         $set = PiggyBank::where('encrypted', 0)->take(5)->get();
         /** @var PiggyBank $entry */
@@ -192,7 +189,6 @@ class Cleanup
     protected function encryptRemindersAndPreferences()
     {
         $count = 0;
-
         // encrypt reminder metadata
         $set = Reminder::where('encrypted', 0)->take(5)->get();
         /** @var Reminder $entry */
diff --git a/build/logs/.gitignore b/build/logs/.gitignore
new file mode 100644
index 0000000000..67c51fe2b0
--- /dev/null
+++ b/build/logs/.gitignore
@@ -0,0 +1,2 @@
+*.xml
+*.json
diff --git a/composer.json b/composer.json
index 5bbf617f3b..3a3e55afc2 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,9 @@
         "phpspec/phpspec": "~2.1",
         "satooshi/php-coveralls": "0.6.1",
         "mockery/mockery": "0.9.*",
-        "league/factory-muffin": "~2.1"
+        "league/factory-muffin": "~2.1",
+        "codeclimate/php-test-reporter": "^0.1.2"
+        
 
 
     },
diff --git a/composer.lock b/composer.lock
index 14ab11d0c9..36256fec53 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "e3e90dd365b74f4878cf3b5b4a1c4007",
+    "hash": "5c085b2cc90ffa610e386897066315a7",
     "packages": [
         {
             "name": "classpreloader/classpreloader",
@@ -2689,6 +2689,63 @@
             ],
             "time": "2015-03-17 08:00:28"
         },
+        {
+            "name": "codeclimate/php-test-reporter",
+            "version": "v0.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/codeclimate/php-test-reporter.git",
+                "reference": "8ed24ff30f3663ecf40f1c12d6c97eb56c69e646"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/codeclimate/php-test-reporter/zipball/8ed24ff30f3663ecf40f1c12d6c97eb56c69e646",
+                "reference": "8ed24ff30f3663ecf40f1c12d6c97eb56c69e646",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "php": ">=5.3",
+                "satooshi/php-coveralls": "0.6.*",
+                "symfony/console": ">=2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "3.7.*@stable"
+            },
+            "bin": [
+                "composer/bin/test-reporter"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "CodeClimate\\Component": "src/",
+                    "CodeClimate\\Bundle": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Code Climate",
+                    "email": "hello@codeclimate.com",
+                    "homepage": "https://codeclimate.com"
+                }
+            ],
+            "description": "PHP client for reporting test coverage to Code Climate",
+            "homepage": "https://github.com/codeclimate/php-test-reporter",
+            "keywords": [
+                "codeclimate",
+                "coverage"
+            ],
+            "time": "2014-07-23 13:42:41"
+        },
         {
             "name": "doctrine/instantiator",
             "version": "1.0.4",
diff --git a/phpunit.xml b/phpunit.xml
index bf13ff1240..4f2b91ded5 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -22,7 +22,7 @@
 
     <!-- code coverage -->
     <logging>
-        <log type="coverage-clover" target="./storage/coverage/clover.xml" charset="UTF-8" />
+        <log type="coverage-clover" target="./build/logs/clover.xml" charset="UTF-8" />
     </logging>
 
     <php>