diff --git a/lib/_autoload_modules.php b/lib/_autoload_modules.php
index db0f5b3f9d018d3aa843bf405a26ac65faef6729..223ebc5fd64f3d4ec2f731fe5aefe2e49e0549af 100644
--- a/lib/_autoload_modules.php
+++ b/lib/_autoload_modules.php
@@ -24,7 +24,7 @@ function temporaryLoader($class)
         $new = '\\RobRichards\\XMLSecLibs\\'.$class;
         if (class_exists($new, true)) {
             class_alias($new, $class);
-            SimpleSAML\Logger::warning("The class or interface '$class' is now using namespaces, please use '$new'.");
+            SimpleSAML\Logger::warning("The class '$class' is now using namespaces, please use '$new'.");
             return;
         }
     }
diff --git a/tests/lib/AutoloadModulesTest.php b/tests/lib/AutoloadModulesTest.php
index 5bc596d2321dc6034735504e82dcd107b9113bf1..4520b9e618a3136951b8ec46c3dcf716a71ef002 100644
--- a/tests/lib/AutoloadModulesTest.php
+++ b/tests/lib/AutoloadModulesTest.php
@@ -3,9 +3,19 @@
 namespace SimpleSAML\Test;
 
 use PHPUnit\Framework\TestCase;
+use SimpleSAML\Configuration;
 
 class AutoloadModulesTest extends TestCase
 {
+    /**
+     * Set up for each test.
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+        $config = Configuration::loadFromArray([], '[ARRAY]', 'simplesaml');
+    }
+
     /**
      * @test
      * @runInSeparateProcess
@@ -17,7 +27,6 @@ class AutoloadModulesTest extends TestCase
 
     /**
      * @test
-     * @runInSeparateProcess
      */
     public function autoloaderSubstitutesNamespacedXmlSecClassesWhereNonNamespacedClassWasUsed()
     {