diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
index d6a59c98..53b655bc 100644
--- a/zuul.d/project-templates.yaml
+++ b/zuul.d/project-templates.yaml
@@ -1397,6 +1397,26 @@
         - infra-puppet-apply-4-ubuntu-xenial
         - openstackci-beaker
 
+- project-template:
+    name: lib-forward-testing
+    description: |
+      Run tempest, installing the library from source to ensure that
+      changes in the library do not break any of the services running
+      in devstack.
+    check:
+      jobs:
+        # Tempest-full is only working on pike and newer.
+        - tempest-full:
+            branches: ^(?!stable/(newton|ocata)).*$
+        - legacy-tempest-dsvm-neutron-src:
+            branches: ^stable/(newton|ocata)$
+    gate:
+      jobs:
+        - tempest-full:
+            branches: ^(?!stable/(newton|ocata)).*$
+        - legacy-tempest-dsvm-neutron-src:
+            branches: ^stable/(newton|ocata)$
+
 - project-template:
     name: lib-forward-testing-python3
     description: |
diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml
index 6872f002..d47d0fd4 100644
--- a/zuul.d/zuul-legacy-project-templates.yaml
+++ b/zuul.d/zuul-legacy-project-templates.yaml
@@ -73,15 +73,6 @@
         - neutron-grenade:
             branches: ^(?!stable/(newton|ocata)).*$
 
-- project-template:
-    name: lib-forward-testing
-    check:
-      jobs:
-        - legacy-tempest-dsvm-neutron-src
-    gate:
-      jobs:
-        - legacy-tempest-dsvm-neutron-src
-
 - project-template:
     name: lib-forward-testing-plugin
     check: