diff --git a/run_tests.sh b/run_tests.sh
index 80416dabc..d6a49ea5f 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -282,10 +282,9 @@ echo "TestEncryptedCinderVolumes" >> /tmp/openstack/tempest/test-whitelist.txt
 echo "test_create_and_delete_workflow" >> /tmp/openstack/tempest/test-whitelist.txt
 
 if uses_debs; then
-  # TODO(aschultz): check this after ocata-m3 is published for UCA
-  # 1) this will disable the lbaas listeners tests for ubuntu only due to flakey
-  # failures
-  EXCLUDES="--regex=^(?!neutron_lbaas.tests.tempest.v2.api.test_listeners_.*admin.ListenersTestJSON.*$)(?!neutron_fwaas.tests.tempest_plugin.tests.api.test_fwaas_extensions.*$)(?!ceilometer.tests.tempest.api.test_telemetry_notification_api.TelemetryNotificationAPITest.test_check_glance_v2_notifications.*$).*"
+  # TODO(aschultz): check this after pike-m1
+  # 1) fwaas tests from ubuntu are still out of date LP#1667736
+  EXCLUDES="--regex=^(?!neutron_fwaas.tests.tempest_plugin.tests.api.test_fwaas_extensions.*$)(?!mistral_tempest_tests.tests.api.v2.test_executions.ExecutionTestsV2.test_get_list_executions.*$)(?!ceilometer.tests.tempest.api.test_telemetry_notification_api.TelemetryNotificationAPITest.test_check_glance_v2_notifications.*$).*"
 else
   EXCLUDES="--regex=^(?!mistral_tempest_tests.tests.api.v2.test_executions.ExecutionTestsV2.test_get_list_executions.*$)(?!ceilometer.tests.tempest.api.test_telemetry_notification_api.TelemetryNotificationAPITest.test_check_glance_v2_notifications.*$).*"
 fi