diff --git a/tests/test_filesystem.py b/tests/test_filesystem.py
index 4ede28a946..cddee77ff4 100644
--- a/tests/test_filesystem.py
+++ b/tests/test_filesystem.py
@@ -16,6 +16,7 @@
 import mock
 import os
 from os import path
+from osa_toolkit import filesystem as fs
 import sys
 import unittest
 
@@ -27,8 +28,6 @@ INV_DIR = 'inventory'
 
 sys.path.append(path.join(os.getcwd(), INV_DIR))
 
-from osa_toolkit import filesystem as fs
-
 TARGET_DIR = path.join(os.getcwd(), 'tests', 'inventory')
 USER_CONFIG_FILE = path.join(TARGET_DIR, 'openstack_user_config.yml')
 
diff --git a/tests/test_manage.py b/tests/test_manage.py
index f7591892a2..1a648563f0 100644
--- a/tests/test_manage.py
+++ b/tests/test_manage.py
@@ -14,13 +14,12 @@
 
 import os
 from os import path
+from osa_toolkit import manage as mi
 import test_inventory
 import unittest
 
 TARGET_DIR = path.join(os.getcwd(), 'tests', 'inventory')
 
-from osa_toolkit import manage as mi
-
 
 def setUpModule():
     test_inventory.make_config()