diff --git a/core/FileIntegrity.php b/core/FileIntegrity.php
index 9bad3132fe8..9b6f19e4dff 100644
--- a/core/FileIntegrity.php
+++ b/core/FileIntegrity.php
@@ -92,7 +92,7 @@ protected static function getMessagesDirectoriesFoundButNotExpected($messages)
 
             $directories = array();
             foreach ($directoriesFoundButNotExpected as $directoryFoundNotExpected) {
-                $directories[] = htmlspecialchars(realpath($directoryFoundNotExpected));
+                $directories[] = htmlspecialchars(realpath(dirname($directoryFoundNotExpected)) . DIRECTORY_SEPARATOR . basename($directoryFoundNotExpected));
             }
 
             $deleteAllAtOnce = array();
@@ -138,7 +138,7 @@ protected static function getMessagesFilesFoundButNotExpected($messages)
 
             $files = array();
             foreach ($filesFoundButNotExpected as $fileFoundNotExpected) {
-                $files[] = '"' . htmlspecialchars(realpath($fileFoundNotExpected)) . '"';
+                $files[] = '"' . htmlspecialchars(realpath(dirname($fileFoundNotExpected)) . DIRECTORY_SEPARATOR . basename($fileFoundNotExpected)) . '"';
             }
 
             $deleteAllAtOnce = array();