diff --git a/keystone/tests/unit/config_files/test_auth_plugin.conf b/keystone/tests/unit/config_files/test_auth_plugin.conf
index 4a9e87d5e3..aa61070a74 100644
--- a/keystone/tests/unit/config_files/test_auth_plugin.conf
+++ b/keystone/tests/unit/config_files/test_auth_plugin.conf
@@ -1,4 +1,4 @@
 [auth]
-methods = external,password,token,simple_challenge_response,saml2,openid,x509
+methods = external,password,token,simple_challenge_response,saml2,openid,x509,mapped
 simple_challenge_response = keystone.tests.unit.test_auth_plugin.SimpleChallengeResponse
 
diff --git a/keystone/tests/unit/test_auth_plugin.py b/keystone/tests/unit/test_auth_plugin.py
index 4d76119b9c..0d2fc54fd8 100644
--- a/keystone/tests/unit/test_auth_plugin.py
+++ b/keystone/tests/unit/test_auth_plugin.py
@@ -180,7 +180,7 @@ class TestMapped(unit.TestCase):
             self.assertEqual(method_name, auth_payload['protocol'])
 
     def test_supporting_multiple_methods(self):
-        method_names = ('saml2', 'openid', 'x509')
+        method_names = ('saml2', 'openid', 'x509', 'mapped')
         self.useFixture(auth_plugins.LoadAuthPlugins(*method_names))
         for method_name in method_names:
             self._test_mapped_invocation_with_method_name(method_name)
diff --git a/setup.cfg b/setup.cfg
index c08dd03625..3f64faeaa5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -114,6 +114,9 @@ keystone.auth.totp =
 keystone.auth.x509 =
     default = keystone.auth.plugins.mapped:Mapped
 
+keystone.auth.mapped =
+    default = keystone.auth.plugins.mapped:Mapped
+
 keystone.catalog =
     sql = keystone.catalog.backends.sql:Catalog
     templated = keystone.catalog.backends.templated:Catalog