diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2130a7f35d7e7fcdc6687efe9b933db411e4d25..59dc6f94f05b62e2dea651bebb8716bd65046c6b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,9 +74,12 @@ build:
     - master
 test:
   image: docker:latest
+  variables:
+    DOCKER_HOST: tcp://docker:2375
+    DOCKER_TLS_CERTDIR: ""
   stage: test
   services:
-    - docker:dind
+    - docker:19.03.1-dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
     - chmod +x env_setup.sh wait_for_container.sh
diff --git a/registrar_test.py b/registrar_test.py
index 2e03752cb2d2968ccc39d52fad37e7fdace1ebc1..d23cf3f8f29269c330ca7eeecb0ea9c05dac8436 100644
--- a/registrar_test.py
+++ b/registrar_test.py
@@ -9,15 +9,17 @@ with open('./env/emg_db.env', 'r') as f:
     )
 database= env['DB_NAME'].replace('\n','')
 port = env['DB_PORT'].replace('\n','')
-host = env['DB_HOST'].replace('\n','')
+# host = env['DB_HOST'].replace('\n','')
 database_password= env['DB_PW'].replace('\n','')
 database_user = env['DB_USER'].replace('\n','')
 
+host= os.environ.get('DOCKER_HOST')
+
 def connect_to_db(eo_id):
     global db_name, coverage_id
     connection= None
     try:
-        connection = psycopg2.connect(dbname=database, user=database_user, password=database_password, host='127.0.0.1', port=port)
+        connection = psycopg2.connect(dbname=database, user=database_user, password=database_password, host=host, port=port)
         cursor = connection.cursor()
         db_name = connection.get_dsn_parameters()["dbname"]
         postgreSQL_select_Query = "SELECT identifier FROM coverages_eoobject WHERE identifier = '%s';" % eo_id