diff --git a/tests/fixtures/config/in-repo/common.yaml b/tests/fixtures/config/in-repo/git/common-config/zuul.yaml
similarity index 100%
rename from tests/fixtures/config/in-repo/common.yaml
rename to tests/fixtures/config/in-repo/git/common-config/zuul.yaml
diff --git a/tests/fixtures/config/in-repo/main.yaml b/tests/fixtures/config/in-repo/main.yaml
index e8b7665..d9868fa 100644
--- a/tests/fixtures/config/in-repo/main.yaml
+++ b/tests/fixtures/config/in-repo/main.yaml
@@ -1,8 +1,8 @@
 - tenant:
     name: tenant-one
-    include:
-      - common.yaml
     source:
       gerrit:
-        repos:
+        config-repos:
+          - common-config
+        project-repos:
           - org/project
diff --git a/tests/fixtures/config/multi-tenant/common.yaml b/tests/fixtures/config/multi-tenant/git/common-config/zuul.yaml
similarity index 87%
rename from tests/fixtures/config/multi-tenant/common.yaml
rename to tests/fixtures/config/multi-tenant/git/common-config/zuul.yaml
index 6014227..7719573 100644
--- a/tests/fixtures/config/multi-tenant/common.yaml
+++ b/tests/fixtures/config/multi-tenant/git/common-config/zuul.yaml
@@ -12,3 +12,7 @@
     failure:
       gerrit:
         verified: -1
+
+- job:
+    name:
+      python27
diff --git a/tests/fixtures/config/multi-tenant/tenant-one.yaml b/tests/fixtures/config/multi-tenant/git/tenant-one-config/zuul.yaml
similarity index 93%
rename from tests/fixtures/config/multi-tenant/tenant-one.yaml
rename to tests/fixtures/config/multi-tenant/git/tenant-one-config/zuul.yaml
index 86a98da..785f8a5 100644
--- a/tests/fixtures/config/multi-tenant/tenant-one.yaml
+++ b/tests/fixtures/config/multi-tenant/git/tenant-one-config/zuul.yaml
@@ -29,7 +29,9 @@
     name: org/project1
     check:
       jobs:
+        - python27
         - project1-test1
     tenant-one-gate:
       jobs:
+        - python27
         - project1-test1
diff --git a/tests/fixtures/config/multi-tenant/tenant-two.yaml b/tests/fixtures/config/multi-tenant/git/tenant-two-config/zuul.yaml
similarity index 93%
rename from tests/fixtures/config/multi-tenant/tenant-two.yaml
rename to tests/fixtures/config/multi-tenant/git/tenant-two-config/zuul.yaml
index 3f80a95..c6127ca 100644
--- a/tests/fixtures/config/multi-tenant/tenant-two.yaml
+++ b/tests/fixtures/config/multi-tenant/git/tenant-two-config/zuul.yaml
@@ -29,7 +29,9 @@
     name: org/project2
     check:
       jobs:
+        - python27
         - project2-test1
     tenant-two-gate:
       jobs:
+        - python27
         - project2-test1
diff --git a/tests/fixtures/config/multi-tenant/main.yaml b/tests/fixtures/config/multi-tenant/main.yaml
index b9d780c..b1c47b1 100644
--- a/tests/fixtures/config/multi-tenant/main.yaml
+++ b/tests/fixtures/config/multi-tenant/main.yaml
@@ -1,11 +1,15 @@
 - tenant:
     name: tenant-one
-    include:
-      - common.yaml
-      - tenant-one.yaml
+    source:
+      gerrit:
+        config-repos:
+          - common-config
+          - tenant-one-config
 
 - tenant:
     name: tenant-two
-    include:
-      - common.yaml
-      - tenant-two.yaml
+    source:
+      gerrit:
+        config-repos:
+          - common-config
+          - tenant-two-config
diff --git a/tests/fixtures/config/project-template/common.yaml b/tests/fixtures/config/project-template/git/common-config/zuul.yaml
similarity index 100%
rename from tests/fixtures/config/project-template/common.yaml
rename to tests/fixtures/config/project-template/git/common-config/zuul.yaml
diff --git a/tests/fixtures/config/project-template/main.yaml b/tests/fixtures/config/project-template/main.yaml
index 25dea57..a22ed5c 100644
--- a/tests/fixtures/config/project-template/main.yaml
+++ b/tests/fixtures/config/project-template/main.yaml
@@ -1,4 +1,6 @@
 - tenant:
     name: tenant-one
-    include:
-      - common.yaml
+    source:
+      gerrit:
+        config-repos:
+          - common-config