diff --git a/jenkins/jobs/openstack-publish-jobs.yaml b/jenkins/jobs/openstack-publish-jobs.yaml
index dcd860e41c..d9d9f2e4d2 100644
--- a/jenkins/jobs/openstack-publish-jobs.yaml
+++ b/jenkins/jobs/openstack-publish-jobs.yaml
@@ -48,12 +48,12 @@
 # always published from master branch.
 - job-template:
     name: '{name}-releasenotes'
-    node: ubuntu-trusty
+    node: ubuntu-xenial
 
     builders:
       - print-template-name:
           template-name: "{template-name}"
-      - branch-git-prep:
+      - zuul-git-branch-prep-upper-constraints:
           branch: master
       - install-distro-packages
       - revoke-sudo
@@ -84,52 +84,15 @@
           excludes: ''
       - console-log
 
+
 - job-template:
-    name: '{name}-releasenotes-test'
+    name: 'gate-{name}-releasenotes'
     node: ubuntu-xenial
 
     builders:
       - print-template-name:
           template-name: "{template-name}"
-      - zuul-git-branch-prep-upper-constraints:
-          branch: master
-      - install-distro-packages
-      - revoke-sudo
-      - shell: |
-          #!/bin/bash -xe
-          #
-          # Some testing:
-          git checkout origin/stable/mitaka
-          git checkout origin/stable/liberty
-          git tag
-          # When building the release notes after a patch merges we
-          # always want to build from master. Reno will find release
-          # notes on other branches and insert them into the right
-          # places in the documentation build, but only master has all
-          # of the appropriate branch-specific input files for
-          # Sphinx. The branch-git-prep builder checks out the
-          # repository where the current patch just merged, but it
-          # honors zuul configuration variables that may cause it to
-          # check out a patch merged into a stable branch. So, reset
-          # what we've checked out to master.
-          #
-          git checkout origin/master
-      - tox:
-          envlist: 'releasenotes'
-
-    publishers:
-      # TODO(jaegerandi): Add publishing
-      - console-log
-
-
-- job-template:
-    name: 'gate-{name}-releasenotes'
-    node: ubuntu-trusty
-
-    builders:
-      - print-template-name:
-          template-name: "{template-name}"
-      - gerrit-git-prep
+      - zuul-git-prep-upper-constraints:
       - install-distro-packages
       - revoke-sudo
       - tox:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index cd37dc5aae..3c5ae45424 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -5213,7 +5213,6 @@
           service: compute
       - api-ref-jobs:
           service: compute
-      - '{name}-releasenotes-test'
 
 - project:
     name: nova-docker
@@ -5789,7 +5788,6 @@
       - openstack-releasenotes-jobs
       - manual-translation-jobs
       - translation-jobs-mitaka
-      - '{name}-releasenotes-test'
 
 - project:
     name: openstack-resource-agents-specs
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 78c7f7c31d..7919b423d1 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -9374,7 +9374,6 @@ projects:
     post:
       - nova-coverage-db-ubuntu-trusty
       - nova-coverage-db-ubuntu-xenial
-      - nova-releasenotes-test
     experimental:
       - gate-tempest-dsvm-nova-v20-api
       - gate-grenade-dsvm-forward
@@ -10066,7 +10065,6 @@ projects:
     post:
       - openstack-manuals-tox-doc-publishdocs
       - propose-openstack-manuals-updates
-      - openstack-manuals-releasenotes-test
 
   - name: openstack/openstack-planet
     template: