diff --git a/.zuul.yaml b/.zuul.yaml
index 046f479bdd..69c84d4a5b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -11,9 +11,7 @@
       - zuul: opendev.org/openstack/tempest
     required-projects:
       - openstack/devstack-gate
-      - openstack/aodh
       - openstack/barbican
-      - openstack/ceilometer
       - openstack/heat
       - openstack/heat-templates
       - openstack/heat-tempest-plugin
@@ -43,8 +41,6 @@
         tempest: true
       devstack_plugins:
         barbican: https://opendev.org/openstack/barbican
-        ceilometer: https://opendev.org/openstack/ceilometer
-        aodh: https://opendev.org/openstack/aodh
         zaqar: https://opendev.org/openstack/zaqar
         heat: https://opendev.org/openstack/heat
         octavia: https://opendev.org/openstack/octavia
diff --git a/devstack/lib/heat b/devstack/lib/heat
index 62fce13aef..7bc7d92f34 100644
--- a/devstack/lib/heat
+++ b/devstack/lib/heat
@@ -447,7 +447,7 @@ function create_heat_accounts {
 function configure_tempest_for_heat {
     # Skip SoftwareConfigIntegrationTest because it requires a custom image
     # Skip AutoscalingLoadBalancerTest and AutoscalingLoadBalancerv2Test as deprecated neutron-lbaas service is not enabled
-    iniset $TEMPEST_CONFIG heat_plugin skip_scenario_test_list 'AutoscalingLoadBalancerTest, AutoscalingLoadBalancerv2Test, SoftwareConfigIntegrationTest'
+    iniset $TEMPEST_CONFIG heat_plugin skip_scenario_test_list 'AutoscalingLoadBalancerTest, AutoscalingLoadBalancerv2Test, SoftwareConfigIntegrationTest, AodhAlarmTest'
     # Skip LoadBalancerv2Test as deprecated neutron-lbaas service is not enabled
     iniset $TEMPEST_CONFIG heat_plugin skip_functional_test_list 'LoadBalancerv2Test, NotificationTest'