diff --git a/.travis.yml b/.travis.yml
index a2585de..c4c3a10 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,10 +12,10 @@ before_script:
   - mkdir -p build/cov build/logs
 
 script:
-  - CALCULATOR=GMP vendor/bin/phpunit --configuration phpunit-dist.xml --coverage-php build/cov/coverage-GMP.cov
-  - CALCULATOR=BCMath vendor/bin/phpunit --configuration phpunit-dist.xml --coverage-php build/cov/coverage-BCMath.cov
-  - CALCULATOR=Native vendor/bin/phpunit --configuration phpunit-dist.xml --coverage-php build/cov/coverage-Native.cov
-  - vendor/bin/phpunit --coverage-php build/cov/coverage-Detect.cov tests/CalculatorDetectTest.php
+  - CALCULATOR=GMP vendor/bin/phpunit --configuration phpunit-main.xml --coverage-php build/cov/coverage-main-GMP.cov
+  - CALCULATOR=BCMath vendor/bin/phpunit --configuration phpunit-main.xml --coverage-php build/cov/coverage-main-BCMath.cov
+  - CALCULATOR=Native vendor/bin/phpunit --configuration phpunit-main.xml --coverage-php build/cov/coverage-main-Native.cov
+  - vendor/bin/phpunit --configuration phpunit-detect.xml --coverage-php build/cov/coverage-detect.cov
 
 after_script:
   - vendor/bin/phpcov merge --clover build/logs/clover.xml build/cov
diff --git a/phpunit-detect.xml b/phpunit-detect.xml
new file mode 100644
index 0000000..4695e18
--- /dev/null
+++ b/phpunit-detect.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit colors="true" bootstrap="vendor/autoload.php">
+    <testsuites>
+        <testsuite>
+            <file>tests/CalculatorDetectTest.php</file>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist>
+            <directory>src</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/phpunit-bootstrap.php b/phpunit-main.php
similarity index 100%
rename from phpunit-bootstrap.php
rename to phpunit-main.php
diff --git a/phpunit-dist.xml b/phpunit-main.xml
similarity index 76%
rename from phpunit-dist.xml
rename to phpunit-main.xml
index bbd9738..99a1131 100644
--- a/phpunit-dist.xml
+++ b/phpunit-main.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true" bootstrap="phpunit-bootstrap.php">
+<phpunit colors="true" bootstrap="phpunit-main.php">
     <testsuites>
-        <testsuite name="Brick\Math test suite">
+        <testsuite>
             <directory>tests</directory>
             <exclude>tests/CalculatorDetectTest.php</exclude>
         </testsuite>