diff --git a/autotest-checkers.sh b/autotest-checkers.sh
index d6a4537387939ba5b5538fab1fbe2c8d1751721f..35c945a17e92a98772b6ae2a6e1ca5aac56b0b80 100755
--- a/autotest-checkers.sh
+++ b/autotest-checkers.sh
@@ -12,7 +12,8 @@ php ./build/htaccess-checker.php
 RESULT=$(($RESULT+$?))
 
 
-for app in $(find "apps/" -mindepth 1 -maxdepth 1 -type d -printf '%f\n'); do
+for app in $(find "apps/" -mindepth 1 -maxdepth 1 -type d -exec basename {} \;); do
+    echo "Testing $app"
     if
         [ "$app" == "dav" ] || \
         [ "$app" == "encryption" ] || \
diff --git a/core/Command/App/CheckCode.php b/core/Command/App/CheckCode.php
index 22a1984b1b33be45fa20b8771f6175b56a19431c..46b9b748ada4b5e6e6a3d54c615cae688f7b7971 100644
--- a/core/Command/App/CheckCode.php
+++ b/core/Command/App/CheckCode.php
@@ -125,7 +125,10 @@ class CheckCode extends Command implements CompletionAwareInterface  {
 				$output->writeln("    <error>line $line: {$p['disallowedToken']} - {$p['reason']}</error>");
 			}
 		});
-		$errors = $codeChecker->analyse($appId);
+		$errors = [];
+		if(!$input->getOption('skip-checkers')) {
+			$errors = $codeChecker->analyse($appId);
+		}
 
 		if(!$input->getOption('skip-validate-info')) {
 			$infoChecker = new InfoChecker($this->infoParser);