diff --git a/.travis.yml b/.travis.yml
index fe6a3aa..21bcc89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ branches:
     - /^patch-.*$/
 
 env:
-  - TEST_COMMAND="composer test-all"
+  - TEST_COMMAND="composer test"
 
 matrix:
     fast_finish: true
diff --git a/composer.json b/composer.json
index 416ca67..9babd7a 100644
--- a/composer.json
+++ b/composer.json
@@ -37,10 +37,8 @@
         }
     ],
     "scripts": {
-        "test": "vendor/bin/phpunit --testsuite unit && vendor/bin/phpunit --testsuite functional",
-        "test-all": "vendor/bin/phpunit --testsuite all",
-        "test-integration": "vendor/bin/phpunit --testsuite integration",
-        "test-coverage": "vendor/bin/phpunit --testsuite all --coverage-text --coverage-clover=build/coverage.xml"
+        "test": "vendor/bin/phpunit",
+        "test-coverage": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
     },
     "extra": {
         "branch-alias": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index ef59239..f8802a3 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -10,23 +10,9 @@
          testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader">
 
     <testsuites>
-        <testsuite name="all">
+        <testsuite name="Mailgun test suite">
             <directory>tests</directory>
         </testsuite>
-
-        <testsuite name="unit">
-            <directory>tests</directory>
-            <exclude>tests/Integration</exclude>
-            <exclude>test/Functional</exclude>
-        </testsuite>
-
-        <testsuite name="integration">
-            <directory>tests/Integration</directory>
-        </testsuite>
-
-        <testsuite name="functional">
-            <directory>tests/Functional</directory>
-        </testsuite>
     </testsuites>
 
     <filter>