diff --git a/.zuul.yaml b/.zuul.yaml
index 88c4d2391..fd9f8456e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -24,10 +24,12 @@
       - openstack/tacker
       - openstack/tacker-horizon
     vars:
+      test_matrix_configs: ['neutron']
       devstack_services:
         horizon: true
         tacker: true
         tacker-conductor: true
+        swift: false
       devstack_plugins:
         heat: https://git.openstack.org/openstack/heat
         networking-sfc: https://git.openstack.org/openstack/networking-sfc
diff --git a/devstack/settings b/devstack/settings
index 0df0fd04e..088d52206 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -7,9 +7,6 @@ if [ "${TACKER_MODE}" == "all" ]; then
     disable_service n-net
     VIRT_DRIVER=libvirt
 
-    #enable_service q-lbaas
-    #enable_service q-fwaas
-
     # TACKER_NEUTRON_AGENTS can be disabled by adding
     # TACKER_NEUTRON_AGENTS='' in local.conf if neutron agents are running on a separate node
     TACKER_NEUTRON_AGENTS=${TACKER_NEUTRON_AGENTS:-q-agt,q-dhcp,q-meta,q-l3}
@@ -24,7 +21,6 @@ if [ "${TACKER_MODE}" == "all" ]; then
     enable_service tacker
     # enable tacker-conductor will make systemctl enable conductor service
     enable_service tacker-conductor
-
     MGMT_PHYS_NET=${MGMT_PHYS_NET:-mgmtphysnet0}
     BR_MGMT=${BR_MGMT:-br-mgmt0}
     NET_MGMT=${NET_MGMT:-net_mgmt}