diff --git a/.travis.yml b/.travis.yml
index e9226116d2..580aa2270f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,8 +37,10 @@ script:
 - docker-compose logs appwrite-worker-functions
 - docker-compose exec appwrite doctor
 - docker-compose exec appwrite vars
-- docker-compose exec appwrite test --debug
-- docker-compose logs appwrite
+- docker-compose exec appwrite test --debug --testsuite unit
+- docker-compose exec appwrite test --debug --testsuite webhooks
+- docker-compose exec appwrite test --debug --testsuite functions
+- docker-compose exec appwrite test --debug --testsuite e2e
 
 deploy:
   - provider: script
diff --git a/phpunit.xml b/phpunit.xml
index b9363b22cf..668060ef70 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -12,12 +12,21 @@
         <extension class="Appwrite\Tests\TestHook" />
     </extensions>
     <testsuites>
-        <testsuite name="Application Test Suite">
+        <testsuite name="unit">
             <directory>./tests/unit/</directory>
+        </testsuite>
+        <testsuite name="webhooks">
+            <directory>./tests/e2e/Services/Webhooks</directory>
+        </testsuite>
+        <testsuite name="functions">
+            <file>./tests/e2e/Services/Functions/FunctionsBase.php</file>
+            <file>./tests/e2e/Services/Functions/FunctionsCustomServerTest.php</file>
+            <file>./tests/e2e/Services/Functions/FunctionsCustomClientTest.php</file>
+        </testsuite>
+        <testsuite name="e2e">
             <file>./tests/e2e/Client.php</file>
             <directory>./tests/e2e/General</directory>
             <directory>./tests/e2e/Scopes</directory>
-            <directory>./tests/e2e/Services/Webhooks</directory>
             <directory>./tests/e2e/Services/Account</directory>
             <directory>./tests/e2e/Services/Avatars</directory>
             <directory>./tests/e2e/Services/Database</directory>
@@ -28,9 +37,6 @@
             <directory>./tests/e2e/Services/Teams</directory>
             <directory>./tests/e2e/Services/Users</directory>
             <directory>./tests/e2e/Services/Workers</directory>
-            <file>./tests/e2e/Services/Functions/FunctionsBase.php</file>
-            <file>./tests/e2e/Services/Functions/FunctionsCustomServerTest.php</file>
-            <file>./tests/e2e/Services/Functions/FunctionsCustomClientTest.php</file>
         </testsuite>
     </testsuites>
 </phpunit>
\ No newline at end of file