diff --git a/magnum_ui/content/cluster_templates/urls.py b/magnum_ui/content/cluster_templates/urls.py
index 29d30e59..bdabefe1 100644
--- a/magnum_ui/content/cluster_templates/urls.py
+++ b/magnum_ui/content/cluster_templates/urls.py
@@ -13,10 +13,10 @@
 #    under the License.
 
 from django.conf.urls import url
-from magnum_ui.content.cluster_templates.views import IndexView
+from magnum_ui.content.cluster_templates import views
 
 
 urlpatterns = [
-    url(r'^[0-9a-f\-]{36}$', IndexView.as_view(), name='detail'),
-    url(r'^$', IndexView.as_view(), name='index'),
+    url(r'^[0-9a-f\-]{36}$', views.IndexView.as_view(), name='detail'),
+    url(r'^$', views.IndexView.as_view(), name='index'),
 ]
diff --git a/magnum_ui/content/clusters/urls.py b/magnum_ui/content/clusters/urls.py
index 00024499..1b284a8f 100644
--- a/magnum_ui/content/clusters/urls.py
+++ b/magnum_ui/content/clusters/urls.py
@@ -13,10 +13,10 @@
 #    under the License.
 
 from django.conf.urls import url
-from magnum_ui.content.clusters.views import IndexView
+from magnum_ui.content.clusters import views
 
 
 urlpatterns = [
-    url(r'^[0-9a-f\-]{36}$', IndexView.as_view(), name='detail'),
-    url(r'^$', IndexView.as_view(), name='index'),
+    url(r'^[0-9a-f\-]{36}$', views.IndexView.as_view(), name='detail'),
+    url(r'^$', views.IndexView.as_view(), name='index'),
 ]
diff --git a/magnum_ui/test/api_tests/rest_api_tests.py b/magnum_ui/test/api_tests/rest_api_tests.py
index 66bbc971..e3fcf71d 100644
--- a/magnum_ui/test/api_tests/rest_api_tests.py
+++ b/magnum_ui/test/api_tests/rest_api_tests.py
@@ -18,9 +18,9 @@ import mock
 from magnum_ui.api.rest import magnum
 from magnum_ui.test import test_data
 from openstack_dashboard.test import helpers as test
-from openstack_dashboard.test.test_data.utils import TestData
+from openstack_dashboard.test.test_data import utils
 
-TEST = TestData(test_data.data)
+TEST = utils.TestData(test_data.data)
 
 
 class MagnumRestTestCase(test.TestCase):