diff --git a/nova/tests/test_cinder.py b/nova/tests/test_cinder.py
index 213b4c423ec5..913b4e4de763 100644
--- a/nova/tests/test_cinder.py
+++ b/nova/tests/test_cinder.py
@@ -257,6 +257,8 @@ class CinderTestCase(test.NoDBTestCase):
             "name": "cinder",
             "endpoints": [{"publicURL": "http://localhost:8776/v1/project_id"}]
         }]
+        cinder.CONF.set_override('catalog_info',
+                                 'volume:cinder:publicURL', group='cinder')
         self.context = context.RequestContext('username', 'project_id',
                                               service_catalog=catalog)
         cinder.cinderclient(self.context)
@@ -331,8 +333,6 @@ class CinderV2TestCase(test.NoDBTestCase):
             "name": "cinderv2",
             "endpoints": [{"publicURL": "http://localhost:8776/v2/project_id"}]
         }]
-        cinder.CONF.set_override('catalog_info',
-                                 'volumev2:cinder:publicURL', group='cinder')
         self.context = context.RequestContext('username', 'project_id',
                                               service_catalog=catalog)
 
diff --git a/nova/volume/cinder.py b/nova/volume/cinder.py
index e3d11690193c..6ddf3794ab4d 100644
--- a/nova/volume/cinder.py
+++ b/nova/volume/cinder.py
@@ -36,7 +36,7 @@ from nova.openstack.common import log as logging
 
 cinder_opts = [
     cfg.StrOpt('catalog_info',
-            default='volume:cinder:publicURL',
+            default='volumev2:cinderv2:publicURL',
             help='Info to match when looking for cinder in the service '
                  'catalog. Format is: separated values of the form: '
                  '<service_type>:<service_name>:<endpoint_type>',