diff --git a/keystone/identity/core.py b/keystone/identity/core.py
index d29455b010..b783836d85 100644
--- a/keystone/identity/core.py
+++ b/keystone/identity/core.py
@@ -266,8 +266,7 @@ class DomainConfigs(dict):
         for group in specific_config:
             for option in specific_config[group]:
                 domain_config['cfg'].set_override(
-                    option, specific_config[group][option],
-                    group, enforce_type=True)
+                    option, specific_config[group][option], group)
 
         domain_config['cfg_overrides'] = specific_config
         domain_config['driver'] = self._load_driver(domain_config)
diff --git a/keystone/tests/unit/identity/test_core.py b/keystone/tests/unit/identity/test_core.py
index 71ebde81d2..50c2a66535 100644
--- a/keystone/tests/unit/identity/test_core.py
+++ b/keystone/tests/unit/identity/test_core.py
@@ -143,7 +143,7 @@ class TestDatabaseDomainConfigs(unit.TestCase):
         # Override two config options for our domain
         conf = {'ldap': {'url': uuid.uuid4().hex,
                          'suffix': uuid.uuid4().hex,
-                         'use_tls': 'True'},
+                         'use_tls': True},
                 'identity': {
                     'driver': 'ldap'}}
         self.domain_config_api.create_config(domain['id'], conf)
diff --git a/keystone/tests/unit/test_backend_ldap.py b/keystone/tests/unit/test_backend_ldap.py
index b199b3435e..8576a322fa 100644
--- a/keystone/tests/unit/test_backend_ldap.py
+++ b/keystone/tests/unit/test_backend_ldap.py
@@ -2608,7 +2608,7 @@ class MultiLDAPandSQLIdentityDomainConfigsInSQL(MultiLDAPandSQLIdentity):
                      'password': 'password',
                      'suffix': 'cn=example,cn=com'},
             'identity': {'driver': 'ldap',
-                         'list_limit': '101'}
+                         'list_limit': 101}
         }
         domain2_config = {
             'ldap': {'url': 'fake://memory',