diff --git a/composer.json b/composer.json
index 8ee5de9..f1d40d6 100644
--- a/composer.json
+++ b/composer.json
@@ -33,8 +33,8 @@
     ],
     "scripts": {
         "test": "vendor/bin/phpunit --testsuite unit && vendor/bin/phpunit --testsuite functional",
-        "test-all": "vendor/bin/phpunit",
+        "test-all": "vendor/bin/phpunit --testsuite all",
         "test-integration": "vendor/bin/phpunit --testsuite integration",
-        "test-coverage": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
+        "test-coverage": "vendor/bin/phpunit --testsuite all --coverage-text --coverage-clover=build/coverage.xml"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index fb6a76f..e160fab 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -10,8 +10,9 @@
          testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader">
 
     <testsuites>
-        <testsuite>
+        <testsuite name="all">
             <directory>tests</directory>
+            <exclude>tests/Integration</exclude>
         </testsuite>
 
         <testsuite name="unit">