diff --git a/.github/workflows/db-test.yml b/.github/workflows/db-test.yml
index 73b9a66..e87d993 100644
--- a/.github/workflows/db-test.yml
+++ b/.github/workflows/db-test.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
     paths:
       - 'initdb/**'
+      - 'tests/**'
     branches:
       - 'main'
   push:
@@ -11,6 +12,7 @@ on:
       - 'main'
     paths:
       - 'initdb/**'
+      - 'tests/**'
   workflow_dispatch:
 
 jobs:
@@ -57,7 +59,7 @@ jobs:
           echo "Test PostgSail version"
           psql -c "SELECT value FROM app_settings WHERE name = 'app.version';"
           echo "Test PostgSail Unit Test"
-          docker-compose -f docker-compose.dev.yml -f docker-compose.yml up --exit-code-from tests
+          docker-compose -f docker-compose.dev.yml -f docker-compose.yml up tests --abort-on-container-exit --exit-code-from tests
           if [ $? != 0 ];
           then
               echo "Error running db-tests"
diff --git a/.github/workflows/frontend-test.yml b/.github/workflows/frontend-test.yml
index 3489677..2e3cd16 100644
--- a/.github/workflows/frontend-test.yml
+++ b/.github/workflows/frontend-test.yml
@@ -26,6 +26,9 @@ jobs:
       - name: Pull Docker images
         run: docker-compose pull db api web
 
+      - name: Build Docker images
+        run: docker-compose -f docker-compose.dev.yml -f docker-compose.yml build web_tests
+
       - name: Run PostgSail Web test
         # Environment variables
         env:
@@ -46,7 +49,7 @@ jobs:
           docker-compose up -d web_dev && sleep 60
           docker-compose ps -a
           curl http://localhost:8080/
-          docker-compose -f docker-compose.dev.yml -f docker-compose.yml up --exit-code-from web_tests
+          docker-compose -f docker-compose.dev.yml -f docker-compose.yml up web_tests --abort-on-container-exit --exit-code-from web_tests
           if [ $? != 0 ];
           then
               echo "Error running frontend-tests"