diff --git a/nova/tests/unit/compute/test_compute.py b/nova/tests/unit/compute/test_compute.py
index 8533f177e533..3b43d2c0a9a5 100644
--- a/nova/tests/unit/compute/test_compute.py
+++ b/nova/tests/unit/compute/test_compute.py
@@ -8612,7 +8612,7 @@ class ComputeAPITestCase(BaseTestCase):
     def test_populate_instance_for_create_encrypted(self, num_instances=1):
         CONF.set_override('enabled', True,
                           group='ephemeral_storage_encryption')
-        CONF.set_override('api_class',
+        CONF.set_override('backend',
                           'castellan.tests.unit.key_manager.mock_key_manager.'
                           'MockKeyManager',
                           group='key_manager')
diff --git a/nova/tests/unit/network/security_group/test_neutron_driver.py b/nova/tests/unit/network/security_group/test_neutron_driver.py
index e47f2193eab8..625c36fd3b9d 100644
--- a/nova/tests/unit/network/security_group/test_neutron_driver.py
+++ b/nova/tests/unit/network/security_group/test_neutron_driver.py
@@ -152,7 +152,7 @@ class TestNeutronDriver(test.NoDBTestCase):
         with mock.patch.object(neutronv20, 'find_resourceid_by_name_or_id',
                                return_value=expected_sg_id):
             observed_sg = sg_api.get(self.context, name=sg_name)
-        expected_sg['security_group']['project_id'] = self.context.tenant
+        expected_sg['security_group']['project_id'] = self.context.project_id
         del expected_sg['security_group']['tenant_id']
         self.assertEqual(expected_sg['security_group'], observed_sg)
         self.mocked_client.show_security_group.assert_called_once_with(