diff --git a/cinder/tests/tempest/plugin.py b/cinder/tests/tempest/plugin.py
index ed7a912..b816963 100644
--- a/cinder/tests/tempest/plugin.py
+++ b/cinder/tests/tempest/plugin.py
@@ -32,17 +32,12 @@
 
     def register_opts(self, conf):
         config.register_opt_group(
-            conf, project_config.service_available_group,
-            project_config.ServiceAvailableGroup)
-        config.register_opt_group(
-            conf, project_config.cinder_group,
-            project_config.CinderGroup
+            conf, config.volume_feature_group,
+            project_config.cinder_option
         )
 
     def get_opt_lists(self):
         return [
-            (project_config.service_available_group.name,
-             project_config.ServiceAvailableGroup),
-            (project_config.cinder_group.name,
-             project_config.CinderGroup),
+            (config.volume_feature_group.name,
+             project_config.cinder_option),
         ]