diff --git a/tests/fixtures/config/single-tenant/git/layout-ignore-dependencies/zuul.yaml b/tests/fixtures/layouts/ignore-dependencies.yaml
similarity index 100%
rename from tests/fixtures/config/single-tenant/git/layout-ignore-dependencies/zuul.yaml
rename to tests/fixtures/layouts/ignore-dependencies.yaml
diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index 7f7cc81..606b26e 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -4274,10 +4274,9 @@
         self.init_repo("org/unknown")
         self._test_crd_check_reconfiguration('org/project1', 'org/unknown')
 
+    @simple_layout('layouts/ignore-dependencies.yaml')
     def test_crd_check_ignore_dependencies(self):
         "Test cross-repo dependencies can be ignored"
-        self.updateConfigLayout('layout-ignore-dependencies')
-        self.sched.reconfigure(self.config)
 
         self.gearman_server.hold_jobs_in_queue = True
         A = self.fake_gerrit.addFakeChange('org/project1', 'master', 'A')
@@ -4296,7 +4295,7 @@
 
         # Make sure none of the items share a change queue, and all
         # are live.
-        tenant = self.sched.abide.tenants.get('openstack')
+        tenant = self.sched.abide.tenants.get('tenant-one')
         check_pipeline = tenant.layout.pipelines['check']
         self.assertEqual(len(check_pipeline.queues), 3)
         self.assertEqual(len(check_pipeline.getAllItems()), 3)