diff --git a/.zuul.yaml b/.zuul.yaml
index d587238c3..b76edcea2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -104,11 +104,6 @@
               - ^.*\.rst$
               - ^doc/.*$
               - ^releasenotes/.*$
-        - mistral-devstack
-        - mistral-devstack-tempest-ipv6-only
-        - mistral-devstack-non-apache-tempest-ipv6-only
-        - mistral-devstack-non-apache
-        - mistral-devstack-kombu
         - mistral-tox-unit-mysql
         - mistral-tox-unit-postgresql
         - mistral-rally-task:
@@ -116,11 +111,6 @@
     queue: mistral
     gate:
       jobs:
-        - mistral-devstack
-        - mistral-devstack-tempest-ipv6-only
-        - mistral-devstack-non-apache-tempest-ipv6-only
-        - mistral-devstack-non-apache
-        - mistral-devstack-kombu
         - mistral-tox-unit-mysql
         - mistral-tox-unit-postgresql
     post:
diff --git a/bindep.txt b/bindep.txt
index 097a61c7f..1a1a4ebed 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -1,8 +1,11 @@
 # This is a cross-platform list tracking distribution packages needed by tests;
 # see http://docs.openstack.org/infra/bindep/ for additional information.
 
-mysql-client [platform:dpkg]
-mysql-server [platform:dpkg]
+mariadb [platform:rpm test]
+mariadb-devel [platform:rpm test]
+mariadb-server [platform:rpm platform:redhat platform:debian test]
+mysql-client [platform:dpkg !platform:debian test]
+mysql-server [platform:dpkg !platform:debian test]
 postgresql
 postgresql-client [platform:dpkg]
 postgresql-server [platform:rpm]