diff --git a/trove/tests/tempest/config.py b/trove/tests/tempest/config.py
index 51e7c01..0048b7a 100644
--- a/trove/tests/tempest/config.py
+++ b/trove/tests/tempest/config.py
@@ -14,14 +14,10 @@
 
 from oslo_config import cfg
 
-ServiceAvailableGroup = [
-    cfg.BoolOpt('trove',
-                default=True,
-                help="Whether or not Trove is expected to be available")
-]
-
-service_available_group = cfg.OptGroup(name='service_available',
-                                       title='Available OpenStack services')
+service_option = cfg.BoolOpt('trove',
+                             default=True,
+                             help="Whether or not Trove is expected to be "
+                                  "available")
 
 database_group = cfg.OptGroup(name='database',
                               title='Database Service Options')
diff --git a/trove/tests/tempest/plugin.py b/trove/tests/tempest/plugin.py
index 7909590..c739b29 100644
--- a/trove/tests/tempest/plugin.py
+++ b/trove/tests/tempest/plugin.py
@@ -15,7 +15,6 @@
 
 import os
 
-from tempest import config
 from tempest.test_discover import plugins
 
 from trove.tests.tempest import config as trove_config
@@ -32,15 +31,11 @@ class TroveTempestPlugin(plugins.TempestPlugin):
         return full_test_dir, base_path
 
     def register_opts(self, conf):
-        config.register_opt_group(
-            conf, trove_config.service_available_group,
-            trove_config.ServiceAvailableGroup
-        )
-        config.register_opt_group(
-            conf, trove_config.database_group,
-            trove_config.DatabaseGroup
-        )
+        conf.register_group(trove_config.database_group)
+        conf.register_opts(trove_config.DatabaseGroup, group='database')
+        conf.register_opt(trove_config.service_option,
+                          group='service_available')
 
     def get_opt_lists(self):
         return [('database', trove_config.DatabaseGroup),
-                ('service_available', trove_config.ServiceAvailableGroup)]
+                ('service_available', [trove_config.service_option])]