diff --git a/.gitignore b/.gitignore
index e8f94b7..8c551bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /vendor
 composer.lock
 /.idea
+/build
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 33fae8a..0591d8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ php:
 
 before_script:
   - travis_retry composer self-update
-  - travis_retry composer install --no-interaction --prefer-source
+  - travis_retry composer install --no-interaction --prefer-source --dev
   - travis_retry phpenv rehash
 
 script:
@@ -16,8 +16,5 @@ script:
   - ./vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
 
 after_script:
-  - |
-    if [ -f "build/logs/clover.xml" ]; then
-      wget https://scrutinizer-ci.com/ocular.phar
-      php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
-    fi
\ No newline at end of file
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
index c962501..713eba9 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,26 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
-         backupGlobals="false"
+<phpunit backupGlobals="false"
          backupStaticAttributes="false"
+         bootstrap="vendor/autoload.php"
          colors="true"
-         verbose="false"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false">
+         stopOnFailure="false"
+         syntaxCheck="false"
+>
+    <logging>
+        <log type="coverage-html"
+             target="./build/coverage/html"
+             charset="UTF-8"
+             highlight="false"
+             lowUpperBound="35"
+             highLowerBound="70"/>
+        <log type="coverage-clover"
+             target="./build/coverage/log/coverage.xml"/>
+    </logging>
     <testsuites>
-        <testsuite>
+        <testsuite name="Package Test Suite">
             <directory suffix=".php">./tests/</directory>
         </testsuite>
     </testsuites>
     <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
+        <whitelist>
+            <directory suffix=".php">./</directory>
+            <exclude>
+                <directory suffix=".php">./vendor</directory>
+                <directory suffix=".php">./tests</directory>
+            </exclude>
         </whitelist>
     </filter>
-    <logging>
-        <log type="coverage-text" target="php://stdout" />
-        <log type="coverage-clover" target="build/logs/clover.xml" />
-    </logging>
 </phpunit>
\ No newline at end of file