diff --git a/heat_tempest_plugin/common/test.py b/heat_tempest_plugin/common/test.py
index a0a8b5f..4fdfb8e 100644
--- a/heat_tempest_plugin/common/test.py
+++ b/heat_tempest_plugin/common/test.py
@@ -29,8 +29,8 @@ import testtools
 
 from heat_tempest_plugin.common import exceptions
 from heat_tempest_plugin.common import remote_client
-from heat_tempest_plugin import config
 from heat_tempest_plugin.services import clients
+from tempest import config
 
 LOG = logging.getLogger(__name__)
 _LOG_FORMAT = "%(levelname)8s [%(name)s] %(message)s"
diff --git a/heat_tempest_plugin/config.py b/heat_tempest_plugin/config.py
index 6f39abb..6d2ead6 100644
--- a/heat_tempest_plugin/config.py
+++ b/heat_tempest_plugin/config.py
@@ -12,8 +12,6 @@
 
 from oslo_config import cfg
 
-CONF = None
-
 service_available_group = cfg.OptGroup(name="service_available",
                                        title="Available OpenStack Services")
 
diff --git a/heat_tempest_plugin/plugin.py b/heat_tempest_plugin/plugin.py
index 0938b43..acf4fc7 100644
--- a/heat_tempest_plugin/plugin.py
+++ b/heat_tempest_plugin/plugin.py
@@ -34,7 +34,6 @@ class HeatTempestPlugin(plugins.TempestPlugin):
                                   heat_config.ServiceAvailableGroup)
         config.register_opt_group(conf, heat_config.heat_group,
                                   heat_config.HeatGroup)
-        heat_config.CONF = config.CONF
 
     def get_opt_lists(self):
         return [(heat_config.heat_group.name,
diff --git a/heat_tempest_plugin/tests/api/test_heat_api.py b/heat_tempest_plugin/tests/api/test_heat_api.py
index 5a373cc..bf86839 100644
--- a/heat_tempest_plugin/tests/api/test_heat_api.py
+++ b/heat_tempest_plugin/tests/api/test_heat_api.py
@@ -19,8 +19,8 @@ from gabbi import driver
 from six.moves.urllib import parse as urlparse
 
 from heat_tempest_plugin.common import test
-from heat_tempest_plugin import config
 from heat_tempest_plugin.services import clients
+from tempest import config
 
 TESTS_DIR = 'gabbits'