diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 06f4c33c..8113c128 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -13,14 +13,11 @@ jobs:
         run: docker compose -f deploy/docker-compose.test.yaml build --no-cache
 
       - name: Run app in docker
-        run: docker compose -f deploy/docker-compose.test.yaml up -d
-
-      - name: Wait for database startup
-        run: docker compose -f deploy/docker-compose.test.yaml exec -T adminpanel bash -c "while !</dev/tcp/db/5432; do sleep 1; done;"
-        timeout-minutes: 1
+        run: docker compose -f deploy/docker-compose.test.yaml up -d --wait
 
       - name: Migrate database
         run: |
+          docker compose -f deploy/docker-compose.test.yaml exec -T adminpanel python manage.py collectstatic --noinput
           docker compose -f deploy/docker-compose.test.yaml exec -T adminpanel python manage.py makemigrations
           docker compose -f deploy/docker-compose.test.yaml exec -T adminpanel python manage.py migrate auth
           docker compose -f deploy/docker-compose.test.yaml exec -T adminpanel python manage.py migrate