diff --git a/playbooks/git-submodules/run.yaml b/playbooks/git-submodules/run.yaml
deleted file mode 100644
index 27a7948..0000000
--- a/playbooks/git-submodules/run.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-- hosts: all
-  tasks:
-    - name: Prepare git submodules
-      shell: |
-        set -ex
-
-        jq -r '.projects | .[] | .src_dir ' ~/zuul-env.json | while read PROJECT; do
-          pushd "{{ ansible_user_dir }}/${PROJECT}"
-          # 1) Adjust the origin's URL so that it points to its filesystem location.
-          # This makes relative URLs in submodules work.
-          git config --get remote.origin.url > /dev/null && git config remote.origin.url "{{ ansible_user_dir }}/${PROJECT}" || true
-          # 2) Prepare an alias for each repository, appending the .git suffix.
-          # E.g. Boost uses submodule URLs which end with a .git trailing suffix.
-          # That happens to be handled by many git servers automagically.
-          # Instead of rewriting the submodule URLs within each repo (which would either mark
-          # the repo dirty, or change its hash), use a big hammer and provide these
-          # "compatibility" repository names.
-          # If both a `repo` and `repo.git` already exist, then we're screwed.
-          ln -s $(basename "${PROJECT}") ../$(basename "${PROJECT}").git
-          popd
-        done
-
-        # 3) Update submodules via calling out to git
-        cd "$(jq -r '.project.src_dir' ~/zuul-env.json)"
-        git submodule update --init --recursive
-
-        # 4) Undo changes made in step 1
-        jq -r '.projects | .[] | .src_dir ' ~/zuul-env.json | while read PROJECT; do
-          pushd "{{ ansible_user_dir }}/${PROJECT}"
-          git config --get remote.origin.url > /dev/null && git config remote.origin.url file:///dev/null || true
-          popd
-        done
diff --git a/playbooks/run-test-command/run.yaml b/playbooks/run-test-command/run.yaml
index aa87128..d66a7ad 100644
--- a/playbooks/run-test-command/run.yaml
+++ b/playbooks/run-test-command/run.yaml
@@ -1,7 +1,5 @@
 - hosts: all
-
-  tasks:
-    - name: Run test_command
-      command: '{{ test_command }}'
-      args:
-        chdir: '{{ zuul.project.src_dir }}'
+  roles:
+    - role: git-submodules
+      when: prepare_git_submodules | default(false)
+    - run-test-command
diff --git a/playbooks/zuul-var-to-json/run.yaml b/playbooks/zuul-var-to-json/run.yaml
deleted file mode 100644
index 6c97ecf..0000000
--- a/playbooks/zuul-var-to-json/run.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-- hosts: all
-  tasks:
-    - name: Export Zuul variables into JSON
-      copy:
-        dest: '{{ ansible_user_dir }}/zuul-env.json'
-        content: '{{ zuul | to_json }}'