diff --git a/ceilometer/collector/manager.py b/ceilometer/collector/manager.py
index 6586c4e23..b2052dac6 100644
--- a/ceilometer/collector/manager.py
+++ b/ceilometer/collector/manager.py
@@ -20,12 +20,12 @@ import functools
 import itertools
 import pkg_resources
 
-from nova import context
 from nova import manager
 
 from ceilometer import meter
 from ceilometer import publish
 from ceilometer import storage
+from ceilometer.openstack.common import context
 from ceilometer.openstack.common import cfg
 from ceilometer.openstack.common import log
 from ceilometer.openstack.common import timeutils
diff --git a/tests/compute/test_nova_notifier.py b/tests/compute/test_nova_notifier.py
index 2d1dcace2..8a47e6ee6 100644
--- a/tests/compute/test_nova_notifier.py
+++ b/tests/compute/test_nova_notifier.py
@@ -81,7 +81,7 @@ class TestNovaNotifier(base.TestCase):
         flags.FLAGS.compute_driver = 'nova.virt.fake.FakeDriver'
         flags.FLAGS.notification_driver = [nova_notifier.__name__]
         self.compute = importutils.import_object(flags.FLAGS.compute_manager)
-        self.context = context.RequestContext('admin', 'admin', is_admin=True)
+        self.context = context.get_admin_context()
         fake_network.set_stub_network_methods(self.stubs)
 
         self.instance = {"name": "instance-1",
diff --git a/tests/image/test_glance.py b/tests/image/test_glance.py
index 9f23217d3..6132244a9 100644
--- a/tests/image/test_glance.py
+++ b/tests/image/test_glance.py
@@ -91,7 +91,7 @@ class TestImagePollster(base.TestCase):
 
     def setUp(self):
         super(TestImagePollster, self).setUp()
-        self.context = context.RequestContext('admin', 'admin', is_admin=True)
+        self.context = context.get_admin_context()
         self.manager = manager.AgentManager()
         self.stubs.Set(glance._Base, 'iter_images',
                        self.fake_glance_iter_images)
diff --git a/tests/network/test_floatingip.py b/tests/network/test_floatingip.py
index b8b64da7f..a11eba467 100644
--- a/tests/network/test_floatingip.py
+++ b/tests/network/test_floatingip.py
@@ -19,11 +19,11 @@
 
 import mock
 
-from nova import context
 from nova import db
 
 from ceilometer.network import floatingip
 from ceilometer.central import manager
+from ceilometer.openstack.common import context
 from ceilometer.tests import base
 
 
@@ -31,7 +31,7 @@ class TestFloatingIPPollster(base.TestCase):
 
     def setUp(self):
         super(TestFloatingIPPollster, self).setUp()
-        self.context = context.RequestContext('admin', 'admin', is_admin=True)
+        self.context = context.get_admin_context()
         self.manager = manager.AgentManager()
         self.pollster = floatingip.FloatingIPPollster()
         self.stubs.Set(db, 'floating_ip_get_all', self.faux_get_ips)