diff --git a/core/command/app/checkcode.php b/core/command/app/checkcode.php
index 18d8f0d5311..6d10714d410 100644
--- a/core/command/app/checkcode.php
+++ b/core/command/app/checkcode.php
@@ -43,16 +43,27 @@ class CheckCode extends Command {
 		$appId = $input->getArgument('app-id');
 		$codeChecker = new \OC\App\CodeChecker();
 		$codeChecker->listen('CodeChecker', 'analyseFileBegin', function($params) use ($output) {
-			$output->writeln("<info>Analysing {$params}</info>");
+			if(OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
+				$output->writeln("<info>Analysing {$params}</info>");
+			}
 		});
-		$codeChecker->listen('CodeChecker', 'analyseFileFinished', function($params) use ($output) {
-			$count = count($params);
-			$output->writeln(" {$count} errors");
-			usort($params, function($a, $b) {
+		$codeChecker->listen('CodeChecker', 'analyseFileFinished', function($filename, $errors) use ($output) {
+			$count = count($errors);
+
+			// show filename if the verbosity is low, but there are errors in a file
+			if($count > 0 && OutputInterface::VERBOSITY_VERBOSE > $output->getVerbosity()) {
+				$output->writeln("<info>Analysing {$filename}</info>");
+			}
+
+			// show error count if there are errros present or the verbosity is high
+			if($count > 0 || OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) {
+				$output->writeln(" {$count} errors");
+			}
+			usort($errors, function($a, $b) {
 				return $a['line'] >$b['line'];
 			});
 
-			foreach($params as $p) {
+			foreach($errors as $p) {
 				$line = sprintf("%' 4d", $p['line']);
 				$output->writeln("    <error>line $line: {$p['disallowedToken']} - {$p['reason']}</error>");
 			}
diff --git a/lib/private/app/codechecker.php b/lib/private/app/codechecker.php
index 918d04a0bd6..8c2f3405fb9 100644
--- a/lib/private/app/codechecker.php
+++ b/lib/private/app/codechecker.php
@@ -119,7 +119,7 @@ class CodeChecker extends BasicEmitter {
 			/** @var SplFileInfo $file */
 			$this->emit('CodeChecker', 'analyseFileBegin', [$file->getPathname()]);
 			$fileErrors = $this->analyseFile($file);
-			$this->emit('CodeChecker', 'analyseFileFinished', [$fileErrors]);
+			$this->emit('CodeChecker', 'analyseFileFinished', [$file->getPathname(), $fileErrors]);
 			$errors = array_merge($fileErrors, $errors);
 		}