diff --git a/doc/source/index.rst b/doc/source/index.rst
index 7c0a3671f..a802f395f 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -8,7 +8,6 @@
    jobs
    roles
    docker-image
-   test-jobs
 
 Indices and tables
 ==================
diff --git a/doc/source/test-jobs.rst b/doc/source/test-jobs.rst
deleted file mode 100644
index 545a47011..000000000
--- a/doc/source/test-jobs.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-Zuul-Jobs Tests
-===============
-
-These are jobs which are used for testing changes to roles in this
-repository.  They are not meant for general consumption and are only
-expected to be run by the OpenDev Zuul.  Generally you can ignore
-these unless you are making changes to the roles in this repository.
-
-.. zuul:autojob:: zuul-jobs-test-install-nodejs
-.. zuul:autojob:: zuul-jobs-test-install-pdk-dependencies
-.. zuul:autojob:: zuul-jobs-test-registry
-.. zuul:autojob:: zuul-jobs-test-upload-git-mirror
diff --git a/zuul.d/test-container-roles-jobs.yaml b/zuul-tests.d/container-roles-jobs.yaml
similarity index 100%
rename from zuul.d/test-container-roles-jobs.yaml
rename to zuul-tests.d/container-roles-jobs.yaml
diff --git a/zuul.d/test-general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml
similarity index 100%
rename from zuul.d/test-general-roles-jobs.yaml
rename to zuul-tests.d/general-roles-jobs.yaml
diff --git a/zuul.d/test-js-roles-jobs.yaml b/zuul-tests.d/js-roles-jobs.yaml
similarity index 100%
rename from zuul.d/test-js-roles-jobs.yaml
rename to zuul-tests.d/js-roles-jobs.yaml
diff --git a/zuul.d/test-puppet-roles-jobs.yaml b/zuul-tests.d/puppet-roles-jobs.yaml
similarity index 100%
rename from zuul.d/test-puppet-roles-jobs.yaml
rename to zuul-tests.d/puppet-roles-jobs.yaml