3 files changed, 5 insertions, 6 deletions
diff --git a/nova/tests/api_unittest.py b/nova/tests/api_unittest.py
index 9d072866c..d21ded75b 100644
--- a/nova/tests/api_unittest.py
+++ b/nova/tests/api_unittest.py
@@ -27,8 +27,7 @@ from twisted.internet import defer
 from nova import flags
 from nova import test
 from nova.auth import manager
-from nova.endpoint import api
-from nova.endpoint import cloud
+from nova.api.ec2 import cloud
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/tests/auth_unittest.py b/nova/tests/auth_unittest.py
index 0b404bfdc..b3b6800a1 100644
--- a/nova/tests/auth_unittest.py
+++ b/nova/tests/auth_unittest.py
@@ -26,7 +26,7 @@ from nova import crypto
 from nova import flags
 from nova import test
 from nova.auth import manager
-from nova.endpoint import cloud
+from nova.api.ec2 import cloud
 
 FLAGS = flags.FLAGS
 
diff --git a/nova/tests/cloud_unittest.py b/nova/tests/cloud_unittest.py
index 3501771cc..545cbaede 100644
--- a/nova/tests/cloud_unittest.py
+++ b/nova/tests/cloud_unittest.py
@@ -29,8 +29,8 @@ from nova import rpc
 from nova import test
 from nova.auth import manager
 from nova.compute import service
-from nova.endpoint import api
-from nova.endpoint import cloud
+from nova.api.ec2 import context
+from nova.api.ec2 import cloud
 
 
 FLAGS = flags.FLAGS
@@ -64,7 +64,7 @@ class CloudTestCase(test.BaseTestCase):
         except: pass
         admin = manager.AuthManager().get_user('admin')
         project = manager.AuthManager().create_project('proj', 'admin', 'proj')
-        self.context = api.APIRequestContext(handler=None,project=project,user=admin)
+        self.context = context.APIRequestContext(handler=None,project=project,user=admin)
 
     def tearDown(self):
         manager.AuthManager().delete_project('proj')