diff --git a/mistralclient/tests/unit/v2/test_cli_action_execs.py b/mistralclient/tests/unit/v2/test_cli_action_execs.py
index 1434a7a8..fe1a1e87 100644
--- a/mistralclient/tests/unit/v2/test_cli_action_execs.py
+++ b/mistralclient/tests/unit/v2/test_cli_action_execs.py
@@ -18,7 +18,7 @@ import copy
 import json
 import sys
 
-from six import StringIO
+import six
 
 import mock
 
@@ -160,7 +160,7 @@ class TestCLIActionExecutions(base.BaseCommandTest):
 
         # Redirect the stderr so it doesn't show during tox
         _stderr = sys.stderr
-        sys.stderr = StringIO()
+        sys.stderr = six.StringIO()
 
         for state in states:
             self.assertRaises(
diff --git a/mistralclient/tests/unit/v2/test_cli_tasks.py b/mistralclient/tests/unit/v2/test_cli_tasks.py
index 0d2e10f5..f3bea89f 100644
--- a/mistralclient/tests/unit/v2/test_cli_tasks.py
+++ b/mistralclient/tests/unit/v2/test_cli_tasks.py
@@ -21,7 +21,6 @@ import mock
 
 from mistralclient.api.v2 import tasks
 from mistralclient.commands.v2 import tasks as task_cmd
-from mistralclient.commands.v2.tasks import TaskFormatter
 from mistralclient.tests.unit import base
 
 TASK_DICT = {
@@ -62,7 +61,7 @@ class TestCLITasksV2(base.BaseCommandTest):
         self.assertEqual([EXPECTED_TASK_RESULT], result[1])
         self.assertEqual(
             self.client.tasks.list.call_args[1]["fields"],
-            TaskFormatter.COLUMN_FIELD_NAMES
+            task_cmd.TaskFormatter.COLUMN_FIELD_NAMES
         )
 
     def test_list_with_workflow_execution(self):