diff --git a/src/dbscanserving/.gitlab-ci.yml b/src/dbscanserving/.gitlab-ci.yml
index 5d5204cdd26d56aa8e47f056c8f3b84db1a1ceb3..d665bdaf2993bc578024cfc7ef8517ae44ccef7a 100644
--- a/src/dbscanserving/.gitlab-ci.yml
+++ b/src/dbscanserving/.gitlab-ci.yml
@@ -54,7 +54,7 @@ unit_test dbscanserving:
     - sleep 5
     - docker ps -a
     - docker logs $IMAGE_NAME
-    - docker exec ps -a
+    - docker ps -a
     - sleep 5
     - docker logs $IMAGE_NAME
     - docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/home/${IMAGE_NAME}/results/${IMAGE_NAME}_report.xml"
diff --git a/src/dbscanserving/tests/test_unitary.py b/src/dbscanserving/tests/test_unitary.py
index 7349978e51cf5be8aa2f9899a91de91e13d1ae7e..a9d5c7e139d84e854ef58976ca6edba31cea6d11 100644
--- a/src/dbscanserving/tests/test_unitary.py
+++ b/src/dbscanserving/tests/test_unitary.py
@@ -23,30 +23,27 @@ from common.proto.dbscanserving_pb2 import (DetectionRequest,
                                             DetectionResponse, Sample)
 
 from dbscanserving.client.DbscanServingClient import DbscanServingClient
-from dbscanserving.Config import GRPC_SERVICE_PORT
 from dbscanserving.service.DbscanService import DbscanService
 
-port = 10000 + GRPC_SERVICE_PORT  # avoid privileged ports
-
 LOGGER = logging.getLogger(__name__)
 LOGGER.setLevel(logging.DEBUG)
 
 
 @pytest.fixture(scope="session")
 def dbscanserving_service():
-    _service = DbscanService(port=port)
+    _service = DbscanService()
     _service.start()
     yield _service
     _service.stop()
 
 
 @pytest.fixture(scope="session")
-def dbscanserving_client():
+def dbscanserving_client(dbscanserving_service: DbscanService):
     with patch.dict(
         os.environ,
         {
             "DBSCANSERVINGSERVICE_SERVICE_HOST": "127.0.0.1",
-            "DBSCANSERVINGSERVICE_SERVICE_PORT_GRPC": str(port),
+            "DBSCANSERVINGSERVICE_SERVICE_PORT_GRPC": str(dbscanserving_service.bind_port),
         },
         clear=True,
     ):