diff --git a/.travis.yml b/.travis.yml
index 99f6db042..c4412168b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -115,7 +115,6 @@ script:
    fi
 
  # Run the unit tests.
- - cd tests
  - |
    if [ "$TEST_COVERAGE" == '1' ]; then
      $PHPUNIT_BIN --coverage-clover clover.xml;
@@ -127,7 +126,6 @@ script:
    fi
 
 after_script:
- - utils/proxy/stop.sh
- - cd ..
+ - tests/utils/proxy/stop.sh
  - PATH=$PATH vendor/bin/stop.sh
  - test $TEST_COVERAGE && bash <(curl -s https://codecov.io/bash)
diff --git a/README.md b/README.md
index 018a9a20b..7893971ee 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,6 @@ To run the test suite, first check that you have the [PHP
 JSON extension ](http://php.net/manual/en/book.json.php) enabled. Then
 simply:
 
-    $ cd tests
     $ phpunit
 
 If you'd like to run a single set of tests, specify just the name:
diff --git a/composer.json b/composer.json
index 089f30dba..1d2618a20 100644
--- a/composer.json
+++ b/composer.json
@@ -33,10 +33,10 @@
 			"@php ./vendor/squizlabs/php_codesniffer/bin/phpcbf"
 		],
 		"test": [
-			"@php ./vendor/phpunit/phpunit/phpunit -c ./tests/phpunit.xml.dist --no-coverage"
+			"@php ./vendor/phpunit/phpunit/phpunit --no-coverage"
 		],
 		"coverage": [
-			"@php ./vendor/phpunit/phpunit/phpunit -c ./tests/phpunit.xml.dist"
+			"@php ./vendor/phpunit/phpunit/phpunit"
 		]
 	}
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 000000000..48856b5eb
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd"
+	backupGlobals="true"
+	bootstrap="tests/bootstrap.php"
+	colors="true"
+	verbose="true"
+	>
+	<testsuites>
+		<testsuite name="Authentication">
+			<directory suffix=".php">tests/Auth</directory>
+		</testsuite>
+		<testsuite name="Transports">
+			<directory suffix=".php">tests/Transport</directory>
+		</testsuite>
+		<testsuite name="Proxies">
+			<directory suffix=".php">tests/Proxy</directory>
+		</testsuite>
+		<testsuite name="General">
+			<file>tests/ChunkedEncoding.php</file>
+			<file>tests/Cookies.php</file>
+			<file>tests/Encoding.php</file>
+			<file>tests/IDNAEncoder.php</file>
+			<file>tests/IRI.php</file>
+			<file>tests/Requests.php</file>
+			<file>tests/Response/Headers.php</file>
+			<file>tests/Session.php</file>
+			<file>tests/SSL.php</file>
+			<file>tests/Utility/FilteredIterator.php</file>
+		</testsuite>
+	</testsuites>
+
+	<logging>
+		<log type="coverage-html" target="tests/coverage" lowUpperBound="35" highLowerBound="90"/>
+	</logging>
+
+	<filter>
+		<whitelist addUncoveredFilesFromWhitelist="true">
+			<directory suffix=".php">library</directory>
+		</whitelist>
+	</filter>
+</phpunit>
diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist
deleted file mode 100644
index c29b6a5e6..000000000
--- a/tests/phpunit.xml.dist
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd"
-	backupGlobals="true"
-	bootstrap="bootstrap.php"
-	colors="true"
-	verbose="true"
-	>
-	<testsuites>
-		<testsuite name="Authentication">
-			<directory suffix=".php">Auth</directory>
-		</testsuite>
-		<testsuite name="Transports">
-			<directory suffix=".php">Transport</directory>
-		</testsuite>
-		<testsuite name="Proxies">
-			<directory suffix=".php">Proxy</directory>
-		</testsuite>
-		<testsuite name="General">
-			<file>ChunkedEncoding.php</file>
-			<file>Cookies.php</file>
-			<file>Encoding.php</file>
-			<file>IDNAEncoder.php</file>
-			<file>IRI.php</file>
-			<file>Requests.php</file>
-			<file>Response/Headers.php</file>
-			<file>Session.php</file>
-			<file>SSL.php</file>
-			<file>Utility/FilteredIterator.php</file>
-		</testsuite>
-	</testsuites>
-
-	<logging>
-		<log type="coverage-html" target="coverage" lowUpperBound="35" highLowerBound="90"/>
-	</logging>
-
-	<filter>
-		<whitelist addUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">../library</directory>
-		</whitelist>
-	</filter>
-</phpunit>