diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index d6fd66f92d..a152c68926 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -14828,6 +14828,8 @@
             - py35-etcd
             - py27-etcd3
             - py35-etcd3
+            - py27-etcd3gw
+            - py35-etcd3gw
             - py27-zookeeper
             - py34-zookeeper
             - py35-zookeeper
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 69f44dfffb..b5896b7418 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3648,6 +3648,10 @@ jobs:
   - name: gate-tooz-tox-py27-etcd-ubuntu-trusty
     branch: ^stable/mitaka.*$
 
+  # NOTE(dims) etcd3gw is available only in pike and forward
+  - name: ^gate-tooz-tox-.*-etcd3gw-ubuntu-xenial$
+    branch: ^(?!stable/(mitaka|newton|ocata)).*$
+
   - name: ^gate-tooz-tox-py35-.+-ubuntu-xenial
     branch: ^(?!stable/(mitaka|newton)).*$
 
@@ -18356,6 +18360,8 @@ projects:
       - gate-tooz-tox-py35-etcd-ubuntu-xenial
       - gate-tooz-tox-py27-etcd3-ubuntu-xenial
       - gate-tooz-tox-py35-etcd3-ubuntu-xenial
+      - gate-tooz-tox-py27-etcd3gw-ubuntu-xenial
+      - gate-tooz-tox-py35-etcd3gw-ubuntu-xenial
       - gate-tooz-tox-py27-zookeeper-ubuntu-trusty
       - gate-tooz-tox-py27-zookeeper-ubuntu-xenial
       - gate-tooz-tox-py34-zookeeper-ubuntu-trusty
@@ -18391,6 +18397,8 @@ projects:
       - gate-tooz-tox-py35-etcd-ubuntu-xenial
       - gate-tooz-tox-py27-etcd3-ubuntu-xenial
       - gate-tooz-tox-py35-etcd3-ubuntu-xenial
+      - gate-tooz-tox-py27-etcd3gw-ubuntu-xenial
+      - gate-tooz-tox-py35-etcd3gw-ubuntu-xenial
       - gate-tooz-tox-py27-zookeeper-ubuntu-trusty
       - gate-tooz-tox-py27-zookeeper-ubuntu-xenial
       - gate-tooz-tox-py34-zookeeper-ubuntu-trusty