diff --git a/openstack_dashboard/test/test_data/ceilometer_data.py b/openstack_dashboard/test/test_data/ceilometer_data.py
index 01a7f94653..3b8df5eb20 100644
--- a/openstack_dashboard/test/test_data/ceilometer_data.py
+++ b/openstack_dashboard/test/test_data/ceilometer_data.py
@@ -55,9 +55,9 @@ def data(TEST):
                  'project_id': '2',
                  'enabled': True,
                  'domain_id': "2"}
-    TEST.ceilometer_users.add(users.User(users.UserManager(None),
+    TEST.ceilometer_users.add(users.User(None,
                                          ceilometer_user_dict1))
-    TEST.ceilometer_users.add(users.User(users.UserManager(None),
+    TEST.ceilometer_users.add(users.User(None,
                                          ceilometer_user_dict2))
 
     #tenants
diff --git a/openstack_dashboard/test/test_data/keystone_data.py b/openstack_dashboard/test/test_data/keystone_data.py
index 9515b94fda..b8b794b6ee 100644
--- a/openstack_dashboard/test/test_data/keystone_data.py
+++ b/openstack_dashboard/test/test_data/keystone_data.py
@@ -166,7 +166,7 @@ def data(TEST):
                  'project_id': '1',
                  'enabled': True,
                  'domain_id': "1"}
-    user = users.User(users.UserManager(None), user_dict)
+    user = users.User(None, user_dict)
     user_dict = {'id': "2",
                  'name': 'user_two',
                  'email': 'two@example.com',
@@ -175,7 +175,7 @@ def data(TEST):
                  'project_id': '1',
                  'enabled': True,
                  'domain_id': "1"}
-    user2 = users.User(users.UserManager(None), user_dict)
+    user2 = users.User(None, user_dict)
     user_dict = {'id': "3",
                  'name': 'user_three',
                  'email': 'three@example.com',
@@ -184,7 +184,7 @@ def data(TEST):
                  'project_id': '1',
                  'enabled': True,
                  'domain_id': "1"}
-    user3 = users.User(users.UserManager(None), user_dict)
+    user3 = users.User(None, user_dict)
     user_dict = {'id': "4",
                  'name': 'user_four',
                  'email': 'four@example.com',
@@ -193,7 +193,7 @@ def data(TEST):
                  'project_id': '2',
                  'enabled': True,
                  'domain_id': "2"}
-    user4 = users.User(users.UserManager(None), user_dict)
+    user4 = users.User(None, user_dict)
     TEST.users.add(user, user2, user3, user4)
     TEST.user = user  # Your "current" user
     TEST.user.service_catalog = SERVICE_CATALOG