diff --git a/tools/nodepool-integration-setup.sh b/tools/nodepool-integration-setup.sh
new file mode 100755
index 0000000000..c02a0167a7
--- /dev/null
+++ b/tools/nodepool-integration-setup.sh
@@ -0,0 +1,12 @@
+#!/bin/bash -xe
+
+/usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \
+    git://git.openstack.org openstack-infra/nodepool
+
+ln -s /tmp/nodepool/log $WORKSPACE/logs
+
+cd /tmp/openstack-infra/nodepool
+/usr/local/jenkins/slave_scripts/install-distro-packages.sh
+sudo pip install .
+
+bash -xe ./tools/zuul-nodepool-integration/start.sh
diff --git a/tools/nodepool-integration-test.sh b/tools/nodepool-integration-test.sh
deleted file mode 100755
index 74c2a01f66..0000000000
--- a/tools/nodepool-integration-test.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash -xe
-
-/usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git git://git.openstack.org \
-    openstack-infra/nodepool
-
-cd openstack-infra/nodepool
-/usr/local/jenkins/slave_scripts/install-distro-packages.sh
-sudo pip install .
-
-cd $WORKSPACE
-
-cd openstack-infra/zuul
-/usr/local/jenkins/slave_scripts/install-distro-packages.sh
-sudo pip install .
-
-cd $WORKSPACE
-
-bash -xe openstack-infra/nodepool/tools/zuul-nodepool-integration/start.sh
-
-# TODO(jeblair): something useful and save logs
-sleep 30
-cat /tmp/nodepool/log/nodepool-builder.log
-cat /tmp/nodepool/log/nodepool-launcher.log