diff --git a/Makefile b/Makefile
index 7cf54fabb..e5a514512 100644
--- a/Makefile
+++ b/Makefile
@@ -77,9 +77,9 @@ ifeq (, $(shell which phpunit 2> /dev/null))
 	@echo "No phpunit command available, downloading a copy from the web"
 	mkdir -p $(build_tools_directory)
 	curl -sSL https://phar.phpunit.de/phpunit.phar -o $(build_tools_directory)/phpunit.phar
-	php $(build_tools_directory)/phpunit.phar -c phpunit.xml --coverage-clover build/php-unit.clover
-	php $(build_tools_directory)/phpunit.phar -c phpunit.integration.xml --coverage-clover build/php-integration.clover
+	php $(build_tools_directory)/phpunit.phar -c tests/phpunit.xml --coverage-clover build/php-unit.clover
+	php $(build_tools_directory)/phpunit.phar -c tests/phpunit.integration.xml --coverage-clover build/php-integration.clover
 else
-	phpunit -c phpunit.xml --coverage-clover build/php-unit.clover
-	phpunit -c phpunit.integration.xml --coverage-clover build/php-unit.clover
+	phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.clover
+	phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-unit.clover
 endif
diff --git a/phpunit.integration.xml b/tests/phpunit.integration.xml
similarity index 60%
rename from phpunit.integration.xml
rename to tests/phpunit.integration.xml
index cfc121cd5..85c062d10 100644
--- a/phpunit.integration.xml
+++ b/tests/phpunit.integration.xml
@@ -1,7 +1,7 @@
-<phpunit bootstrap="tests/bootstrap.php" colors="true">
+<phpunit bootstrap="bootstrap.php" colors="true">
 	<testsuites>
 		<testsuite name="integration">
-			<directory>./tests/integration</directory>
+			<directory>./integration</directory>
 		</testsuite>
 	</testsuites>
 	<filter>
@@ -9,4 +9,4 @@
 			<directory suffix=".php">./lib</directory>
 		</whitelist>
 	</filter>
-</phpunit>
\ No newline at end of file
+</phpunit>
diff --git a/phpunit.xml b/tests/phpunit.xml
similarity index 65%
rename from phpunit.xml
rename to tests/phpunit.xml
index 7e0ca06e9..3b9791b99 100644
--- a/phpunit.xml
+++ b/tests/phpunit.xml
@@ -1,7 +1,7 @@
-<phpunit bootstrap="tests/bootstrap.php" colors="true">
+<phpunit bootstrap="bootstrap.php" colors="true">
 	<testsuites>
 		<testsuite name="unit">
-			<directory>./tests/unit</directory>
+			<directory>./unit</directory>
 		</testsuite>
 	</testsuites>
 	<filter>