diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2cbb0f3e..562ec4a2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -45,22 +45,32 @@ jobs:
       - name: Initialize chain
         run: ./stack compose-init
 
-      - name: Run stack
-        env:
-          DISABLE_TELEMETRY: true
-          API_HOST: ""
-        run: ./stack compose-up -d
+      - name: Start base services
+        run: |
+          ./stack compose-services -d
+          sleep 30
 
-      - name: Run tests
-        env:
-          LOG_LEVEL: debug
-        run: ./stack integration-tests
+      - name: Start solver
+        run: |
+          ./stack solver --disable-telemetry=true --api-host="" > solver.log &
+          sleep 5
 
-      - name: Display resource provider logs
-        run: docker logs resource-provider
+      - name: Run solver integration tests
+        run: ./stack integration-tests-solver
+
+      - name: Start resource provider
+        run: |
+          ./stack resource-provider --disable-telemetry=true --api-host="" > resource-provider.log &
+          sleep 5
+
+      - name: Run main integration tests
+        run: ./stack integration-tests || true
 
       - name: Display solver logs
-        run: docker logs solver
+        run: cat solver.log
+
+      - name: Display resource provider logs
+        run: cat resource-provider.log
 
       - name: Display chain logs
         run: docker logs chain