diff --git a/src/rotest/cli/client.py b/src/rotest/cli/client.py
index 40892cb8..2d8a539d 100644
--- a/src/rotest/cli/client.py
+++ b/src/rotest/cli/client.py
@@ -41,11 +41,11 @@
 from __future__ import print_function
 import sys
 import inspect
-import pkg_resources
 from itertools import chain
 
 import docopt
 import django
+import pkg_resources
 from attrdict import AttrDict
 
 from rotest.core import TestSuite
diff --git a/src/rotest/cli/server.py b/src/rotest/cli/server.py
index 92c1b40f..dacf4732 100644
--- a/src/rotest/cli/server.py
+++ b/src/rotest/cli/server.py
@@ -11,7 +11,6 @@
     -D, --daemon                Run as a background process.
 """
 from __future__ import print_function
-import os
 import sys
 import subprocess