diff --git a/.gitignore b/.gitignore
index 7f7304a1..13c9e9b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /analysis
 /vendor/
 /composer.lock
+/phpunit.xml
 
 ## IDE support
 *.buildpath
diff --git a/.travis.yml b/.travis.yml
index bcc21aad..15e7a210 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,4 +28,7 @@ script:
   ## PHP_CodeSniffer
   - ./vendor/bin/phpcs --report-width=200 --report-summary  --report-full src/ tests/ --standard=PSR2 -n
   ## PHPUnit
-  - ./vendor/bin/phpunit
+  - ./vendor/bin/phpunit --coverage-clover coverage-clover.xml
+
+after_script:
+  - if [ "$TRAVIS_PHP_VERSION" = "7.0" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover tests/coverage-clover.xml ; fi
diff --git a/phpunit-cc.xml b/phpunit-cc.xml
deleted file mode 100644
index c87c42f3..00000000
--- a/phpunit-cc.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./tests/bootstrap.php"
-    backupGlobals="true"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    syntaxCheck="true"
-    verbose="true"
-    reportUselessTests="true"
-    strictCoverage="true"
-    disallowTestOutput="true"
-    stopOnError="false"
-    stopOnFailure="false"
-    stopOnIncomplete="false"
-    stopOnSkipped="false">
-    <php>
-        <ini name="memory_limit" value="2048M"/>
-    </php>
-    <testsuite name="PhpSpreadsheet Unit Test Suite">
-        <directory suffix="Test.php">./tests/PhpSpreadsheet</directory>
-    </testsuite>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./src</directory>
-            <exclude>
-                <directory>./src/PhpSpreadsheet/Shared/PCLZip</directory>
-                <directory>./src/PhpSpreadsheet/Shared/JAMA</directory>
-                <directory>./src/PhpSpreadsheet/Writer/PDF</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-html" target="./tests/codeCoverage" charset="UTF-8"
-             yui="true" highlight="false"
-             lowUpperBound="35" highLowerBound="70"/>
-        <log type="coverage-clover" target="./tests/codeCoverage/codeCoverage.xml"/>
-        <log type="metrics-xml" target="./tests/metrics/metrics.xml"/>
-        <log type="test-xml" target="./tests/testResults/logfile.xml" logIncompleteSkipped="false"/>
-    </logging>
-</phpunit>
diff --git a/phpunit.xml b/phpunit.xml.dist
similarity index 68%
rename from phpunit.xml
rename to phpunit.xml.dist
index 2ea211a6..2843d1a5 100644
--- a/phpunit.xml
+++ b/phpunit.xml.dist
@@ -2,19 +2,8 @@
 <phpunit bootstrap="./tests/bootstrap.php"
     backupGlobals="true"
     colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
     syntaxCheck="true"
-    verbose="true"
-    reportUselessTests="true"
-    strictCoverage="true"
-    disallowTestOutput="true"
-    stopOnError="false"
-    stopOnFailure="false"
-    stopOnIncomplete="false"
-    stopOnSkipped="false">
+    disallowTestOutput="true">
     <php>
         <ini name="memory_limit" value="2048M"/>
     </php>