diff --git a/castellan/context.py b/castellan/context.py
deleted file mode 100644
index 7f3ca57f..00000000
--- a/castellan/context.py
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright  2011-2012 OpenStack LLC.
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from oslo_config import cfg
-from oslo_policy import policy
-from oslo_utils import uuidutils
-
-from castellan.openstack.common import local
-
-
-CONF = cfg.CONF
-
-
-class RequestContext(object):
-    """User security context object
-
-    Stores information about the security context under which the user
-    accesses the system, as well as additional request information.
-    """
-
-    def __init__(self, auth_token=None, user=None, project=None, roles=None,
-                 is_admin=False, read_only=False, show_deleted=False,
-                 owner_is_project=True, service_catalog=None,
-                 policy_enforcer=None):
-        self.auth_token = auth_token
-        self.user = user
-        self.project = project
-        self.roles = roles or []
-        self.read_only = read_only
-        self.owner_is_project = owner_is_project
-        self.request_id = uuidutils.generate_uuid()
-        self.service_catalog = service_catalog
-        self.policy_enforcer = policy_enforcer or policy.Enforcer(CONF)
-        self.is_admin = is_admin
-
-        if not hasattr(local.store, 'context'):
-            self.update_store()
-
-    def to_dict(self):
-        return {
-            'request_id': self.request_id,
-            'user': self.user,
-            'user_id': self.user,
-            'project': self.project,
-            'project_id': self.project,
-            'roles': self.roles,
-            'auth_token': self.auth_token,
-            'service_catalog': self.service_catalog,
-        }
-
-    @classmethod
-    def from_dict(cls, values):
-        return cls(**values)
-
-    def update_store(self):
-        local.store.context = self
-
-    @property
-    def owner(self):
-        """Return the owner to correlate with key."""
-        if self.owner_is_project:
-            return self.project
-        return self.user
diff --git a/castellan/tests/key_manager/test_mock_key_manager.py b/castellan/tests/key_manager/test_mock_key_manager.py
index 20762470..b8fb975c 100644
--- a/castellan/tests/key_manager/test_mock_key_manager.py
+++ b/castellan/tests/key_manager/test_mock_key_manager.py
@@ -20,8 +20,9 @@ Test cases for the mock key manager.
 import array
 import binascii
 
+from oslo_context import context
+
 from castellan.common import exception
-from castellan import context
 from castellan.key_manager import symmetric_key as sym_key
 from castellan.tests.key_manager import mock_key_manager as mock_key_mgr
 from castellan.tests.key_manager import test_key_manager as test_key_mgr
diff --git a/requirements.txt b/requirements.txt
index 0a541965..3e77b7ad 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,7 @@
 pbr>=0.6,!=0.7,<1.0
 Babel>=1.3
 oslo.config>=1.9.3,<1.10.0  # Apache-2.0
+oslo.context>=0.2.0                     # Apache-2.0
 oslo.log>=1.0.0,<1.1.0  # Apache-2.0
 oslo.policy>=0.3.1,<0.4.0  # Apache-2.0
 oslo.serialization>=1.4.0,<1.5.0               # Apache-2.0