diff --git a/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_ec2_instance_mysql.py b/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_ec2_instance_mysql.py
index 2604c655..47459aa2 100644
--- a/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_ec2_instance_mysql.py
+++ b/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_ec2_instance_mysql.py
@@ -14,7 +14,7 @@
 
 import tempest.cloudscaling.thirdparty.scenario.aws_compat.base as aws_base
 import tempest.cloudscaling.utils as utils
-from tempest.common.utils.linux import remote_client
+from tempest.lib.common.utils.linux import remote_client
 from tempest import test
 from tempest.thirdparty.boto.utils import wait as boto_wait
 
diff --git a/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_ec2_unixbench.py b/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_ec2_unixbench.py
index 34b4e2d0..c30f7f89 100644
--- a/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_ec2_unixbench.py
+++ b/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_ec2_unixbench.py
@@ -16,7 +16,7 @@ from testtools import content as test_content
 
 import tempest.cloudscaling.base as base
 import tempest.cloudscaling.thirdparty.scenario.aws_compat.base as aws_base
-from tempest.common.utils.linux import remote_client
+from tempest.lib.common.utils.linux import remote_client
 from tempest import test
 
 import logging
diff --git a/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_ec2_volume_benchmark.py b/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_ec2_volume_benchmark.py
index c1fa5043..82a1334a 100644
--- a/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_ec2_volume_benchmark.py
+++ b/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_ec2_volume_benchmark.py
@@ -19,7 +19,7 @@ from testtools import content as test_content
 import tempest.cloudscaling.base as base
 import tempest.cloudscaling.thirdparty.scenario.aws_compat.base as aws_base
 import tempest.cloudscaling.utils as utils
-from tempest.common.utils.linux import remote_client
+from tempest.lib.common.utils.linux import remote_client
 from tempest import test
 from tempest.thirdparty.boto.utils import wait as boto_wait
 
diff --git a/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_behavior.py b/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_behavior.py
index 6b10409b..412df84e 100644
--- a/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_behavior.py
+++ b/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_behavior.py
@@ -19,7 +19,7 @@ import netaddr
 
 from tempest.cloudscaling import base
 import tempest.cloudscaling.thirdparty.scenario.aws_compat.base as aws_base
-from tempest.common.utils.linux import remote_client
+from tempest.lib.common.utils.linux import remote_client
 from tempest import test
 from tempest.thirdparty.boto.utils import wait as boto_wait
 
diff --git a/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_benchmark.py b/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_benchmark.py
index 5f972e7d..ed275785 100644
--- a/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_benchmark.py
+++ b/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_benchmark.py
@@ -18,8 +18,8 @@ from testtools import content as test_content
 
 from tempest.cloudscaling import base
 import tempest.cloudscaling.thirdparty.scenario.aws_compat.base as aws_base
-from tempest.common.utils.linux import remote_client
 from tempest import exceptions
+from tempest.lib.common.utils.linux import remote_client
 from tempest import test
 
 import logging
diff --git a/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_nat_scenario.py b/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_nat_scenario.py
index f755fa5e..18b9987f 100644
--- a/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_nat_scenario.py
+++ b/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_nat_scenario.py
@@ -16,8 +16,8 @@ from boto.ec2 import networkinterface
 import netaddr
 
 import tempest.cloudscaling.thirdparty.scenario.aws_compat.base as aws_base
-from tempest.common.utils.linux import remote_client
 from tempest.lib.common.utils import data_utils
+from tempest.lib.common.utils.linux import remote_client
 from tempest import test
 
 import logging
diff --git a/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_scenario.py b/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_scenario.py
index 7a24bb40..792fa11a 100644
--- a/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_scenario.py
+++ b/ec2api/tests/functional/obsolete/thirdparty/scenario/aws_compat/test_vpc_scenario.py
@@ -15,8 +15,8 @@
 import netaddr
 
 import tempest.cloudscaling.thirdparty.scenario.aws_compat.base as aws_base
-from tempest.common.utils.linux import remote_client
 from tempest.lib.common.utils import data_utils
+from tempest.lib.common.utils.linux import remote_client
 from tempest import test
 
 import logging