diff --git a/.github/workflows/test_unreleased.yml b/.github/workflows/test_unreleased.yml
index ac681f6e..677695fa 100644
--- a/.github/workflows/test_unreleased.yml
+++ b/.github/workflows/test_unreleased.yml
@@ -51,9 +51,16 @@ jobs:
         working-directory: opensearch/distribution/archives/linux-tar/build/distributions
         run: |
           tar xf opensearch-min-*
-          echo "discovery.type: single-node" >> ./opensearch-*/config/opensearch.yml
-          ./opensearch-*/bin/opensearch &
-          for attempt in {1..20}; do sleep 5; if curl -s localhost:9200; then echo '=====> ready'; break; fi; echo '=====> waiting...'; done
+          ./opensearch-*/bin/opensearch -d
+          for attempt in {1..20}; do
+            sleep 5
+            if curl -s localhost:9200; then
+              echo '=====> ready'
+              exit 0
+            fi
+            echo '=====> waiting...'
+          done
+          exit 1
       
       - name: Checkout PHP Client
         uses: actions/checkout@v2
@@ -73,9 +80,6 @@ jobs:
       - name: Wait for Search server
         run: php ./.github/wait_for_opensearch.php
 
-
       - name: Integration tests
         run: |
-          composer run integration
-        env:
-          OPENSEARCH_URL: 'http://localhost:9200'
+          OPENSEARCH_URL=http://localhost:9200 composer run integration