diff --git a/.travis.yml b/.travis.yml
index 8bad8a331..de35ef7f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
-sudo: false
 language: php
 services:
     - mysql
@@ -9,9 +8,6 @@ env:
         - CORE_BRANCH=master DB=sqlite 
         - CORE_BRANCH=stable11 DB=sqlite 
 
-matrix:
-    fast_finish: true
-
 before_install:
     # install core
     - cd ../
@@ -35,4 +31,4 @@ after_failure:
     - cat ../../data/nextcloud.log
 
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
+    - bash <(curl -s https://codecov.io/bash)
diff --git a/Makefile b/Makefile
index e5a514512..9a569d348 100644
--- a/Makefile
+++ b/Makefile
@@ -72,14 +72,15 @@ appstore: clean-build build
 
 
 test:
+	mkdir -p build/
 	cd js && $(npm) run test
 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 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
+	php $(build_tools_directory)/phpunit.phar -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
+	php $(build_tools_directory)/phpunit.phar -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
 else
-	phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.clover
-	phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-unit.clover
+	phpunit -c tests/phpunit.xml --coverage-clover build/php-unit.coverage.xml
+	phpunit -c tests/phpunit.integration.xml --coverage-clover build/php-integration.coverage.xml
 endif
diff --git a/tests/phpunit.integration.xml b/tests/phpunit.integration.xml
index 85c062d10..4a7eddb02 100644
--- a/tests/phpunit.integration.xml
+++ b/tests/phpunit.integration.xml
@@ -6,7 +6,7 @@
 	</testsuites>
 	<filter>
 		<whitelist>
-			<directory suffix=".php">./lib</directory>
+			<directory suffix=".php">./../lib</directory>
 		</whitelist>
 	</filter>
 </phpunit>
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 3b9791b99..c108da003 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -6,7 +6,7 @@
 	</testsuites>
 	<filter>
 		<whitelist>
-			<directory suffix=".php">./lib</directory>
+			<directory suffix=".php">./../lib</directory>
 		</whitelist>
 	</filter>
 </phpunit>