diff --git a/library/Icinga/Application/Modules/Module.php b/library/Icinga/Application/Modules/Module.php
index 461cec59a..443a39e32 100644
--- a/library/Icinga/Application/Modules/Module.php
+++ b/library/Icinga/Application/Modules/Module.php
@@ -763,7 +763,7 @@ class Module
             $this->app->getLoader()->registerNamespace('Icinga\\Module\\' . $moduleName, $moduleLibraryDir);
             if (is_dir($this->getFormDir())) {
                 $this->app->getLoader()->registerNamespace(
-                    'Icinga\\Module\\' . $moduleName. '\\Form',
+                    'Icinga\\Module\\' . $moduleName. '\\Forms',
                     $this->getFormDir()
                 );
             }
diff --git a/test/php/bootstrap.php b/test/php/bootstrap.php
index fd8fc6d66..a692d2be4 100644
--- a/test/php/bootstrap.php
+++ b/test/php/bootstrap.php
@@ -51,7 +51,7 @@ foreach ($modules as $module) {
 
     $moduleFormPath = $modulePath . '/' . $module . '/application/forms';
     if (is_dir($moduleFormPath)) {
-        $loader->registerNamespace($moduleNamespace . '\\Form', $moduleFormPath);
+        $loader->registerNamespace($moduleNamespace . '\\Forms', $moduleFormPath);
     }
 }