diff --git a/roles/test-matrix/files/features.yaml b/roles/test-matrix/files/features.yaml
index 18f54332..319688a7 100644
--- a/roles/test-matrix/files/features.yaml
+++ b/roles/test-matrix/files/features.yaml
@@ -1,6 +1,6 @@
 config:
   default:
-    master: [default, ceilometer, glance, nova, placement, swift, cinder, keystone]
+    master: [default, glance, nova, placement, swift, cinder, keystone]
     train: [default, ceilometer, glance, nova, placement, swift, cinder, keystone]
     stein: [default, ceilometer, glance, nova, placement, swift, cinder, keystone]
     rocky: [default, ceilometer, glance, nova, placement, swift, cinder, keystone]
@@ -94,7 +94,7 @@ primary:
 
   nova:
     base:
-      services: [n-api, n-cauth, n-cond, n-cpu, n-net, n-novnc, n-obj, n-sch, n-api-meta]
+      services: [n-api, n-cond, n-cpu, n-novnc, n-sch, n-api-meta]
 
   nova-cells:
     base:
@@ -276,7 +276,7 @@ subnode:
 
   nova:
     base:
-      services: [n-cpu, n-net, n-api-meta]
+      services: [n-cpu, n-api-meta]
 
   placement:
     base:
diff --git a/test-features.sh b/test-features.sh
index 1456f794..e6e5a6a3 100755
--- a/test-features.sh
+++ b/test-features.sh
@@ -16,13 +16,13 @@
 
 ERRORS=0
 
-TEMPEST_FULL_MASTER="n-api,n-api-meta,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_FULL_MASTER="n-api,n-api-meta,n-cpu,n-sch,n-cond,n-novnc,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,placement-api"
 
-TEMPEST_NEUTRON_MASTER="n-api,n-api-meta,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_NEUTRON_MASTER="n-api,n-api-meta,n-cpu,n-sch,n-cond,n-novnc,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,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-metering,placement-api"
 
-TEMPEST_HEAT_SLOW_MASTER="n-api,n-api-meta,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-api-meta,n-cpu,n-sch,n-cond,n-novnc,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,q-svc,q-agt,q-dhcp,q-l3,q-meta,q-metering,placement-api"
 
-GRENADE_NEW_MASTER="n-api,n-api-meta,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"
+GRENADE_NEW_MASTER="n-api,n-api-meta,n-cpu,n-sch,n-cond,n-novnc,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,placement-api"
 
 # Utility function for tests
 function assert_list_equal {