diff --git a/.github/workflows/test-e2e-cli.yml b/.github/workflows/test-e2e-cli.yml
index 0ed62bf002..1e40f3253f 100644
--- a/.github/workflows/test-e2e-cli.yml
+++ b/.github/workflows/test-e2e-cli.yml
@@ -69,7 +69,7 @@ jobs:
           
           # Prevent linker warnings on macOs (https://github.com/golang/go/issues/61229#issuecomment-1988965927)
           if [ "$RUNNER_OS" == "macOS" ]; then
-            export GOFLAGS="-ldflags=-extldflags=-Wl,-ld_classic"
+            export OTHER_LDFLAGS="-Wl,-ld_classic"
           fi
           
           # Build binary for test without external inputs
@@ -77,7 +77,6 @@ jobs:
             TERM="$TERM" \
             HOME="$HOME" \
             PATH="$PATH" \
-            GOFLAGS="$GOFLAGS" \
             APPDATA="$APPDATA" \
             BUILD_TARGET_PATH="$TEST_BINARY_CLI" \
             CLI_BUILD_DATE="-" \
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
index 76f5ef021a..f7084f4ef7 100644
--- a/.github/workflows/test-unit.yml
+++ b/.github/workflows/test-unit.yml
@@ -88,7 +88,7 @@ jobs:
         run: |
           # Prevent linker warnings on macOs (https://github.com/golang/go/issues/61229#issuecomment-1988965927)
           if [ "$RUNNER_OS" == "macOS" ]; then
-            export GOFLAGS="-ldflags=-extldflags=-Wl,-ld_classic"
+            export OTHER_LDFLAGS="-Wl,-ld_classic"
           fi
           
           # ENVs can affect test caching, make sure to only run tests with expected ENVs
@@ -96,7 +96,6 @@ jobs:
             TERM="$TERM" \
             HOME="$HOME" \
             PATH="$PATH" \
-            GOFLAGS="$GOFLAGS" \
             APPDATA="$APPDATA" \
             DATADOG_ENABLED="false" \
             UNIT_ETCD_ENABLED="$UNIT_ETCD_ENABLED" \