diff --git a/modules/saml/lib/Controller/Metadata.php b/modules/saml/lib/Controller/Metadata.php
index 8635d94c954c55487f68751cdd285ceaebc10f00..84e3efd547b8b39c2dda7c280c4a6c4f2ab96ee1 100644
--- a/modules/saml/lib/Controller/Metadata.php
+++ b/modules/saml/lib/Controller/Metadata.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\Controller;
+namespace SimpleSAML\Module\saml\Controller;
 
 use Exception;
 use SimpleSAML\Configuration;
diff --git a/modules/saml/lib/Controller/SingleLogout.php b/modules/saml/lib/Controller/SingleLogout.php
index b5eafd0ce40de73d6769ac9df452d21a58a9d7d6..1b2fe5f6adee67283fe259b7daafedb3e6f5e6ae 100644
--- a/modules/saml/lib/Controller/SingleLogout.php
+++ b/modules/saml/lib/Controller/SingleLogout.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\Controller;
+namespace SimpleSAML\Module\saml\Controller;
 
 use SAML2\Exception\Protocol\UnsupportedBindingException;
 use SimpleSAML\Assert\Assert;
diff --git a/modules/saml/lib/Controller/WebBrowserSingleSignOn.php b/modules/saml/lib/Controller/WebBrowserSingleSignOn.php
index 76fd2b984e657f26648089dbbf912a6acdc4f4c5..032d41f2114d13ecdba15e3671317bc6aee27162 100644
--- a/modules/saml/lib/Controller/WebBrowserSingleSignOn.php
+++ b/modules/saml/lib/Controller/WebBrowserSingleSignOn.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace SimpleSAML\Controller;
+namespace SimpleSAML\Module\saml\Controller;
 
 use SAML2\Exception\Protocol\UnsupportedBindingException;
 use SAML2\ArtifactResolve;
diff --git a/tests/modules/saml/lib/Controller/MetadataTest.php b/tests/modules/saml/lib/Controller/MetadataTest.php
index bbf45173c84c52e0c2a2f009eb41300b09dfe1ab..78c8da7b6bfb396e38f65ff879184d906eadf723 100644
--- a/tests/modules/saml/lib/Controller/MetadataTest.php
+++ b/tests/modules/saml/lib/Controller/MetadataTest.php
@@ -27,6 +27,9 @@ class MetadataTest extends TestCase
     /** @var \SimpleSAML\Session */
     protected Session $session;
 
+    /** @var \SimpleSAML\Utils\Auth */
+    protected Utils\Auth $authUtils;
+
 
     /**
      * Set up for each test.