diff --git a/.zuul.yaml b/.zuul.yaml
index ecf17f9db..4f84dae4e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,6 +6,7 @@
 
       This test runs the zuul project ``nodepool`` environment.
     pre-run: playbooks/nodepool-zuul-functional/pre.yaml
+    post-run: playbooks/nodepool-zuul-functional/post.yaml
     required-projects:
       - openstack-infra/nodepool
       - openstack-infra/zuul
@@ -116,6 +117,8 @@
         - tox-cover
         - tox-pep8
         - tox-py35
+        - nodepool-zuul-functional:
+            voting: false
         - nodepool-functional-py35:
             voting: false
         - nodepool-functional-py35-src:
@@ -133,6 +136,3 @@
     post:
       jobs:
         - publish-openstack-sphinx-docs-infra-python3
-    experimental:
-      jobs:
-        - nodepool-zuul-functional
diff --git a/playbooks/nodepool-zuul-functional/post.yaml b/playbooks/nodepool-zuul-functional/post.yaml
new file mode 100644
index 000000000..80f52fbdd
--- /dev/null
+++ b/playbooks/nodepool-zuul-functional/post.yaml
@@ -0,0 +1,8 @@
+- hosts: all
+  tasks:
+    - name: Copy nodepool logs from /tmp
+      synchronize:
+        src: '/tmp/nodepool/'
+        dest: '{{ zuul.executor.log_root }}/nodepool/'
+        mode: pull
+        verify_host: true
diff --git a/playbooks/nodepool-zuul-functional/pre.yaml b/playbooks/nodepool-zuul-functional/pre.yaml
index 418284082..54bb16ebf 100644
--- a/playbooks/nodepool-zuul-functional/pre.yaml
+++ b/playbooks/nodepool-zuul-functional/pre.yaml
@@ -1,5 +1,12 @@
 - hosts: all
   name: Zuul setup for nodepool test
+  roles:
+    - role: bindep
+      bindep_profile: default
+      bindep_dir: "{{ zuul.projects['git.openstack.org/openstack-infra/zuul'].src_dir }}"
+    # TODO(AJaeger): Remove once legacy script is removed from zuul
+    - legacy-copy-jenkins-scripts
+
   tasks:
 
     - name: Run tools/nodepool-integration-setup.sh from zuul
diff --git a/tools/zuul-nodepool-integration/nodepool.yaml b/tools/zuul-nodepool-integration/nodepool.yaml
index bac5aa568..6c4a935ca 100644
--- a/tools/zuul-nodepool-integration/nodepool.yaml
+++ b/tools/zuul-nodepool-integration/nodepool.yaml
@@ -1,4 +1,5 @@
 images-dir: /tmp/nodepool/images
+build-log-dir: /tmp/nodepool/builds
 
 zookeeper-servers:
   - host: localhost