diff --git a/playbooks/clean-static-node.yaml b/playbooks/clean-static-node.yaml
index f66b4cc..6a63102 100644
--- a/playbooks/clean-static-node.yaml
+++ b/playbooks/clean-static-node.yaml
@@ -6,3 +6,8 @@
       args:
         chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
         removes: "awx.egg-info"
+
+    - name: Remove old project directory
+      file:
+        path: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}"
+        state: absent
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 552f6a3..f21e145 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,8 +1,12 @@
+- job:
+    name: prepare-awx-environment
+    run: playbooks/clean-static-node.yaml
+
 - job:
     name: tox-awx
     parent: tox
-    pre-run: playbooks/clean-static-node.yaml
     nodeset: static-node
+    post-run: playbooks/clean-static-node.yaml
     abstract: true
 
 - job:
diff --git a/zuul.d/templates.yaml b/zuul.d/templates.yaml
index b3962c8..6e16025 100644
--- a/zuul.d/templates.yaml
+++ b/zuul.d/templates.yaml
@@ -18,13 +18,31 @@
     name: python-awx
     check:
       jobs:
-        - tox-awx-api-lint
-        - tox-awx-ui-lint
-        - tox-awx-api
-        - tox-awx-ui
+        - prepare-awx-environment
+        - tox-awx-api-lint:
+            dependencies:
+              - prepare-awx-environment
+        - tox-awx-ui-lint:
+            dependencies:
+              - prepare-awx-environment
+        - tox-awx-api:
+            dependencies:
+              - prepare-awx-environment
+        - tox-awx-ui:
+            dependencies:
+              - prepare-awx-environment
     gate:
       jobs:
-        - tox-awx-api-lint
-        - tox-awx-ui-lint
-        - tox-awx-api
-        - tox-awx-ui
+        - prepare-awx-environment
+        - tox-awx-api-lint:
+            dependencies:
+              - prepare-awx-environment
+        - tox-awx-ui-lint:
+            dependencies:
+              - prepare-awx-environment
+        - tox-awx-api:
+            dependencies:
+              - prepare-awx-environment
+        - tox-awx-ui:
+            dependencies:
+              - prepare-awx-environment