diff --git a/4dev/checking/phan.sh b/4dev/checking/phan.sh
index b9ee244c..5c788c16 100755
--- a/4dev/checking/phan.sh
+++ b/4dev/checking/phan.sh
@@ -1,3 +1,5 @@
 base="/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/";
-# must be run in ${base}www/
-$(cd "${base}"; phan --progress-bar -C --analyze-twice);
+# must be run in ${base}
+cd $base;
+${base}tools/phan --progress-bar -C --analyze-twice;
+cd ~;
diff --git a/4dev/checking/phpstan.sh b/4dev/checking/phpstan.sh
index a6777232..079bbf6c 100755
--- a/4dev/checking/phpstan.sh
+++ b/4dev/checking/phpstan.sh
@@ -1,3 +1,5 @@
 base="/storage/var/www/html/developers/clemens/core_data/php_libraries/trunk/";
-# must be run in ${base}www/
-$(cd "${base}"; phpstan);
+# must be run in ${base}
+cd $base;
+${base}tools/phpstan;
+cd ~;
diff --git a/4dev/checking/phpunit.sh b/4dev/checking/phpunit.sh
index 6bfd0920..50badb6f 100755
--- a/4dev/checking/phpunit.sh
+++ b/4dev/checking/phpunit.sh
@@ -34,7 +34,7 @@ if [ ! -z "${2}" ] && [ -z "${php_bin}" ]; then
 fi;
 
 # Note 4dev/tests/bootstrap.php has to be set as bootstrap file in phpunit.xml
-phpunit_call="${php_bin}phpunit ${opt_testdox} -c ${base}phpunit.xml ${base}4dev/tests/";
+phpunit_call="${php_bin}${base}tools/phpunit ${opt_testdox} -c ${base}phpunit.xml ${base}4dev/tests/";
 
 ${phpunit_call};
 
diff --git a/4dev/tests/bootstrap.php b/4dev/tests/bootstrap.php
index 97147d8f..ab99d7a2 100644
--- a/4dev/tests/bootstrap.php
+++ b/4dev/tests/bootstrap.php
@@ -1,7 +1,7 @@
 <?php
 
 $set = 0;
-foreach (['/../..', '/..', '/../../www', '/../www'] as $src) {
+foreach (['/../../www', '/../www', '/../..', '/..', '/../../src', '/../src'] as $src) {
 	if (is_file(dirname(__DIR__) . $src . '/vendor/autoload.php')) {
 		require dirname(__DIR__) . $src . '/vendor/autoload.php';
 		$set = 1;
diff --git a/phpstan.neon b/phpstan.neon
index e9744f10..beb0e966 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -53,6 +53,6 @@ parameters:
 		#	paths:
 		#		- ...
 		#		- ...
-		-
-			message: "#^Call to deprecated method #"
-			path: www/admin/class_test*.php
+		#-
+		#	message: "#^Call to deprecated method #"
+		#	path: www/admin/class_test*.php