diff --git a/.travis.yml b/.travis.yml
index f5e7ee4681..2fa9ff9357 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ arch:
 os: linux
 
 vm:
-  size: x-large
+  size: large
 
 language: shell
 
diff --git a/phpunit.xml b/phpunit.xml
index bd38ab510a..f0a2813f5a 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -13,26 +13,26 @@
     </extensions>
     <testsuites>
         <testsuite name="unit">
-            <!-- <directory>./tests/unit/</directory> -->
+            <directory>./tests/unit/</directory>
         </testsuite>
         <testsuite name="e2e">
-            <!-- <file>./tests/e2e/Client.php</file>
+            <file>./tests/e2e/Client.php</file>
             <directory>./tests/e2e/General</directory>
-            <directory>./tests/e2e/Scopes</directory> -->
+            <directory>./tests/e2e/Scopes</directory>
             <directory>./tests/e2e/Services/Account</directory>
-            <!-- <directory>./tests/e2e/Services/Avatars</directory> -->
-            <!-- <directory>./tests/e2e/Services/Database</directory> -->
-            <!-- <directory>./tests/e2e/Services/Health</directory>
-            <directory>./tests/e2e/Services/Locale</directory> -->
-            <!-- <directory>./tests/e2e/Services/Projects</directory> -->
-            <!-- <directory>./tests/e2e/Services/Storage</directory> -->
-            <!-- <directory>./tests/e2e/Services/Teams</directory> -->
-            <!-- <directory>./tests/e2e/Services/Users</directory> -->
-            <!-- <directory>./tests/e2e/Services/Workers</directory> -->
-            <!-- <directory>./tests/e2e/Services/Webhooks</directory> -->
-            <!-- <file>./tests/e2e/Services/Functions/FunctionsBase.php</file>
+            <directory>./tests/e2e/Services/Avatars</directory>
+            <directory>./tests/e2e/Services/Database</directory>
+            <directory>./tests/e2e/Services/Health</directory>
+            <directory>./tests/e2e/Services/Locale</directory>
+            <directory>./tests/e2e/Services/Projects</directory>
+            <directory>./tests/e2e/Services/Storage</directory>
+            <directory>./tests/e2e/Services/Teams</directory>
+            <directory>./tests/e2e/Services/Users</directory>
+            <directory>./tests/e2e/Services/Workers</directory>
+            <directory>./tests/e2e/Services/Webhooks</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> -->
+            <file>./tests/e2e/Services/Functions/FunctionsCustomClientTest.php</file>
         </testsuite>
     </testsuites>
 </phpunit>
\ No newline at end of file