diff --git a/.travis.yml b/.travis.yml
index 580aa2270f..a31a805f5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,9 +38,10 @@ script:
 - docker-compose exec appwrite doctor
 - docker-compose exec appwrite vars
 - docker-compose exec appwrite test --debug --testsuite unit
+- docker-compose exec appwrite test --debug --testsuite e2e
 - docker-compose exec appwrite test --debug --testsuite webhooks
 - docker-compose exec appwrite test --debug --testsuite functions
-- docker-compose exec appwrite test --debug --testsuite e2e
+- docker-compose exec appwrite test --debug --testsuite services
 
 deploy:
   - provider: script
diff --git a/phpunit.xml b/phpunit.xml
index 668060ef70..2b88ca91df 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -15,6 +15,11 @@
         <testsuite name="unit">
             <directory>./tests/unit/</directory>
         </testsuite>
+        <testsuite name="e2e">
+            <file>./tests/e2e/Client.php</file>
+            <directory>./tests/e2e/General</directory>
+            <directory>./tests/e2e/Scopes</directory>
+        </testsuite>
         <testsuite name="webhooks">
             <directory>./tests/e2e/Services/Webhooks</directory>
         </testsuite>
@@ -23,10 +28,7 @@
             <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>
+        <testsuite name="services">
             <directory>./tests/e2e/Services/Account</directory>
             <directory>./tests/e2e/Services/Avatars</directory>
             <directory>./tests/e2e/Services/Database</directory>