diff --git a/.travis.yml b/.travis.yml
index 54179d4929..eaf4af6fdd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ before_script:
   - composer install
 
 script:
-  - vendor/bin/phpunit -c tests/phpunit.xml --coverage-clover=coverage.xml
+  - vendor/bin/phpunit --coverage-clover=coverage.xml
 
 notifications:
   email:
diff --git a/composer.json b/composer.json
index 5572cbbf73..d4eee657cb 100644
--- a/composer.json
+++ b/composer.json
@@ -72,9 +72,6 @@
             "Tests\\": "tests/"
         }
     },
-    "scripts": {
-        "test": "vendor/bin/phpunit -c tests/phpunit.xml"
-    },
     "extra": {
         "branch-alias": {
             "dev-master": "0.1.x-dev"
diff --git a/tests/phpunit.xml b/phpunit.xml
similarity index 72%
rename from tests/phpunit.xml
rename to phpunit.xml
index 75d384807a..c16f175545 100644
--- a/tests/phpunit.xml
+++ b/phpunit.xml
@@ -12,13 +12,8 @@
 
     <testsuites>
         <testsuite name="all">
-            <directory suffix="Test.php">./</directory>
+            <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
 
-    <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="CACHE_DRIVER" value="array"/>
-    </php>
-
 </phpunit>