diff --git a/doc/api_samples/all_extensions/extensions-get-resp.json b/doc/v3/api_samples/all_extensions/extensions-list-resp-v2.json
similarity index 100%
rename from doc/api_samples/all_extensions/extensions-get-resp.json
rename to doc/v3/api_samples/all_extensions/extensions-list-resp-v2.json
diff --git a/nova/tests/functional/test_api_samples.py b/nova/tests/functional/test_api_samples.py
index fca0859cad3c..3b8ec6627aa7 100644
--- a/nova/tests/functional/test_api_samples.py
+++ b/nova/tests/functional/test_api_samples.py
@@ -197,15 +197,6 @@ class ServersSampleMultiStatusJsonTest(ServersSampleBase):
         self._verify_response('servers-list-resp', subs, response, 200)
 
 
-class ExtensionsSampleJsonTest(ApiSampleTestBaseV2):
-    all_extensions = True
-
-    def test_extensions_get(self):
-        response = self._do_get('extensions')
-        subs = self._get_regexes()
-        self._verify_response('extensions-get-resp', subs, response, 200)
-
-
 class FlavorsSampleJsonTest(ApiSampleTestBaseV2):
     sample_dir = 'flavors'
 
diff --git a/nova/tests/functional/api_samples/all_extensions/extensions-get-resp.json.tpl b/nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp-v2.json.tpl
similarity index 100%
rename from nova/tests/functional/api_samples/all_extensions/extensions-get-resp.json.tpl
rename to nova/tests/functional/v3/api_samples/all_extensions/extensions-list-resp-v2.json.tpl
diff --git a/nova/tests/functional/v3/test_extension_info.py b/nova/tests/functional/v3/test_extension_info.py
index 94beccdf9a2b..699133b33832 100644
--- a/nova/tests/functional/v3/test_extension_info.py
+++ b/nova/tests/functional/v3/test_extension_info.py
@@ -14,10 +14,15 @@
 #    under the License.
 
 import mock
+from oslo_config import cfg
 
 from nova.api.openstack import extensions as api_extensions
 from nova.tests.functional.v3 import api_sample_base
 
+CONF = cfg.CONF
+CONF.import_opt('osapi_compute_extension',
+                'nova.api.openstack.compute.extensions')
+
 
 def fake_soft_extension_authorizer(extension_name, core=False):
     def authorize(context, action=None):
@@ -27,13 +32,20 @@ def fake_soft_extension_authorizer(extension_name, core=False):
 
 class ExtensionInfoAllSamplesJsonTest(api_sample_base.ApiSampleTestBaseV3):
     all_extensions = True
+    # TODO(park): Overriding '_api_version' till all functional tests
+    # are merged between v2 and v2.1. After that base class variable
+    # itself can be changed to 'v2'
+    _api_version = 'v2'
 
     @mock.patch.object(api_extensions, 'os_compute_soft_authorizer')
     def test_list_extensions(self, soft_auth):
         soft_auth.side_effect = fake_soft_extension_authorizer
         response = self._do_get('extensions')
         subs = self._get_regexes()
-        self._verify_response('extensions-list-resp', subs, response, 200)
+        template = 'extensions-list-resp'
+        if self._test == 'v2':
+            template = 'extensions-list-resp-v2'
+        self._verify_response(template, subs, response, 200)
 
 
 class ExtensionInfoSamplesJsonTest(api_sample_base.ApiSampleTestBaseV3):