diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 0000000..d1eaf17
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,14 @@
+- job:
+    name: jjb-tox-cross-jenkins-job-builder
+    description: Tests compatibility with master branch of jenkins-job-builder
+    parent: tox-py27
+    required-projects:
+      - openstack/python-jenkins
+      - openstack-infra/jenkins-job-builder
+    voting: true
+    failure-message: WARNING
+
+- project:
+    check:
+      jobs:
+        - jjb-tox-cross-jenkins-job-builder
diff --git a/tox.ini b/tox.ini
index 2340526..e345826 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,7 +14,18 @@ commands =
     - find . -type f -name "*.pyc" -delete
     - find . -type d -name "__pycache__" -delete
     stestr run --slowest {posargs}
-whitelist_externals = find
+whitelist_externals =
+    bash
+    find
+
+[testenv:tips]
+# tests what happens with unreleased version of dependencies, like jenkins-job-builder
+install_command = pip install -U {opts} {packages}
+commands =
+    bash -c "if [ -d {toxinidir}/../jenkins-job-builder ]; then \
+    pip install -q -U -e 'git+file://{toxinidir}/../jenkins-job-builder#egg=jenkins-job-builder' ; else \
+    pip install -q -U -e 'git+https://git.openstack.org/openstack-infra/jenkins-job-builder@master#egg=jenkins-job-builder' ; fi "
+    stestr run --slowest {posargs}
 
 [testenv:cover]
 setenv =