diff --git a/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php b/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php
index 09686377fb129f58602a45f0f92a2bfb13250eff..bf2d014042489363ce6341135fdc5ea77023a595 100644
--- a/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php
+++ b/tests/modules/core/lib/Auth/Process/AttributeValueMapTest.php
@@ -1,9 +1,12 @@
 <?php
 
+namespace SimpleSAML\Test\Module\core\Auth\Process;
+
+
 /**
  * Test for the core:AttributeValueMap filter.
  */
-class Test_Core_Auth_Process_AttributeValueMap extends PHPUnit_Framework_TestCase
+class AttributeValueMapTest extends \PHPUnit_Framework_TestCase
 {
 
     /**
@@ -15,7 +18,7 @@ class Test_Core_Auth_Process_AttributeValueMap extends PHPUnit_Framework_TestCas
      */
     private static function processFilter(array $config, array $request)
     {
-        $filter = new sspmod_core_Auth_Process_AttributeValueMap($config, null);
+        $filter = new \sspmod_core_Auth_Process_AttributeValueMap($config, null);
         $filter->process($request);
         return $request;
     }