diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3c2d620..bef6c67 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -29,6 +29,8 @@ import sys
 
 import django
 
+import neutron_fwaas_dashboard.version
+
 PROJECT = 'neutron-fwaas-dashboard'
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 ROOT = os.path.abspath(os.path.join(BASE_DIR, "..", ".."))
@@ -39,8 +41,6 @@ sys.path.insert(0, ROOT)
 os.environ.setdefault('DJANGO_SETTINGS_MODULE',
                       'neutron_fwaas_dashboard.test.settings')
 
-import neutron_fwaas_dashboard.version
-
 django.setup()
 
 
diff --git a/neutron_fwaas_dashboard/test/settings.py b/neutron_fwaas_dashboard/test/settings.py
index 76e2c9b..9e9b374 100644
--- a/neutron_fwaas_dashboard/test/settings.py
+++ b/neutron_fwaas_dashboard/test/settings.py
@@ -14,17 +14,17 @@
 from horizon.test.settings import *  # noqa
 from openstack_dashboard.test.settings import *  # noqa
 
+import openstack_dashboard.enabled
+from openstack_dashboard.utils import settings
+
+import neutron_fwaas_dashboard.enabled
+
 # pop these keys to avoid log warnings about deprecation
 # update_dashboards will populate them anyway
 HORIZON_CONFIG.pop('dashboards', None)
 HORIZON_CONFIG.pop('default_dashboard', None)
 
 # Update the dashboards with neutron_fwaas_dashboard
-import openstack_dashboard.enabled
-from openstack_dashboard.utils import settings
-
-import neutron_fwaas_dashboard.enabled
-
 settings.update_dashboards(
     [
         openstack_dashboard.enabled,