diff --git a/.zuul.yaml b/.zuul.yaml
index fe140ad..ce53a1f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,6 +4,7 @@
       jobs:
         - openstack-tox-linters
         - refstack-client-devstack-master
+        - refstack-client-devstack-yoga
         - refstack-client-devstack-xena
         - refstack-client-devstack-wallaby
         - refstack-client-devstack-victoria
@@ -13,6 +14,7 @@
       jobs:
         - openstack-tox-linters
         - refstack-client-devstack-master
+        - refstack-client-devstack-yoga
         - refstack-client-devstack-xena
         - refstack-client-devstack-wallaby
         - refstack-client-devstack-victoria
@@ -82,6 +84,13 @@
     irrelevant-files:
       - ^.*\.md$
 
+- job:
+    name: refstack-client-devstack-yoga
+    parent: refstack-client-devstack-master
+    override-checkout: stable/yoga
+    vars:
+      branch: stable/yoga
+
 - job:
     name: refstack-client-devstack-xena
     parent: refstack-client-devstack-master
diff --git a/setup.py b/setup.py
index 6a931a6..b5275c8 100644
--- a/setup.py
+++ b/setup.py
@@ -16,4 +16,7 @@ import setuptools
 
 setuptools.setup(
     setup_requires=['pbr'],
+    # disable auto discovery to work around the following bug
+    # https://github.com/pypa/setuptools/issues/3197
+    py_modules=[],
     pbr=True)