diff --git a/docker-compose-test.yaml b/docker-compose-test.yaml
index 562bc638..afc200af 100644
--- a/docker-compose-test.yaml
+++ b/docker-compose-test.yaml
@@ -18,6 +18,8 @@ services:
       - IS_CELERY=False
     command: 'sleep infinity'
     depends_on:
+      db:
+        condition: service_healthy
       geoserver:
         condition: service_healthy
     env_file:
@@ -27,9 +29,7 @@ services:
       - geoserver-data-dir:/geoserver_data/data
       - data:/data
       - tmp:/tmp
-    depends_on:
-      db:
-        condition: service_healthy
+      
 
   # Geoserver backend
   geoserver:
diff --git a/runtest.sh b/runtest.sh
index 41290fa5..6928ee20 100755
--- a/runtest.sh
+++ b/runtest.sh
@@ -1,4 +1,5 @@
-set -a 
+#!/bin/bash
+set -a
 . ./.env_test
 set +a 
-coverage run --append --source=/usr/src/geonode/manage.py test importer --keepdb -v2 --noinput
\ No newline at end of file
+coverage run --append --source='.' /usr/src/geonode/manage.py test importer --keepdb -v2 --noinput
\ No newline at end of file