diff --git a/src/rotest/cli/client.py b/src/rotest/cli/client.py
index cd5f2984..adf3b335 100644
--- a/src/rotest/cli/client.py
+++ b/src/rotest/cli/client.py
@@ -53,11 +53,10 @@
 import pkg_resources
 from attrdict import AttrDict
 
-if not hasattr(django, 'apps'):  # noqa
-    django.setup()
+django.setup()  # noqa
 
-from rotest.common import core_log
 from rotest.core.suite import TestSuite
+from rotest.common import core_log
 from rotest.core.filter import match_tags
 from rotest.core.utils.common import print_test_hierarchy
 from rotest.core.result.result import get_result_handlers
diff --git a/src/rotest/cli/main.py b/src/rotest/cli/main.py
index ab8671ae..a05c1793 100644
--- a/src/rotest/cli/main.py
+++ b/src/rotest/cli/main.py
@@ -4,7 +4,8 @@
 import sys
 
 import django
-django.setup()  # noqa
+if not hasattr(django, 'apps'):  # noqa
+    django.setup()
 
 from rotest.cli.client import main as run
 from rotest.cli.server import start_server