diff --git a/.zuul.d/cross-jobs.yaml b/.zuul.d/cross-jobs.yaml
index 7809669078..3ed1921a50 100644
--- a/.zuul.d/cross-jobs.yaml
+++ b/.zuul.d/cross-jobs.yaml
@@ -12,8 +12,11 @@
       .. zuul:jobvar:: tox_envlist
 
          Use the specified tox environments (``ALL`` selects all).
-    run: playbooks/requirements-cross-test
-    files: ^upper-constraints.txt$
+    vars:
+      zuul_work_dir: "{{ (zuul.projects | selectattr('required') | selectattr('name', 'match', '^(?!openstack/requirements)') | list)[0].src_dir }}"
+    files:
+      - upper-constraints.txt
+      - .zuul.d/cross-jobs.yaml
 
 - job:
     name: cross-cinder-py27
diff --git a/playbooks/requirements-cross-test.yaml b/playbooks/requirements-cross-test.yaml
deleted file mode 100644
index 014f52d25b..0000000000
--- a/playbooks/requirements-cross-test.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-- hosts: all
-  roles:
-    - role: tox
-      zuul_work_dir: "{{ (zuul.projects | selectattr('required') | selectattr('name', 'match', '^(?!openstack/requirements)') | list)[0].src_dir }}"
-      tox_constraints_file: "{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt"