diff --git a/Makefile b/Makefile
index 691ba6fc..8e7bfebf 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,10 @@ envfile_testing:
 	@if test -f ${ENV_FILE}; then echo ".env file exists already"; exit 1; fi
 	@mkdir -p $(shell dirname ${ENV_FILE}) && touch ${ENV_FILE}
 	@echo SECRET_KEY=\"${GET_SECRET_KEY}\" >> ${ENV_FILE}
-	@echo SCANCODEIO_DB_PORT=\"5433\" >> ${ENV_FILE}
+	@echo PACKAGEDB_DB_USER=\"postgres\" >> ${ENV_FILE}
+	@echo PACKAGEDB_DB_PASSWORD=\"postgres\" >> ${ENV_FILE}
+	@echo SCANCODEIO_DB_USER=\"postgres\" >> ${ENV_FILE}
+	@echo SCANCODEIO_DB_PASSWORD=\"postgres\" >> ${ENV_FILE}
 
 isort:
 	@echo "-> Apply isort changes to ensure proper imports ordering"
@@ -126,7 +129,7 @@ run_map:
 
 test:
 	@echo "-> Run the test suite"
-	${ACTIVATE} DJANGO_SETTINGS_MODULE=purldb_project.settings ${PYTHON_EXE} -m pytest -vvs --ignore matchcode_pipeline --ignore matchcode_project --ignore purldb-toolkit --ignore packagedb/tests/test_throttling.py
+	${ACTIVATE} DJANGO_SETTINGS_MODULE=purldb_project.settings ${PYTHON_EXE} -m pytest -x -vvs --ignore matchcode_pipeline --ignore matchcode_project --ignore purldb-toolkit --ignore packagedb/tests/test_throttling.py
 	${ACTIVATE} DJANGO_SETTINGS_MODULE=purldb_project.settings ${PYTHON_EXE} -m pytest -vvs packagedb/tests/test_throttling.py
 	${ACTIVATE} DJANGO_SETTINGS_MODULE=matchcode_project.settings ${PYTHON_EXE} -m pytest -vvs matchcode_pipeline
 	${ACTIVATE} ${PYTHON_EXE} -m pytest -vvs purldb-toolkit/
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 55430a9c..23faf951 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -7,15 +7,13 @@
 
 resources:
   containers:
-  - container: postgres
-    image: postgres
-    env:
-      POSTGRES_DB: packagedb
-      POSTGRES_USER: packagedb
-      POSTGRES_PASSWORD: packagedb
-      POSTGRES_INITDB_ARGS: "--encoding=UTF-8 --lc-collate=en_US.UTF-8 --lc-ctype=en_US.UTF-8"
-    ports:
-      - 5432:5432
+    - container: postgres
+      image: postgres:13
+      env:
+        POSTGRES_USER: postgres
+        POSTGRES_PASSWORD: postgres
+      ports:
+        - 5432:5432
 
 jobs:
 
diff --git a/etc/ci/azure-posix.yml b/etc/ci/azure-posix.yml
index e626e032..589a2b9c 100644
--- a/etc/ci/azure-posix.yml
+++ b/etc/ci/azure-posix.yml
@@ -18,6 +18,9 @@ jobs:
                      test_suite_label: ${{ tsuite.key }}
                      test_suite: ${{ tsuite.value }}
 
+      services:
+        postgres: postgres
+
       steps:
           - checkout: self
             fetchDepth: 10
@@ -31,7 +34,7 @@ jobs:
 
               - script: |
                     make dev
-                    make envfile_testing
+                    make envfile
                     sudo mkdir /etc/scancodeio
                     sudo cp .env /etc/scancodeio
                 displayName: '${{ pyver }} - Configure'