diff --git a/cinder/tests/tempest/config.py b/cinder/tests/tempest/config.py
index d1a2db7..f4eb098 100644
--- a/cinder/tests/tempest/config.py
+++ b/cinder/tests/tempest/config.py
@@ -15,22 +15,7 @@
 
 from oslo_config import cfg
 
-service_available_group = cfg.OptGroup(name="service_available",
-                                       title="Available OpenStack Services")
-
-
-ServiceAvailableGroup = [
-    cfg.BoolOpt("cinder",
-                default=True,
-                help="Whether or not cinder is expected to be available"),
-]
-
-# Use a new config group specific to the cinder in-tree tests to avoid
-# any naming confusion with the upstream tempest config options.
-cinder_group = cfg.OptGroup(name='cinder',
-                            title='Cinder Tempest Config Options')
-
-CinderGroup = [
+cinder_option = [
     cfg.BoolOpt('consistency_group',
                 default=False,
                 help='Enable to run Cinder volume consistency group tests'),