diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 40559f2..119e244 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -21,7 +21,7 @@ function configure_heat_dashboard {
     # NOTE: If locale directory does not exist, compilemessages will fail,
     # so check for an existence of locale directory is required.
     if [ -d ${HEAT_DASHBOARD_DIR}/heat_dashboard/locale ]; then
-        (cd ${HEAT_DASHBOARD_DIR}/heat_dashboard; DJANGO_SETTINGS_MODULE=openstack_dashboard.settings ../manage.py compilemessages)
+        (cd ${HEAT_DASHBOARD_DIR}/heat_dashboard; DJANGO_SETTINGS_MODULE=openstack_dashboard.settings $PYTHON ../manage.py compilemessages)
     fi
 }
 
diff --git a/heat_dashboard/test/settings.py b/heat_dashboard/test/settings.py
index 23e9093..065eb17 100644
--- a/heat_dashboard/test/settings.py
+++ b/heat_dashboard/test/settings.py
@@ -13,6 +13,7 @@
 
 # Default to Horizons test settings to avoid any missing keys
 import heat_dashboard.enabled
+import openstack_dashboard.enabled
 
 from openstack_dashboard.test.settings import *  # noqa: F403,H303
 
diff --git a/setup.cfg b/setup.cfg
index 81404ed..a0c8ed2 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,6 +18,7 @@ classifier =
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.3
     Programming Language :: Python :: 3.4
+    Programming Language :: Python :: 3.5
 
 [files]
 packages =