diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/prometheus/test_tango_prometheus_client.py b/tangostationcontrol/tangostationcontrol/integration_test/default/prometheus/test_tango_prometheus_client.py
index 2f2b862f6eadc585e8f2501b111999b88ceca90c..f6ff9d75909c69d7b603c9a346448fbdbc9d77e9 100644
--- a/tangostationcontrol/tangostationcontrol/integration_test/default/prometheus/test_tango_prometheus_client.py
+++ b/tangostationcontrol/tangostationcontrol/integration_test/default/prometheus/test_tango_prometheus_client.py
@@ -89,14 +89,12 @@ class TestPrometheusClient(BaseIntegrationTestCase):
         expected_attr_values = recv_proxy.ANT_error_R
         numpy.testing.assert_equal(expected_attr_values, numpy.array([True] * 96))
         attribute_metrics, scraping_metrics = collector.collect()
-        metric_samples = attribute_metrics.samples[0:96]    # ANT_error_R
-        # Test attribute metrics
-        samples_names = []
+        metric_samples = attribute_metrics.samples  
+        # Test attribute metrics ANT_error_R
         samples_values = []
         for s in metric_samples:
-            samples_names.append(s.labels['name'])
-            samples_values.append(numpy.bool(s.value))
-        numpy.testing.assert_equal(samples_names, ['ANT_error_R'] * 96)
+            if (s.labels['name'] == 'ANT_error_R'):
+                samples_values.append(numpy.bool(s.value))
         numpy.testing.assert_equal(samples_values, expected_attr_values)
         # Test scraping metrics
         total_scraping_time = scraping_metrics.samples[-1].value