diff --git a/config_tempest/config_tempest.py b/config_tempest/config_tempest.py
index ed1faef1..b5a347cd 100755
--- a/config_tempest/config_tempest.py
+++ b/config_tempest/config_tempest.py
@@ -103,7 +103,7 @@ SERVICE_NAMES = {
 # configurable in tempest.conf
 SERVICE_VERSIONS = {
     'image': {'supported_versions': ['v1', 'v2'], 'catalog': 'image'},
-    'identity': {'supported_versions': ['v2', 'v3'], 'catalog': 'identity'},
+    'identity': {'supported_versions': ['v2'], 'catalog': 'identity'},
     'volume': {'supported_versions': ['v2', 'v3'], 'catalog': 'volumev3'}
 }
 
@@ -1048,7 +1048,8 @@ def configure_discovered_services(conf, services):
             conf.set(section, 'api_' + version, str(is_supported))
 
     # set service extensions
-    keystone_v3_support = conf.get('identity-feature-enabled', 'api_v3')
+    keystone_v3_support = conf.get_defaulted('identity-feature-enabled',
+                                             'api_v3')
     for service, ext_key in SERVICE_EXTENSION_KEY.iteritems():
         if service in services:
             extensions = ','.join(services[service].get('extensions', ""))