diff --git a/nova/tests/fixtures.py b/nova/tests/fixtures.py
index c332789b9..a58327dd6 100644
--- a/nova/tests/fixtures.py
+++ b/nova/tests/fixtures.py
@@ -30,7 +30,6 @@ from oslo_config import cfg
 from oslo_db.sqlalchemy import enginefacade
 import oslo_messaging as messaging
 from oslo_messaging import conffixture as messaging_conffixture
-import six
 
 from nova.api.openstack.placement import deploy as placement_deploy
 from nova.compute import rpcapi as compute_rpcapi
@@ -657,7 +656,7 @@ class ConfPatcher(fixtures.Fixture):
 
     def setUp(self):
         super(ConfPatcher, self).setUp()
-        for k, v in six.iteritems(self.args):
+        for k, v in self.args.items():
             self.addCleanup(CONF.clear_override, k, self.group)
             CONF.set_override(k, v, self.group)
 
diff --git a/nova/tests/unit/policy_fixture.py b/nova/tests/unit/policy_fixture.py
index 5f917ac60..9c9badb1a 100644
--- a/nova/tests/unit/policy_fixture.py
+++ b/nova/tests/unit/policy_fixture.py
@@ -17,7 +17,6 @@ import os
 import fixtures
 from oslo_policy import policy as oslo_policy
 from oslo_serialization import jsonutils
-import six
 
 import nova.conf
 from nova.conf import paths
@@ -124,7 +123,7 @@ class RoleBasedPolicyFixture(RealPolicyFixture):
         self.add_missing_default_rules(policy)
 
         # Convert all actions to require specified role
-        for action, rule in six.iteritems(policy):
+        for action in policy:
             policy[action] = 'role:%s' % self.role
 
         self.policy_dir = self.useFixture(fixtures.TempDir())