diff --git a/nova/context.py b/nova/context.py
index 42fff61e8e5d..6f5910769520 100644
--- a/nova/context.py
+++ b/nova/context.py
@@ -204,21 +204,17 @@ class RequestContext(context.RequestContext):
 
     @classmethod
     def from_dict(cls, values):
-        return cls(
+        return super(RequestContext, cls).from_dict(
+            values,
             user_id=values.get('user_id'),
-            user=values.get('user'),
             project_id=values.get('project_id'),
-            tenant=values.get('tenant'),
-            is_admin=values.get('is_admin'),
+            # TODO(sdague): oslo.context has show_deleted, if
+            # possible, we should migrate to that in the future so we
+            # don't need to be different here.
             read_deleted=values.get('read_deleted', 'no'),
-            roles=values.get('roles'),
             remote_address=values.get('remote_address'),
             timestamp=values.get('timestamp'),
-            request_id=values.get('request_id'),
-            auth_token=values.get('auth_token'),
             quota_class=values.get('quota_class'),
-            user_name=values.get('user_name'),
-            project_name=values.get('project_name'),
             service_catalog=values.get('service_catalog'),
             instance_lock_checked=values.get('instance_lock_checked', False),
         )
diff --git a/nova/tests/unit/test_context.py b/nova/tests/unit/test_context.py
index bd48bc01c490..984b9c6c9fe2 100644
--- a/nova/tests/unit/test_context.py
+++ b/nova/tests/unit/test_context.py
@@ -198,66 +198,9 @@ class ContextTestCase(test.NoDBTestCase):
                            'user_id': 111,
                            'user_identity': '111 222 - - -',
                            'user_name': None}
-        self.assertEqual(expected_values, values2)
-
-    def test_convert_from_dict_to_dict_version_2_4_x(self):
-        # fake dict() created with oslo.context 2.4.x, Missing is_admin_project
-        # key
-        values = {'user': '111',
-                  'user_id': '111',
-                  'tenant': '222',
-                  'project_id': '222',
-                  'domain': None, 'project_domain': None,
-                  'auth_token': None,
-                  'resource_uuid': None, 'read_only': False,
-                  'user_identity': '111 222 - - -',
-                  'instance_lock_checked': False,
-                  'user_name': None, 'project_name': None,
-                  'timestamp': '2015-03-02T20:03:59.416299',
-                  'remote_address': None, 'quota_class': None,
-                  'is_admin': True,
-                  'service_catalog': [],
-                  'read_deleted': 'no', 'show_deleted': False,
-                  'roles': [],
-                  'request_id': 'req-956637ad-354a-4bc5-b969-66fd1cc00f50',
-                  'user_domain': None}
-        ctx = context.RequestContext.from_dict(values)
-        self.assertEqual('111', ctx.user)
-        self.assertEqual('222', ctx.tenant)
-        self.assertEqual('111', ctx.user_id)
-        self.assertEqual('222', ctx.project_id)
-        # to_dict() will add is_admin_project
-        values.update({'is_admin_project': True})
-        values2 = ctx.to_dict()
-        self.assertEqual(values, values2)
-
-    def test_convert_from_dict_then_to_dict(self):
-        values = {'user': '111',
-                  'user_id': '111',
-                  'tenant': '222',
-                  'project_id': '222',
-                  'domain': None, 'project_domain': None,
-                  'auth_token': None,
-                  'resource_uuid': None, 'read_only': False,
-                  'user_identity': '111 222 - - -',
-                  'instance_lock_checked': False,
-                  'user_name': None, 'project_name': None,
-                  'timestamp': '2015-03-02T20:03:59.416299',
-                  'remote_address': None, 'quota_class': None,
-                  'is_admin': True,
-                  'is_admin_project': True,
-                  'service_catalog': [],
-                  'read_deleted': 'no', 'show_deleted': False,
-                  'roles': [],
-                  'request_id': 'req-956637ad-354a-4bc5-b969-66fd1cc00f50',
-                  'user_domain': None}
-        ctx = context.RequestContext.from_dict(values)
-        self.assertEqual('111', ctx.user)
-        self.assertEqual('222', ctx.tenant)
-        self.assertEqual('111', ctx.user_id)
-        self.assertEqual('222', ctx.project_id)
-        values2 = ctx.to_dict()
-        self.assertEqual(values, values2)
+        for k, v in expected_values.items():
+            self.assertIn(k, values2)
+            self.assertEqual(values2[k], v)
 
     @mock.patch.object(context.policy, 'authorize')
     def test_can(self, mock_authorize):