diff --git a/tests/unit/test_scheduler.py b/tests/unit/test_scheduler.py
index 3b3c10a..314cc67 100755
--- a/tests/unit/test_scheduler.py
+++ b/tests/unit/test_scheduler.py
@@ -2067,21 +2067,16 @@
         self.sched.testConfig(self.config.get('zuul', 'tenant_config'),
                               self.connections)
 
-    @skip("Disabled for early v3 development")
     def test_queue_names(self):
         "Test shared change queue names"
-        project1 = self.sched.layout.projects['org/project1']
-        project2 = self.sched.layout.projects['org/project2']
-        q1 = self.sched.layout.pipelines['gate'].getQueue(project1)
-        q2 = self.sched.layout.pipelines['gate'].getQueue(project2)
-        self.assertEqual(q1.name, 'integration')
-        self.assertEqual(q2.name, 'integration')
-
-        self.updateConfigLayout(
-            'tests/fixtures/layout-bad-queue.yaml')
-        with testtools.ExpectedException(
-            Exception, "More than one name assigned to change queue"):
-            self.sched.reconfigure(self.config)
+        tenant = self.sched.abide.tenants.get('tenant-one')
+        source = tenant.layout.pipelines['gate'].source
+        project1 = source.getProject('org/project1')
+        project2 = source.getProject('org/project2')
+        q1 = tenant.layout.pipelines['gate'].getQueue(project1)
+        q2 = tenant.layout.pipelines['gate'].getQueue(project2)
+        self.assertEqual(q1.name, 'integrated')
+        self.assertEqual(q2.name, 'integrated')
 
     def test_queue_precedence(self):
         "Test that queue precedence works"