diff --git a/checklist.yaml b/checklist.yaml
index 570b16f..d962ec4 100644
--- a/checklist.yaml
+++ b/checklist.yaml
@@ -1,13 +1,4 @@
 tests:
-#  - title: 'tempest.api.compute.admin.test_servers.ServersAdminTestJSON.test_list_servers_by_admin[id-51717b38-bdc1-458b-b636-1cf82d99f62f]'
-#    status: 'ProdFailed'
-#    errors:
-#      - 'tempest.exceptions.BuildErrorException: Server'
-#      - 'Exceeded maximum number of retries. Exhausted all hosts available for retrying build failures for instance'
-#    defects: 'PROD-25148'
-#
-#  - title: 'tempest.api.compute.admin.test_servers.ServersAdminTestJSON.test_create_server_with_scheduling_hint[id-fdcd9b33-0903-4e00-a1f7-b5f6543068d6]'
-#    status: 'InfraFailed'
 
   - title: 'tempest.api.network.admin.test_routers.RoutersAdminTest.test_update_router_set_gateway[id-6cc285d8-46bf-4f36-9b1a-783e3008ba79]'
     errors:
@@ -21,17 +12,6 @@
     status: "ProdFailed"
     defects: 'PROD-25134'
 
-  - title: 'test_prometheus_alert_count[ReclassRemoteDesync]'
-    errors:
-      - "local files under /srv/salt/reclass have diverged from expected remote state"
-    status: "Won't Fix"
-
-  - title: "test_prometheus_alert_count[ContrailBGPSessionsDown]"
-    errors:
-      - "1 OpenContrail BGP sessions on the ntw01 node are down for 2 minutes."
-    status: "ProdFailed"
-    defects: 'PROD-34379'
-
 ## ==================================================
   - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_delete_image_metadata_item"
     errors:
@@ -39,25 +19,25 @@
     status: "ProdFailed"
     defects: "PROD-35212"
 
-  - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_create_image_from_paused_server"
+  - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_create_image_from_paused_server[id-71bcb732-0261-11e7-9086-fa163e4fa634]"
     errors:
       - "502 GET https://10.6.0.80:8774/v2.1/images/"
     status: "ProdFailed"
     defects: "PROD-35212"
 
-  - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_create_image_from_stopped_server"
+  - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_create_image_from_stopped_server[id-aaacd1d0-55a2-4ce8-818a-b5439df8adc9]"
     errors:
       - "502 GET https://10.6.0.80:8774/v2.1/images/"
     status: "ProdFailed"
     defects: "PROD-35212"
 
-  - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_create_image_from_suspended_server"
+  - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_create_image_from_suspended_server[id-8ca07fec-0262-11e7-907e-fa163e4fa634]"
     errors:
       - "502 GET https://10.6.0.80:8774/v2.1/images/"
     status: "ProdFailed"
     defects: "PROD-35212"
 
-  - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_create_delete_image"
+  - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_create_delete_image[id-3731d080-d4c5-4872-b41a-64d0d0021314]"
     errors:
       - "502 GET https://10.6.0.80:8774/v2.1/images/"
     status: "ProdFailed"
@@ -66,19 +46,26 @@
 
   - title: ".setUpClass (tempest.api.compute.images.test_list_image_filters.ListImageFiltersTestJSON)"
     errors:
-      - "cls.server2['id'], wait_until='ACTIVE')"
+      - 'resp, body = self.get("images/%s" % image_id)'
       - "tempest.lib.exceptions.UnexpectedResponseCode: Unexpected response code received"
       - "Details: 502"
     status: "ProdFailed"
     defects: "PROD-35212"
 
-  - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_create_delete_image"
+  - title: "tempest.api.compute.images.test_images.ImagesTestJSON.test_create_delete_image[id-3731d080-d4c5-4872-b41a-64d0d0021314]"
     errors:
       - "message': u\"Cannot 'createImage' instance"
       - "while it is in task_state image_uploading\", u'code': 409"
     status: "ProdFailed"
     defects: "PROD-35223"
 
+  - title: ".setUpClass (tempest.api.compute.images.test_list_image_filters.ListImageFiltersTestJSON)"
+    errors:
+      - 'resp, body = self.get("images/%s" % image_id)'
+      - "Details: 502"
+    status: "ProdFailed"
+    defects: "PROD-35212"
+
 
 # ---------------------------------------------------
   - title: "tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_get_console_output_server_id_in_shutoff_status"
@@ -117,13 +104,19 @@
       - "local files under /srv/salt/reclass have diverged from expected remote state"
     status: "WontFix"
 
+  - title: "test_prometheus_alert_count[ContrailBGPSessionsDown]"
+    errors:
+      - "1 OpenContrail BGP sessions on the ntw01 node are down for 2 minutes."
+    status: "ProdFailed"
+    defects: 'PROD-34379'
 
 ## ==================================================
 #              LMA2.0_Automated
 ## ==================================================
-  - title: "test_openstack_api_check_status_metrics "
+  - title: "test_openstack_api_check_status_metrics"
     errors:
-      - "Incorrect value in metric {u'value': [1600846840.578, u'0'], u'metric': {u'service_name': u'opencontrail', u'interface': u'public', u'service_id': u'35662704fa664daf95de90abc5180139', u'region': u'RegionOne', u'name': u'opencontrail', u'job': u'remote_agent_openstack_api', u'environment': u'heat-cicd-queens-contrail41-sl.local', u'instance': u'monitoring_remote_agent:9128', u'endpoint_id': u'721e2ad9e82148c9b5dbde40db83e47e', u'__name__': u'openstack_api_check_status'}}"
+      - "Incorrect value in metric"
+      - "u'metric': {u'service_name': u'opencontrail', u'interface': u'public'"
     status: "WontFix"
     defects: "PROD-35759"