diff --git a/whitebox_tempest_plugin/config.py b/whitebox_tempest_plugin/config.py
index 66b36fe1..3d92f897 100644
--- a/whitebox_tempest_plugin/config.py
+++ b/whitebox_tempest_plugin/config.py
@@ -15,17 +15,23 @@
 
 from oslo_config import cfg
 
-compute_private_group = cfg.OptGroup(name="compute_private_config",
-                                     title="Compute private config options")
 
-ComputePrivateGroup = [
-    cfg.StrOpt("target_controller",
-               help="Address of a controller node."),
-    cfg.StrOpt("target_ssh_user",
-               help="Username of the ssh connection."),
-    cfg.StrOpt("target_private_key_path",
-               help="Path to the private key."),
-    cfg.BoolOpt("containers",
-                default=False,
-                help="True if controller is containerized"),
+group = cfg.OptGroup(
+    name='compute_private_config',
+    title='Compute private config options')
+
+opts = [
+    cfg.StrOpt(
+        'target_controller',
+        help='Address of a controller node.'),
+    cfg.StrOpt(
+        'target_ssh_user',
+        help='Username of the SSH connection.'),
+    cfg.StrOpt(
+        'target_private_key_path',
+        help='Path to the private key.'),
+    cfg.BoolOpt(
+        'containers',
+        default=False,
+        help='Deployment is containerized.'),
 ]
diff --git a/whitebox_tempest_plugin/plugin.py b/whitebox_tempest_plugin/plugin.py
index 8d5aadae..3bcc0048 100644
--- a/whitebox_tempest_plugin/plugin.py
+++ b/whitebox_tempest_plugin/plugin.py
@@ -19,7 +19,7 @@ import os
 from tempest import config
 from tempest.test_discover import plugins
 
-from whitebox_tempest_plugin import config as project_config
+from whitebox_tempest_plugin import config as plugin_config
 
 
 class WhiteboxTempestPlugin(plugins.TempestPlugin):
@@ -32,8 +32,8 @@ class WhiteboxTempestPlugin(plugins.TempestPlugin):
         return full_test_dir, base_path
 
     def register_opts(self, conf):
-        config.register_opt_group(conf, project_config.compute_private_group,
-                                  project_config.ComputePrivateGroup)
+        config.register_opt_group(conf, plugin_config.group,
+                                  plugin_config.opts)
 
     def get_opt_lists(self):
-        pass
+        return [(plugin_config.group.name, plugin_config.opts)]