diff --git a/.zuul.yaml b/.zuul.yaml
index 01746fb83b..4cd7b8ffe8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -126,11 +126,11 @@
       Setup a SAIO dev environment and run Swift's probe tests
     timeout: 3600
     pre-run:
-      - playbooks/saio_single_node_setup/install_dependencies.yaml
-      - playbooks/saio_single_node_setup/setup_saio.yaml
-      - playbooks/saio_single_node_setup/make_rings.yaml
-    run: playbooks/probetests/run.yaml
-    post-run: playbooks/probetests/post.yaml
+      - tools/playbooks/saio_single_node_setup/install_dependencies.yaml
+      - tools/playbooks/saio_single_node_setup/setup_saio.yaml
+      - tools/playbooks/saio_single_node_setup/make_rings.yaml
+    run: tools/playbooks/probetests/run.yaml
+    post-run: tools/playbooks/probetests/post.yaml
 
 - project:
     check:
diff --git a/playbooks/probetests/post.yaml b/tools/playbooks/probetests/post.yaml
similarity index 100%
rename from playbooks/probetests/post.yaml
rename to tools/playbooks/probetests/post.yaml
diff --git a/playbooks/probetests/run.yaml b/tools/playbooks/probetests/run.yaml
similarity index 100%
rename from playbooks/probetests/run.yaml
rename to tools/playbooks/probetests/run.yaml
diff --git a/playbooks/saio_single_node_setup/install_dependencies.yaml b/tools/playbooks/saio_single_node_setup/install_dependencies.yaml
similarity index 100%
rename from playbooks/saio_single_node_setup/install_dependencies.yaml
rename to tools/playbooks/saio_single_node_setup/install_dependencies.yaml
diff --git a/playbooks/saio_single_node_setup/make_rings.yaml b/tools/playbooks/saio_single_node_setup/make_rings.yaml
similarity index 100%
rename from playbooks/saio_single_node_setup/make_rings.yaml
rename to tools/playbooks/saio_single_node_setup/make_rings.yaml
diff --git a/playbooks/saio_single_node_setup/setup_saio.yaml b/tools/playbooks/saio_single_node_setup/setup_saio.yaml
similarity index 100%
rename from playbooks/saio_single_node_setup/setup_saio.yaml
rename to tools/playbooks/saio_single_node_setup/setup_saio.yaml
diff --git a/playbooks/saio_single_node_setup/templates/rc.local.j2 b/tools/playbooks/saio_single_node_setup/templates/rc.local.j2
similarity index 100%
rename from playbooks/saio_single_node_setup/templates/rc.local.j2
rename to tools/playbooks/saio_single_node_setup/templates/rc.local.j2