diff --git a/.gitmodules b/.gitmodules
index c74339999..dfc386510 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "plugin_test/fuel-qa"]
 	path = plugin_test/fuel-qa
 	url = https://github.com/openstack/fuel-qa
-	branch = stable/8.0
+	branch = stable/mitaka
diff --git a/plugin_test/helpers/contrail_client.py b/plugin_test/helpers/contrail_client.py
index 2d1ff6a54..7ee442179 100644
--- a/plugin_test/helpers/contrail_client.py
+++ b/plugin_test/helpers/contrail_client.py
@@ -15,7 +15,8 @@ under the License.
 from fuelweb_test import logwrap
 from fuelweb_test import logger
 from fuelweb_test.helpers.decorators import json_parse
-from fuelweb_test.helpers.http import HTTPClient
+from keystoneauth1.identity.v2 import Password
+from keystoneauth1.session import Session
 from fuelweb_test.settings import KEYSTONE_CREDS
 from fuelweb_test.settings import PATH_TO_CERT
 from fuelweb_test.settings import VERIFY_SSL
@@ -39,9 +40,12 @@ class ContrailClient(object):
             insecure = not VERIFY_SSL
             credentials.update({'ca_cert': PATH_TO_CERT, 'insecure': insecure})
         logger.info('Initiate Contrail client with url %s', url)
-        self._client = HTTPClient(url=url, keystone_url=self.keystone_url,
-                                  credentials=credentials,
-                                  **kwargs)
+        auth = Password(
+                auth_url=self.keystone_url,
+                username=KEYSTONE_CREDS['username'],
+                password=KEYSTONE_CREDS['password'],
+                tenant_name=KEYSTONE_CREDS['tenant_name'])
+        self._client = Session(auth=auth, verify=False)
         super(ContrailClient, self).__init__()
 
     @property
diff --git a/plugin_test/helpers/plugin.py b/plugin_test/helpers/plugin.py
index 5bb32e528..aea0147c3 100644
--- a/plugin_test/helpers/plugin.py
+++ b/plugin_test/helpers/plugin.py
@@ -21,7 +21,7 @@ from devops.helpers.helpers import tcp_ping
 from devops.helpers.helpers import wait
 
 from fuelweb_test import logger
-from fuelweb_test.helpers import checkers
+from fuelweb_test.helpers import utils
 from fuelweb_test.settings import CONTRAIL_PLUGIN_PATH
 from proboscis.asserts import assert_true
 from settings import VSRX_TEMPLATE_PATH
@@ -79,13 +79,13 @@ def prepare_contrail_plugin(obj, slaves=None, snapshot_name=None, options={}):
     obj.env.revert_snapshot(snapshot_name)
 
     # copy plugin to the master node
-    checkers.upload_tarball(
-        obj.env.d_env.get_admin_remote(),
+    utils.upload_tarball(
+        obj.ssh_manager.admin_ip,
         CONTRAIL_PLUGIN_PATH, '/var')
 
     # install plugin
-    checkers.install_plugin_check_code(
-        obj.env.d_env.get_admin_remote(),
+    utils.install_plugin_check_code(
+        obj.ssh_manager.admin_ip,
         plugin=os.path.basename(CONTRAIL_PLUGIN_PATH))
     # FIXME: when opencontrail is supported
     # FIXME: remove the following line from 'or True'
diff --git a/plugin_test/tests/test_smoke_bvt.py b/plugin_test/tests/test_smoke_bvt.py
index 9077ab5c2..290b99c99 100644
--- a/plugin_test/tests/test_smoke_bvt.py
+++ b/plugin_test/tests/test_smoke_bvt.py
@@ -28,6 +28,7 @@ from fuelweb_test.tests.base_test_case import TestBasic
 from helpers import plugin
 from helpers import openstack
 from helpers.settings import CONTRAIL_PLUGIN_VERSION
+from helpers.settings import OSTF_RUN_TIMEOUT
 from tests.test_contrail_check import TestContrailCheck
 
 
@@ -268,4 +269,5 @@ class ContrailPlugin(TestBasic):
 
         self.show_step(10)
         if vsrx_setup_result:
-            self.fuel_web.run_ostf(cluster_id=self.cluster_id)
+            self.fuel_web.run_ostf(cluster_id=self.cluster_id,
+                                   timeout=OSTF_RUN_TIMEOUT)