diff --git a/composer.json b/composer.json
index d9269cb..13a09e2 100644
--- a/composer.json
+++ b/composer.json
@@ -25,12 +25,7 @@
       "opencart-dir" : "www"
     },
     "scripts" : {
-      "test-admin": "bin/phpunit --testsuite admin-tests --colors=always",
-      "test-catalog": "bin/phpunit --testsuite catalog-tests --colors=always",
-      "test": [
-        "@test-admin",
-        "@test-catalog"
-      ],
+      "test": "bin/phpunit --testsuite tests --colors=always",
       "setup" : "bin/robo --load-from tests/RoboFile.php opencart:setup"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4990776..43dc74b 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -10,11 +10,8 @@
          stopOnFailure="false"
          syntaxCheck="false">
     <testsuites>
-        <testsuite name="catalog-tests">
-            <directory suffix="CatalogTest.php">./tests/catalog/</directory>
-        </testsuite>
-        <testsuite name="admin-tests">
-            <directory suffix="AdminTest.php">./tests/admin/</directory>
+        <testsuite name="tests">
+            <directory suffix="Test.php">./tests/</directory>
         </testsuite>
     </testsuites>
     <php>