diff --git a/tox.ini b/tox.ini
index 5f2f7fd..59dfe76 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,10 +26,14 @@ commands = coverage erase
 [tox:jenkins]
 downloadcache = ~/cache/pip
 
-# H302 - ignored because it interferes more than it helps, and uses
-#        suspect methods in its implementation anyway.
 # H405  multi line docstring summary not separated with an empty line
 [flake8]
-ignore = H302,H405
+ignore = H405
 show-source = True
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
+
+[hacking]
+import_exceptions =
+                    gettext.gettext,
+                    six.StringIO,
+                    tuskarclient.openstack.common.gettextutils._
diff --git a/tuskarclient/tests/v1/test_overclouds_shell.py b/tuskarclient/tests/v1/test_overclouds_shell.py
index d8e8e8b..6e57ac0 100644
--- a/tuskarclient/tests/v1/test_overclouds_shell.py
+++ b/tuskarclient/tests/v1/test_overclouds_shell.py
@@ -15,7 +15,7 @@ import six
 
 from tuskarclient.openstack.common.apiclient import exceptions
 import tuskarclient.tests.utils as tutils
-from tuskarclient.v1.overcloud_roles import OvercloudRole
+from tuskarclient.v1 import overcloud_roles
 from tuskarclient.v1 import overclouds_shell
 
 
@@ -196,7 +196,7 @@ class OvercloudRoleShellTest(BaseOvercloudShellTest):
     def test_create_roles(self, mock_print_detail):
         self.args.roles = ['foo=10']
         self.tuskar.overcloud_roles.list.return_value = [
-            OvercloudRole(None, {'name': 'foo', 'id': 1})
+            overcloud_roles.OvercloudRole(None, {'name': 'foo', 'id': 1})
         ]
 
         self.create(self.tuskar, self.args, outfile=self.outfile)
@@ -214,7 +214,7 @@ class OvercloudRoleShellTest(BaseOvercloudShellTest):
     def test_create_roles_duplicate(self, mock_print_detail):
         self.args.roles = ['foo=10', 'foo=20']
         self.tuskar.overcloud_roles.list.return_value = [
-            OvercloudRole(None, {'name': 'foo', 'id': 1})
+            overcloud_roles.OvercloudRole(None, {'name': 'foo', 'id': 1})
         ]
 
         self.assertRaises(
@@ -228,7 +228,7 @@ class OvercloudRoleShellTest(BaseOvercloudShellTest):
     def test_create_roles_invalid_structure(self, mock_print_detail):
         self.args.roles = ['foo=10', '120']
         self.tuskar.overcloud_roles.list.return_value = [
-            OvercloudRole(None, {'name': 'foo', 'id': 1})
+            overcloud_roles.OvercloudRole(None, {'name': 'foo', 'id': 1})
         ]
 
         self.assertRaises(
@@ -242,7 +242,7 @@ class OvercloudRoleShellTest(BaseOvercloudShellTest):
     def test_create_roles_multiple_equals(self, mock_print_detail):
         self.args.roles = ['foo=foo=0']
         self.tuskar.overcloud_roles.list.return_value = [
-            OvercloudRole(None, {'name': 'foo', 'id': 1})
+            overcloud_roles.OvercloudRole(None, {'name': 'foo', 'id': 1})
         ]
 
         self.assertRaises(
@@ -256,7 +256,7 @@ class OvercloudRoleShellTest(BaseOvercloudShellTest):
     def test_create_roles_with_id(self, mock_print_detail):
         self.args.roles = ['12345=10']
         self.tuskar.overcloud_roles.list.return_value = [
-            OvercloudRole(None, {'name': 'foo', 'id': 1})
+            overcloud_roles.OvercloudRole(None, {'name': 'foo', 'id': 1})
         ]
 
         self.create(self.tuskar, self.args, outfile=self.outfile)