diff --git a/module/VuFind/src/VuFind/Controller/InstallController.php b/module/VuFind/src/VuFind/Controller/InstallController.php
index 763569daa284e7986e9b2a3b353b2b764f619265..4ca799742f22a479c38b572d512da5ae62dac14a 100644
--- a/module/VuFind/src/VuFind/Controller/InstallController.php
+++ b/module/VuFind/src/VuFind/Controller/InstallController.php
@@ -556,10 +556,13 @@ class InstallController extends AbstractBase
             $drivers = [];
             $blacklist = [
                 'Sample.php', 'Demo.php', 'DriverInterface.php', 'AbstractBase.php',
-                'PluginManager.php', 'PluginFactory.php'
+                'PluginManager.php',
             ];
             while ($line = readdir($dir)) {
-                if (stristr($line, '.php') && !in_array($line, $blacklist)) {
+                if (stristr($line, '.php') && !in_array($line, $blacklist)
+                    && substr($line, -11) !== 'Factory.php'
+                    && substr($line, -9) !== 'Trait.php'
+                ) {
                     $drivers[] = str_replace('.php', '', $line);
                 }
             }