diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 6a376381..ac7a607f 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -72,7 +72,9 @@ PROJECTS="openstack/glance $PROJECTS"
 PROJECTS="openstack/heat $PROJECTS"
 PROJECTS="openstack/heat-cfntools $PROJECTS"
 PROJECTS="openstack/heat-templates $PROJECTS"
-PROJECTS="openstack/horizon $PROJECTS"
+if [[ "$DEVSTACK_GATE_HORIZON" -eq "1" ]] ; then
+    PROJECTS="openstack/horizon $PROJECTS"
+fi
 PROJECTS="openstack/keystone $PROJECTS"
 PROJECTS="openstack/neutron $PROJECTS"
 PROJECTS="openstack/nova $PROJECTS"
diff --git a/features.yaml b/features.yaml
index fbe18d9a..4852cd1b 100644
--- a/features.yaml
+++ b/features.yaml
@@ -1,11 +1,11 @@
 config:
   default:
-    master: [default, ceilometer, glance, horizon, nova, placement, swift, cinder, keystone]
-    ocata: [default, ceilometer, glance, horizon, nova, placement, swift, cinder, keystone]
-    newton: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
-    mitaka: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
-    liberty: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
-    kilo: [default, ceilometer, glance, horizon, nova, swift, cinder, keystone]
+    master: [default, ceilometer, glance, nova, placement, swift, cinder, keystone]
+    ocata: [default, ceilometer, glance, nova, placement, swift, cinder, keystone]
+    newton: [default, ceilometer, glance, nova, swift, cinder, keystone]
+    mitaka: [default, ceilometer, glance, nova, swift, cinder, keystone]
+    liberty: [default, ceilometer, glance, nova, swift, cinder, keystone]
+    kilo: [default, ceilometer, glance, nova, swift, cinder, keystone]
     # This can be used by functional jobs that only want their dependencies installed
     # and don't need to incur the overhead of installing all services in the process.
     no_services: [default]
@@ -58,6 +58,8 @@ config:
     features: [swift]
   keystone:
     features: [keystone]
+  horizon:
+    features: [horizon]
 
 branches:
   # The value of ""default" is the name of the "trunk" branch
diff --git a/test-features.sh b/test-features.sh
index b15ea9aa..500f792a 100755
--- a/test-features.sh
+++ b/test-features.sh
@@ -16,11 +16,11 @@
 
 ERRORS=0
 
-TEMPEST_FULL_MASTER="n-api,n-obj,n-cpu,n-sch,n-cond,n-novnc,n-cauth,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,etcd3,tempest,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,n-net,placement-api"
+TEMPEST_FULL_MASTER="n-api,n-obj,n-cpu,n-sch,n-cond,n-novnc,n-cauth,g-api,g-reg,key,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,etcd3,tempest,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,n-net,placement-api"
 
-TEMPEST_NEUTRON_MASTER="n-api,n-obj,n-cpu,n-sch,n-cond,n-novnc,n-cauth,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,etcd3,tempest,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-metering,placement-api"
+TEMPEST_NEUTRON_MASTER="n-api,n-obj,n-cpu,n-sch,n-cond,n-novnc,n-cauth,g-api,g-reg,key,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,etcd3,tempest,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-metering,placement-api"
 
-TEMPEST_HEAT_SLOW_MASTER="n-api,n-obj,n-cpu,n-sch,n-cond,n-novnc,n-cauth,g-api,g-reg,key,horizon,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,etcd3,tempest,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-metering,placement-api"
+TEMPEST_HEAT_SLOW_MASTER="n-api,n-obj,n-cpu,n-sch,n-cond,n-novnc,n-cauth,g-api,g-reg,key,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,etcd3,tempest,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-metering,placement-api"
 
 GRENADE_NEW_MASTER="n-api,n-obj,n-cpu,n-sch,n-cond,n-novnc,n-cauth,g-api,g-reg,key,c-api,c-vol,c-sch,c-bak,cinder,s-proxy,s-account,s-container,s-object,mysql,rabbit,dstat,peakmem_tracker,etcd3,tempest,n-net,ceilometer-acompute,ceilometer-acentral,ceilometer-collector,ceilometer-api,ceilometer-alarm-notifier,ceilometer-alarm-evaluator,ceilometer-anotification,placement-api"