diff --git a/nova/tests/unit/api/test_auth.py b/nova/tests/unit/api/test_auth.py
index 18b48d949450..9c6d2cf37bfc 100644
--- a/nova/tests/unit/api/test_auth.py
+++ b/nova/tests/unit/api/test_auth.py
@@ -52,21 +52,8 @@ class TestNovaKeystoneContextMiddleware(test.NoDBTestCase):
         self.assertEqual(response.status, '200 OK')
         self.assertEqual(self.context.user_id, 'testuserid')
 
-    def test_user_only(self):
-        self.request.headers['X_USER'] = 'testuser'
-        response = self.request.get_response(self.middleware)
-        self.assertEqual(response.status, '200 OK')
-        self.assertEqual(self.context.user_id, 'testuser')
-
-    def test_user_id_trumps_user(self):
-        self.request.headers['X_USER_ID'] = 'testuserid'
-        self.request.headers['X_USER'] = 'testuser'
-        response = self.request.get_response(self.middleware)
-        self.assertEqual(response.status, '200 OK')
-        self.assertEqual(self.context.user_id, 'testuserid')
-
     def test_invalid_service_catalog(self):
-        self.request.headers['X_USER'] = 'testuser'
+        self.request.headers['X_USER_ID'] = 'testuser'
         self.request.headers['X_SERVICE_CATALOG'] = "bad json"
         response = self.request.get_response(self.middleware)
         self.assertEqual(response.status, '500 Internal Server Error')
@@ -98,7 +85,7 @@ class TestKeystoneMiddlewareRoles(test.NoDBTestCase):
 
         self.middleware = nova.api.auth.NovaKeystoneContext(role_check_app)
         self.request = webob.Request.blank('/')
-        self.request.headers['X_USER'] = 'testuser'
+        self.request.headers['X_USER_ID'] = 'testuser'
         self.request.headers['X_TENANT_ID'] = 'testtenantid'
         self.request.headers['X_AUTH_TOKEN'] = 'testauthtoken'
         self.request.headers['X_SERVICE_CATALOG'] = jsonutils.dumps({})