diff --git a/.travis.yml b/.travis.yml
index e66a102e..4999fdb5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,8 @@ script:
   - composer check
 
 after_script:
+  - vendor/bin/phpcov merge build --clover build/clover.xml
   - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover build/unit-clover.xml
+  - php ocular.phar code-coverage:upload --format=php-clover build/clover.xml
 
 sudo: false
diff --git a/composer.json b/composer.json
index f0ee6e27..c98fc6d6 100644
--- a/composer.json
+++ b/composer.json
@@ -47,6 +47,7 @@
     "require-dev": {
         "filp/whoops": "^2.0",
         "phpunit/dbunit": "^3.0",
+        "phpunit/phpcov": "^4.0",
         "phpunit/phpunit": "^6.0",
         "slevomat/coding-standard": "^4.0",
         "squizlabs/php_codesniffer": "^3.1",
@@ -88,9 +89,9 @@
         "cs": "phpcs",
         "cs-fix": "phpcbf",
         "serve": "php -S 0.0.0.0:8000 -t public/",
-        "test": "phpunit --coverage-clover build/unit-clover.xml",
+        "test": "phpunit --coverage-php build/coverage-unit.cov",
         "pretty-test": "phpunit --coverage-html build/coverage",
-        "func-test": "phpunit -c phpunit-func.xml --coverage-clover build/func-clover.xml"
+        "func-test": "phpunit -c phpunit-func.xml --coverage-php build/coverage-func.cov"
     },
     "config": {
         "process-timeout": 0,