diff --git a/playbooks/nodepool-zuul-functional/pre.yaml b/playbooks/nodepool-zuul-functional/pre.yaml
index 4d68a3c5c..8b7a7faf6 100644
--- a/playbooks/nodepool-zuul-functional/pre.yaml
+++ b/playbooks/nodepool-zuul-functional/pre.yaml
@@ -4,12 +4,4 @@
     - role: bindep
       bindep_profile: default
       bindep_dir: "{{ zuul.projects['git.openstack.org/openstack-infra/zuul'].src_dir }}"
-
-  tasks:
-
-    - name: Install packages and  run zuul-nodepool-integration/start.sh
-      shell:
-        cmd: |
-          sudo pip3 install .
-          ./tools/zuul-nodepool-integration/start.sh
-        chdir: "{{ zuul.projects['git.openstack.org/openstack-infra/nodepool'].src_dir }}"
+    - nodepool-zuul-functional
diff --git a/roles/nodepool-zuul-functional/README.rst b/roles/nodepool-zuul-functional/README.rst
new file mode 100644
index 000000000..63e49058f
--- /dev/null
+++ b/roles/nodepool-zuul-functional/README.rst
@@ -0,0 +1 @@
+Prepare nodepool installation.
diff --git a/roles/nodepool-zuul-functional/tasks/main.yaml b/roles/nodepool-zuul-functional/tasks/main.yaml
new file mode 100644
index 000000000..f87f9205f
--- /dev/null
+++ b/roles/nodepool-zuul-functional/tasks/main.yaml
@@ -0,0 +1,6 @@
+- name: Install packages and run zuul-nodepool-integration/start.sh
+  shell:
+    cmd: |
+      sudo pip3 install .
+      ./tools/zuul-nodepool-integration/start.sh
+    chdir: "{{ zuul.projects['git.openstack.org/openstack-infra/nodepool'].src_dir }}"