diff --git a/nova/tests/unit/api/openstack/compute/test_console_output.py b/nova/tests/unit/api/openstack/compute/test_console_output.py
index 30f7cf405e..1a76a445fc 100644
--- a/nova/tests/unit/api/openstack/compute/test_console_output.py
+++ b/nova/tests/unit/api/openstack/compute/test_console_output.py
@@ -149,24 +149,3 @@ class ConsoleOutputExtensionTestV21(test.NoDBTestCase):
     def test_get_console_output_not_available(self, mock_get_console_output):
         body = {'os-getConsoleOutput': {}}
         self._check_console_output_failure(webob.exc.HTTPNotFound, body)
-
-
-class ConsoleOutputPolicyEnforcementV21(test.NoDBTestCase):
-
-    def setUp(self):
-        super(ConsoleOutputPolicyEnforcementV21, self).setUp()
-        self.controller = console_output_v21.ConsoleOutputController()
-        self.stub_out('nova.compute.api.API.get', fake_get)
-
-    def test_get_console_output_policy_failed(self):
-        rule_name = "os_compute_api:os-console-output"
-        self.policy.set_rules({rule_name: "project:non_fake"})
-        req = fakes.HTTPRequest.blank('')
-        body = {'os-getConsoleOutput': {}}
-        exc = self.assertRaises(
-            exception.PolicyNotAuthorized,
-            self.controller.get_console_output, req, fakes.FAKE_UUID,
-            body=body)
-        self.assertEqual(
-            "Policy doesn't allow %s to be performed." % rule_name,
-            exc.format_message())
diff --git a/nova/tests/unit/policies/test_console_output.py b/nova/tests/unit/policies/test_console_output.py
new file mode 100644
index 0000000000..db2039b4fc
--- /dev/null
+++ b/nova/tests/unit/policies/test_console_output.py
@@ -0,0 +1,84 @@
+#    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.
+
+import fixtures
+import mock
+from oslo_utils.fixture import uuidsentinel as uuids
+from oslo_utils import timeutils
+
+from nova.api.openstack.compute import console_output
+from nova.compute import vm_states
+from nova.tests.unit.api.openstack import fakes
+from nova.tests.unit import fake_instance
+from nova.tests.unit.policies import base
+
+
+class ConsoleOutputPolicyTest(base.BasePolicyTest):
+    """Test Console Output APIs policies with all possible context.
+
+    This class defines the set of context with different roles
+    which are allowed and not allowed to pass the policy checks.
+    With those set of context, it will call the API operation and
+    verify the expected behaviour.
+    """
+
+    def setUp(self):
+        super(ConsoleOutputPolicyTest, self).setUp()
+        self.controller = console_output.ConsoleOutputController()
+        self.req = fakes.HTTPRequest.blank('')
+        self.mock_get = self.useFixture(
+            fixtures.MockPatch('nova.api.openstack.common.get_instance')).mock
+        uuid = uuids.fake_id
+        self.instance = fake_instance.fake_instance_obj(
+                self.project_member_context, project_id=self.project_id,
+                id=1, uuid=uuid, vm_state=vm_states.ACTIVE,
+                task_state=None, launched_at=timeutils.utcnow())
+        self.mock_get.return_value = self.instance
+        # Check that admin or owner is able to get the server console.
+        self.admin_authorized_contexts = [
+            self.legacy_admin_context, self.system_admin_context,
+            self.project_admin_context, self.project_member_context,
+            self.project_reader_context, self.project_foo_context
+        ]
+        # Check that non-admin and non-owner is not able to get the server
+        # console.
+        self.admin_unauthorized_contexts = [
+            self.system_member_context, self.system_reader_context,
+            self.system_foo_context,
+            self.other_project_member_context
+        ]
+
+    @mock.patch('nova.compute.api.API.get_console_output')
+    def test_console_output_policy(self, mock_console):
+        mock_console.return_value = '\n'.join([str(i) for i in range(2)])
+        rule_name = "os_compute_api:os-console-output"
+        self.common_policy_check(self.admin_authorized_contexts,
+                                 self.admin_unauthorized_contexts,
+                                 rule_name, self.controller.get_console_output,
+                                 self.req, self.instance.uuid,
+                                 body={'os-getConsoleOutput': {}})
+
+
+class ConsoleOutputScopeTypePolicyTest(ConsoleOutputPolicyTest):
+    """Test Console Output APIs policies with system scope enabled.
+
+    This class set the nova.conf [oslo_policy] enforce_scope to True
+    so that we can switch on the scope checking on oslo policy side.
+    It defines the set of context with scopped token
+    which are allowed and not allowed to pass the policy checks.
+    With those set of context, it will run the API operation and
+    verify the expected behaviour.
+    """
+
+    def setUp(self):
+        super(ConsoleOutputScopeTypePolicyTest, self).setUp()
+        self.flags(enforce_scope=True, group="oslo_policy")