diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index b586fcdc0c..a5c2c755c7 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,14 +1,13 @@
 If you would like to contribute to the development of OpenStack,
-you must follow the steps in the "If you're a developer"
-section of this page:
+you must follow the steps in this page:
 
-   http://wiki.openstack.org/HowToContribute
+   http://docs.openstack.org/infra/manual/developers.html
 
 Once those steps have been completed, changes to OpenStack
 should be submitted for review via the Gerrit tool, following
 the workflow documented at:
 
-   http://wiki.openstack.org/GerritWorkflow
+   http://docs.openstack.org/infra/manual/developers.html#development-workflow
 
 Pull requests submitted through GitHub will be ignored.
 
diff --git a/dev/zuul/layout.yaml b/dev/zuul/layout.yaml
index a36673674c..a913d9ea8d 100644
--- a/dev/zuul/layout.yaml
+++ b/dev/zuul/layout.yaml
@@ -5,7 +5,7 @@ pipelines:
   - name: check
     description: Newly uploaded patchsets enter this pipeline to receive an initial +/-1 Verified vote from Jenkins.
     manager: IndependentPipelineManager
-    failure-message: Build failed.  For information on how to proceed, see https://wiki.openstack.org/wiki/GerritJenkinsGit#Test_Failures
+    failure-message: Build failed.  For information on how to proceed, see http://docs.openstack.org/infra/manual/developers.html#automated-testing
     precedence: low
     trigger:
       gerrit:
@@ -22,7 +22,7 @@ pipelines:
 
   - name: gate
     description: Changes that have been approved by core developers are enqueued in order in this pipeline, and if they pass tests in Jenkins, will be merged.
-    failure-message: Build failed.  For information on how to proceed, see https://wiki.openstack.org/wiki/GerritJenkinsGit#Test_Failures
+    failure-message: Build failed.  For information on how to proceed, see http://docs.openstack.org/infra/manual/developers.html#automated-testing
     manager: DependentPipelineManager
     precedence: low
     trigger:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 241adb53f5..30989a0078 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -5,7 +5,7 @@ pipelines:
   - name: check
     description: Newly uploaded patchsets enter this pipeline to receive an initial +/-1 Verified vote from Jenkins.
     success-message: Build succeeded (check pipeline).
-    failure-message: Build failed (check pipeline).  For information on how to proceed, see https://wiki.openstack.org/wiki/GerritJenkinsGit#Test_Failures
+    failure-message: Build failed (check pipeline).  For information on how to proceed, see http://docs.openstack.org/infra/manual/developers.html#automated-testing
     manager: IndependentPipelineManager
     source: gerrit
     precedence: normal
@@ -34,7 +34,7 @@ pipelines:
   - name: gate
     description: Changes that have been approved by core developers are enqueued in order in this pipeline, and if they pass tests in Jenkins, will be merged.
     success-message: Build succeeded (gate pipeline).
-    failure-message: Build failed (gate pipeline).  For information on how to proceed, see https://wiki.openstack.org/wiki/GerritJenkinsGit#Test_Failures
+    failure-message: Build failed (gate pipeline).  For information on how to proceed, see http://docs.openstack.org/infra/manual/developers.html#automated-testing
     manager: DependentPipelineManager
     source: gerrit
     precedence: high
@@ -182,7 +182,7 @@ pipelines:
     success-message: Build succeeded (check-tripleo pipeline).
     failure-message: >
       Build failed (check-tripleo pipeline).  For information on how to proceed, see
-      https://wiki.openstack.org/wiki/GerritJenkinsGit#Test_Failures
+      http://docs.openstack.org/infra/manual/developers.html#automated-testing
     manager: IndependentPipelineManager
     source: gerrit
     precedence: normal