diff --git a/src/nbi/.gitlab-ci.yml b/src/nbi/.gitlab-ci.yml
index 0edeac5e115ee23b9b12eae7821322e09fa57be4..12c2c010cca7811423f418b7290d636548517a4f 100644
--- a/src/nbi/.gitlab-ci.yml
+++ b/src/nbi/.gitlab-ci.yml
@@ -96,7 +96,8 @@ unit_test nbi:
       --env IETF_NETWORK_RENDERER=LIBYANG
       --env "KFK_SERVER_ADDRESS=${KAFKA_IP}:9092"
       $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG
-    - sleep 30
+    - while ! docker logs $IMAGE_NAME 2>&1 | grep -q 'Initialization completed'; do sleep 1; done
+    - sleep 5 # Give extra time to NBI to get ready
     - docker ps -a
     - docker logs kafka
     - docker logs mock_tfs_nbi_dependencies
diff --git a/src/telemetry/backend/tests/test_backend.py b/src/telemetry/backend/tests/test_backend.py
index 1329aa969a4fed5baa887dd12d120f41eb56c2fa..1ada9cbe2f95a2181dab136fbebead045a3992bc 100644
--- a/src/telemetry/backend/tests/test_backend.py
+++ b/src/telemetry/backend/tests/test_backend.py
@@ -23,7 +23,7 @@ from common.tools.context_queries.Topology import get_topology
 from common.Constants import DEFAULT_CONTEXT_NAME
 from common.tools.context_queries.Device import get_device, add_device_to_topology
 # from common.tools.context_queries.EndPoint import get_endpoint_names
-from .EndPoint import get_endpoint_names        # modofied version of get_endpoint_names
+#from .EndPoint import get_endpoint_names        # modofied version of get_endpoint_names
 from common.proto.context_pb2 import EndPointId, DeviceId, TopologyId, ContextId , Empty
 from common.proto.kpi_manager_pb2 import KpiId