diff --git a/src/kpi_value_writer/tests/test_kpi_value_writer.py b/src/kpi_value_writer/tests/test_kpi_value_writer.py
index 572495d48d70cdc40c0ef6bb1efcf877e2a610ee..40593af97cca754c94558c977b105c09d373073a 100755
--- a/src/kpi_value_writer/tests/test_kpi_value_writer.py
+++ b/src/kpi_value_writer/tests/test_kpi_value_writer.py
@@ -14,11 +14,12 @@
 
 import logging
 from kpi_value_writer.service.KpiValueWriter import KpiValueWriter
+from kpi_value_writer.tests.test_messages import create_kpi_id_request, create_kpi_descriptor_request
+
 from common.tools.kafka.Variables import KafkaTopic
-from kpi_manager.client.KpiManagerClient import KpiManagerClient
-from kpi_manager.tests.test_messages import create_kpi_descriptor_request
 from common.proto.kpi_manager_pb2 import KpiDescriptor
-from kpi_value_writer.tests.test_messages import create_kpi_id_request
+from kpi_manager.client.KpiManagerClient import KpiManagerClient
+
 
 LOGGER = logging.getLogger(__name__)