diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 762942c25823f34c77dfa4255f0e21b245f579cd..a01464ee1bee1d246461dc7857024aa1cd5800d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,10 +100,8 @@ test:
     - apk update && apk add postgresql-dev gcc python3-dev musl-dev py-pip gdal
     - pip3 install -r requirements.txt
     - ./wait_for_container.sh
-    - docker ps
-    # - docker exec -it $(docker ps -qf "name=emg-pvs_registrar") python3 /var/www/pvs/dev/pvs_instance/manage.py id list
-    # - docker exec -it $(docker ps -qf "name=emg-pvs_registrar") python3 /core/registrar.py --objects-prefix "OA/PH1B/0.1/b9/urn:eop:PHR:MULTISPECTRAL_0.5m:DS_PHR1B_201608070959189_FR1_PX_E012N32_0719_00974_4148/0000/PH1B_PHR_FUS_1A_20160807T095918_20160807T095920_TOU_1234_4148.DIMA.tar"
-    # - pytest -s registrar_test.py --name OA/PH1B/0.1/b9/urn:eop:PHR:MULTISPECTRAL_0.5m:DS_PHR1B_201608070959189_FR1_PX_E012N32_0719_00974_4148/0000/PH1B_PHR_FUS_1A_20160807T095918_20160807T095920_TOU_1234_4148.DIMA.tar
+    - docker exec -it $(docker ps -qf "name=emg-pvs_registrar") python3 /core/registrar.py --objects-prefix "OA/PH1B/0.1/b9/urn:eop:PHR:MULTISPECTRAL_0.5m:DS_PHR1B_201608070959189_FR1_PX_E012N32_0719_00974_4148/0000/PH1B_PHR_FUS_1A_20160807T095918_20160807T095920_TOU_1234_4148.DIMA.tar"
+    - pytest -s registrar_test.py --name OA/PH1B/0.1/b9/urn:eop:PHR:MULTISPECTRAL_0.5m:DS_PHR1B_201608070959189_FR1_PX_E012N32_0719_00974_4148/0000/PH1B_PHR_FUS_1A_20160807T095918_20160807T095920_TOU_1234_4148.DIMA.tar
     # - docker exec -it $(docker ps -qf "name=emg-pvs_preprocessor") /bin/sh python3 /preprocessor.py Emergency --tar-object-path "/pvs_testing/OA/PH1B/0.2/e8/urn:eop:PHR:MULTISPECTRAL_0.5m:DS_PHR1B_201707271114024_FR1_PX_W006N35_0918_03164_b7e7/0000/PH1B_PHR_FUS__3_20170727T111402_20170727T111407_TOU_1234_b7e7.DIMA.tar" --upload-container preprocessor_test
     
 
diff --git a/registrar_test.py b/registrar_test.py
index ffaeaec47973fcc05c095e05cca72081780efed8..b66233b526190254e14701b38f74d44bb5238f59 100644
--- a/registrar_test.py
+++ b/registrar_test.py
@@ -1,16 +1,15 @@
 import psycopg2
 import os
 
-database_user = os.environ['DB_USER']
-database_password = os.environ['DB_PW']
-host = os.environ['DB_HOST']
-port = os.environ['DB_PORT']
-database = os.environ['DB_NAME']
+database_user = os.environ.get('DB_USER_DOWNLOAD')
+database_password = os.environ.get('DB_PW_DOWNLOAD')
+host = os.environ.get('DB_HOST_DOWNLOAD')
+port = os.environ.get('DB_PORT_DOWNLOAD')
+database = os.environ.get('DB_NAME_DOWNLOAD')
 
 def connect_to_db(eo_id):
     global db_name, coverage_id
     try:
-        # connection = psycopg2.connect(  "dbname=emg_db user=emg_user password=QkU)n=Wwr70w^o=4XS~*5)vfL[ij~C} host=127.0.0.1 port=84")
         connection = psycopg2.connect(dbname=database, user=database_user, password=database_password, host=host, port=port)
 
         cursor = connection.cursor()