diff --git a/nova/tests/test_access.py b/nova/tests/test_access.py
index 6069c5d7..39558b1c 100644
--- a/nova/tests/test_access.py
+++ b/nova/tests/test_access.py
@@ -41,7 +41,7 @@ class FakeApiRequest(object):
 class AccessTestCase(test.TestCase):
     def _env_for(self, ctxt, action):
         env = {}
-        env['ec2.context'] = ctxt
+        env['nova.context'] = ctxt
         env['ec2.request'] = FakeApiRequest(action)
         return env
 
diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py
index 978e43ab..292f9d66 100644
--- a/nova/tests/test_api.py
+++ b/nova/tests/test_api.py
@@ -30,6 +30,7 @@ import webob
 from nova import context
 from nova import exception
 from nova import test
+from nova import wsgi
 from nova.api import ec2
 from nova.api.ec2 import apirequest
 from nova.api.ec2 import cloud
@@ -195,7 +196,7 @@ class ApiEc2TestCase(test.TestCase):
         # NOTE(vish): skipping the Authorizer
         roles = ['sysadmin', 'netadmin']
         ctxt = context.RequestContext('fake', 'fake', roles=roles)
-        self.app = ec2.InjectContext(ctxt,
+        self.app = wsgi.InjectContext(ctxt,
                 ec2.Requestify(ec2.Authorizer(ec2.Executor()),
                                'nova.api.ec2.cloud.CloudController'))