diff --git a/vitrage_tempest_tests/config.py b/vitrage_tempest_tests/config.py
index 86909dd..c9e16e3 100644
--- a/vitrage_tempest_tests/config.py
+++ b/vitrage_tempest_tests/config.py
@@ -15,14 +15,10 @@
 
 from oslo_config import cfg
 
-service_available_group = cfg.OptGroup(name="service_available",
-                                       title="Available OpenStack Services")
-
-ServiceAvailableGroup = [
-    cfg.BoolOpt("vitrage",
-                default=True,
-                help="Whether or not vitrage is expected to be available"),
-]
+service_option = cfg.BoolOpt("vitrage",
+                             default=True,
+                             help="Whether or not vitrage is expected to be "
+                                  "available")
 
 rca_service_group = cfg.OptGroup(name="root_cause_analysis_service",
                                  title="Root Cause Analysis Service Options")
diff --git a/vitrage_tempest_tests/plugin.py b/vitrage_tempest_tests/plugin.py
index fbcaf78..abb3274 100644
--- a/vitrage_tempest_tests/plugin.py
+++ b/vitrage_tempest_tests/plugin.py
@@ -16,8 +16,6 @@
 
 import os
 
-# noinspection PyPackageRequirements
-from tempest import config
 # noinspection PyPackageRequirements
 from tempest.test_discover import plugins
 
@@ -33,13 +31,13 @@ class VitrageTempestPlugin(plugins.TempestPlugin):
         return full_test_dir, base_path
 
     def register_opts(self, conf):
-        config.register_opt_group(
-            conf, config_rca_service.service_available_group,
-            config_rca_service.ServiceAvailableGroup)
-        config.register_opt_group(
-            conf, config_rca_service.rca_service_group,
-            config_rca_service.RcaServiceGroup)
+        conf.register_opt(config_rca_service.service_option,
+                          group='service_available')
+        conf.register_group(config_rca_service.rca_service_group)
+        conf.register_opts(config_rca_service.RcaServiceGroup,
+                           group='root_cause_analysis_service')
 
     def get_opt_lists(self):
         return [(config_rca_service.rca_service_group.name,
-                 config_rca_service.rca_service_group)]
+                 config_rca_service.rca_service_group),
+                ('service_available', [config_rca_service.service_option])]