diff --git a/heat_tempest_plugin/common/test.py b/heat_tempest_plugin/common/test.py
index 7db874b..d719ad0 100644
--- a/heat_tempest_plugin/common/test.py
+++ b/heat_tempest_plugin/common/test.py
@@ -73,7 +73,8 @@
 
     The decorated test will be skipped when convergence is disabled.
     '''
-    convergence_enabled = config.CONF.heat_plugin.convergence_engine_enabled
+    plugin = config.CONF.orchestration_plugin
+    convergence_enabled = plugin.convergence_engine_enabled
     skipper = testtools.skipUnless(convergence_enabled,
                                    "Convergence-only tests are disabled")
     return skipper(test_method)
diff --git a/heat_tempest_plugin/tests/functional/test_simultaneous_update.py b/heat_tempest_plugin/tests/functional/test_simultaneous_update.py
index 0c562c0..3cfbeaa 100644
--- a/heat_tempest_plugin/tests/functional/test_simultaneous_update.py
+++ b/heat_tempest_plugin/tests/functional/test_simultaneous_update.py
@@ -14,8 +14,8 @@
 import copy
 import time
 
-from heat_integrationtests.common import test
-from heat_integrationtests.functional import functional_base
+from heat_tempest_plugin.common import test
+from heat_tempest_plugin.tests.functional import functional_base
 
 _test_template = {
     'heat_template_version': 'pike',