diff --git a/zun/common/context.py b/zun/common/context.py
index 190e20454..ba1356e9c 100644
--- a/zun/common/context.py
+++ b/zun/common/context.py
@@ -40,7 +40,8 @@ class RequestContext(context.RequestContext):
                                              is_admin=is_admin,
                                              read_only=read_only,
                                              show_deleted=show_deleted,
-                                             request_id=request_id)
+                                             request_id=request_id,
+                                             roles=roles)
 
         self.user_name = user_name
         self.user_id = user_id
@@ -50,7 +51,6 @@ class RequestContext(context.RequestContext):
         self.domain_name = domain_name
         self.user_domain_id = user_domain_id
         self.user_domain_name = user_domain_name
-        self.roles = roles
         self.auth_url = auth_url
         self.auth_token_info = auth_token_info
         self.trust_id = trust_id
diff --git a/zun/tests/unit/common/test_context.py b/zun/tests/unit/common/test_context.py
new file mode 100644
index 000000000..60d84bb15
--- /dev/null
+++ b/zun/tests/unit/common/test_context.py
@@ -0,0 +1,98 @@
+#    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 zun.common import context as zun_context
+from zun.tests import base
+
+
+class ContextTestCase(base.TestCase):
+
+    def _create_context(self, is_admin=True, roles=None):
+        return zun_context.RequestContext(auth_token='auth_token1',
+                                          auth_url='auth_url1',
+                                          domain_id='domain_id1',
+                                          domain_name='domain_name1',
+                                          user_name='user1',
+                                          user_id='user-id1',
+                                          project_name='tenant1',
+                                          project_id='tenant-id1',
+                                          roles=roles,
+                                          is_admin=is_admin,
+                                          read_only=True,
+                                          show_deleted=True,
+                                          request_id='request_id1',
+                                          trust_id='trust_id1',
+                                          auth_token_info='token_info1')
+
+    def test_context(self):
+        ctx = self._create_context()
+
+        self.assertEqual("auth_token1", ctx.auth_token)
+        self.assertEqual("auth_url1", ctx.auth_url)
+        self.assertEqual("domain_id1", ctx.domain_id)
+        self.assertEqual("domain_name1", ctx.domain_name)
+        self.assertEqual("user1", ctx.user_name)
+        self.assertEqual("user-id1", ctx.user_id)
+        self.assertEqual("tenant1", ctx.project_name)
+        self.assertEqual("tenant-id1", ctx.project_id)
+        self.assertEqual([], ctx.roles)
+        self.assertTrue(ctx.is_admin)
+        self.assertTrue(ctx.read_only)
+        self.assertTrue(ctx.show_deleted)
+        self.assertEqual("request_id1", ctx.request_id)
+        self.assertEqual("trust_id1", ctx.trust_id)
+        self.assertEqual("token_info1", ctx.auth_token_info)
+
+    def test_context_with_roles(self):
+        ctx = self._create_context(roles=['admin', 'service'])
+
+        self.assertEqual("auth_token1", ctx.auth_token)
+        self.assertEqual("auth_url1", ctx.auth_url)
+        self.assertEqual("domain_id1", ctx.domain_id)
+        self.assertEqual("domain_name1", ctx.domain_name)
+        self.assertEqual("user1", ctx.user_name)
+        self.assertEqual("user-id1", ctx.user_id)
+        self.assertEqual("tenant1", ctx.project_name)
+        self.assertEqual("tenant-id1", ctx.project_id)
+        for role in ctx.roles:
+            self.assertIn(role, ['admin', 'service'])
+        self.assertTrue(ctx.is_admin)
+        self.assertTrue(ctx.read_only)
+        self.assertTrue(ctx.show_deleted)
+        self.assertEqual("request_id1", ctx.request_id)
+        self.assertEqual("trust_id1", ctx.trust_id)
+        self.assertEqual("token_info1", ctx.auth_token_info)
+
+    def test_to_dict_from_dict(self):
+        ctx = self._create_context()
+        ctx2 = zun_context.RequestContext.from_dict(ctx.to_dict())
+
+        self.assertEqual(ctx.auth_token, ctx2.auth_token)
+        self.assertEqual(ctx.auth_url, ctx2.auth_url)
+        self.assertEqual(ctx.domain_id, ctx2.domain_id)
+        self.assertEqual(ctx.domain_name, ctx2.domain_name)
+        self.assertEqual(ctx.user_name, ctx2.user_name)
+        self.assertEqual(ctx.user_id, ctx2.user_id)
+        self.assertEqual(ctx.tenant, ctx2.tenant)
+        self.assertEqual(ctx.project_name, ctx2.project_name)
+        self.assertEqual(ctx.project_id, ctx2.project_id)
+        self.assertEqual(ctx.is_admin, ctx2.is_admin)
+        self.assertEqual(ctx.read_only, ctx2.read_only)
+        self.assertEqual(ctx.roles, ctx2.roles)
+        self.assertEqual(ctx.show_deleted, ctx2.show_deleted)
+        self.assertEqual(ctx.request_id, ctx2.request_id)
+        self.assertEqual(ctx.trust_id, ctx2.trust_id)
+        self.assertEqual(ctx.auth_token_info, ctx2.auth_token_info)
+
+    def test_request_context_sets_is_admin(self):
+        ctxt = zun_context.get_admin_context()
+        self.assertTrue(ctxt.is_admin)