diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
index 00606349a804a8bb64e47c3f0e018aefe74e98e2..5a4ac04f0256a78bcd2d80639cfb56cb49221dbf 100755
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php
@@ -3415,9 +3415,9 @@ return [
     ['Magento\Tools\SampleData\SetupInterface', 'Magento\SampleData\Model\SetupInterface'],
     [
         'Magento\Tools\SampleData\Module\Bundle\Setup\Product\Converter',
-        'Magento\SampleData\Module\Bundle\Setup\Product\Converter'],
-    ['Magento\Tools\SampleData\Module\Bundle\Setup\Product', 'Magento\SampleData\Module\Bundle\Setup\Product'
+        'Magento\SampleData\Module\Bundle\Setup\Product\Converter'
     ],
+    ['Magento\Tools\SampleData\Module\Bundle\Setup\Product', 'Magento\SampleData\Module\Bundle\Setup\Product'],
     ['Magento\Tools\SampleData\Module\Bundle\Setup', 'Magento\SampleData\Module\Bundle\Setup'],
     ['Magento\Tools\SampleData\Module\Catalog\Setup\Attribute', 'Magento\SampleData\Module\Catalog\Setup\Attribute'],
     ['Magento\Tools\SampleData\Module\Catalog\Setup\Category', 'Magento\SampleData\Module\Catalog\Setup\Category'],
@@ -3454,8 +3454,11 @@ return [
     ],
     [
         'Magento\Tools\SampleData\Module\ConfigurableProduct\Setup\Product',
-        'Magento\SampleData\Module\ConfigurableProduct\Setup\Product'],
-    ['Magento\Tools\SampleData\Module\ConfigurableProduct\Setup', 'Magento\SampleData\Module\ConfigurableProduct\Setup'
+        'Magento\SampleData\Module\ConfigurableProduct\Setup\Product'
+    ],
+    [
+        'Magento\Tools\SampleData\Module\ConfigurableProduct\Setup',
+        'Magento\SampleData\Module\ConfigurableProduct\Setup'
     ],
     ['Magento\Tools\SampleData\Module\Customer\Setup\Customer', 'Magento\SampleData\Module\Customer\Setup\Customer'],
     ['Magento\Tools\SampleData\Module\Customer\Setup', 'Magento\SampleData\Module\Customer\Setup'],
@@ -3526,4 +3529,5 @@ return [
     ],
     ['Magento\Tools\SampleData\Module\Wishlist\Setup\Wishlist', 'Magento\SampleData\Module\Wishlist\Setup\Wishlist'],
     ['Magento\Tools\SampleData\Module\Wishlist\Setup', 'Magento\SampleData\Module\Wishlist\Setup'],
+    ['Magento\Tools\SampleData\InstallerApp'],
 ];
diff --git a/lib/internal/Magento/Framework/App/Utility/Files.php b/lib/internal/Magento/Framework/App/Utility/Files.php
index efc05f7fa8515e2de069caa0d2be5e387851c7a9..2feccec4ac1dbf3c35c3ceb52253dbfe2d52e920 100644
--- a/lib/internal/Magento/Framework/App/Utility/Files.php
+++ b/lib/internal/Magento/Framework/App/Utility/Files.php
@@ -134,8 +134,7 @@ class Files
                     $files,
                     glob($this->_path . '/*.php', GLOB_NOSORT),
                     glob($this->_path . '/pub/*.php', GLOB_NOSORT),
-                    $this->getFilesSubset(["{$this->_path}/lib/internal/Magento"], '*.php', $this->libTestDirs),
-                    self::getFiles(["{$this->_path}/app/code/Magento/SampleData"], '*.php')
+                    $this->getFilesSubset(["{$this->_path}/lib/internal/Magento"], '*.php', $this->libTestDirs)
                 );
             }
             if ($tests) {