diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000000000..b9b1c84e0
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=review.openstack.org
+port=29418
+project=openstack/stx-distcloud.git
diff --git a/.zuul.yaml b/.zuul.yaml
new file mode 100644
index 000000000..160d0bee1
--- /dev/null
+++ b/.zuul.yaml
@@ -0,0 +1,10 @@
+---
+- project:
+    check:
+      jobs:
+        - openstack-tox-linters
+        - openstack-tox-pep8:
+            voting: false
+    gate:
+      jobs:
+        - openstack-tox-linters
diff --git a/test-requirements.txt b/test-requirements.txt
index 5de028dab..551fd50fe 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -20,3 +20,6 @@ os-testr>=0.8.0 # Apache-2.0
 tempest-lib>=0.14.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 pylint==1.7.1 # GPLv2
+
+PyYAML>=3.1.0
+yamllint>=0.5.2
diff --git a/tox.ini b/tox.ini
index 710c8cef1..43bc4340b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,32 +1,31 @@
 [tox]
-minversion = 1.6
-envlist = py27,pep8
-# Tox does not work if the path to the workdir is too long, so move it to /tmp
-toxworkdir = /tmp/{env:USER}_distributedcloud
-#skipsdist = True
+envlist = linters,pep8
+minversion = 2.3
+skipsdist = True
 
 [testenv]
-#usedevelop = True
+basepython = python3
 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages}
 setenv =
     VIRTUAL_ENV={envdir}
+    OS_STDOUT_CAPTURE=1
+    OS_STDERR_CAPTURE=1
+    OS_TEST_TIMEOUT=60
     CURRENT_CFG_FILE={toxinidir}/.current.cfg
-    DATA_DIRECTORY={env:MY_REPO}/addons/wr-cgcs/layers/cgcs/extras.ND/ddt_data/distributed_cloud
+#    DATA_DIRECTORY={env:MY_REPO}/addons/wr-cgcs/layers/cgcs/extras.ND/ddt_data/distributed_cloud
 
-deps = keyring
-       -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
-       -e{toxinidir}/../../middleware/config/recipes-common/tsconfig/tsconfig
-       -e{toxinidir}/../../middleware/config/recipes-control/configutilities/configutilities
-       -e{toxinidir}/../../middleware/sysinv/recipes-common/sysinv/sysinv
-       -e{toxinidir}/../../middleware/fault/recipes-common/fm-api
-       -e{toxinidir}/../../middleware/patching/recipes-common/cgcs-patch/cgcs-patch
-       -e{toxinidir}/../../middleware/sysinv/recipes-common/cgts-client/cgts-client
-       -e{toxinidir}/../../recipes-nfv/nfv/nfv-client
+deps = -r{toxinidir}/test-requirements.txt
+#deps = keyring
+#       -r{toxinidir}/requirements.txt
+#       -r{toxinidir}/test-requirements.txt
+#       -e{toxinidir}/../../middleware/config/recipes-common/tsconfig/tsconfig
+#       -e{toxinidir}/../../middleware/config/recipes-control/configutilities/configutilities
+#       -e{toxinidir}/../../middleware/sysinv/recipes-common/sysinv/sysinv
+#       -e{toxinidir}/../../middleware/fault/recipes-common/fm-api
+#       -e{toxinidir}/../../middleware/patching/recipes-common/cgcs-patch/cgcs-patch
+#       -e{toxinidir}/../../middleware/sysinv/recipes-common/cgts-client/cgts-client
+#       -e{toxinidir}/../../recipes-nfv/nfv/nfv-client
 
-commands =
-    find {toxinidir} -not -path '{toxinidir}/.tox/*' -name '*.py[c|o]' -delete
-    python setup_ddt_tests.py testr --slowest --testr-args='{posargs}'
 whitelist_externals =
     rm
     find
@@ -96,3 +95,13 @@ deps = {[testenv]deps}
 commands = 
      pylint {posargs} dcmanager dcorch --rcfile=./pylint.rc 
 
+[testenv:linters]
+# bashate ignore:
+#  E006 - accept long lines
+#  E040 - false positive on |& syntax (new in bash 4)
+whitelist_externals = bash
+commands =
+  bash -c "find {toxinidir}        \
+            \( -name .tox -prune \)         \
+            -o -type f -name '*.yaml'       \
+            -print0 | xargs -0 yamllint"