diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index c67a7fe85..a23122c8c 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -36,12 +36,12 @@ jobs:
             TEST_PROVIDER_BASE_URL: http://127.0.0.1:5050/
           - name: sequencer-goerli
             TEST_PROVIDER_BASE_URL: https://alpha4.starknet.io
-            TEST_ACCOUNT_PRIVATE_KEY: ${{ secrets.TEST_ACCOUNT_PRIVATE_KEY }}
-            TEST_ACCOUNT_ADDRESS: ${{ secrets.TEST_ACCOUNT_ADDRESS }}
+            ENABLE_TEST_ACCOUNT_PRIVATE_KEY: true
+            ENABLE_TEST_ACCOUNT_ADDRESS: true
           - name: rpc-goerli
-            TEST_RPC_URL: ${{ secrets.TEST_RPC_URL }}
-            TEST_ACCOUNT_PRIVATE_KEY: ${{ secrets.TEST_ACCOUNT_PRIVATE_KEY }}
-            TEST_ACCOUNT_ADDRESS: ${{ secrets.TEST_ACCOUNT_ADDRESS }}
+            ENABLE_TEST_RPC_URL: true
+            ENABLE_TEST_ACCOUNT_PRIVATE_KEY: true
+            ENABLE_TEST_ACCOUNT_ADDRESS: true
 
     name: Run test on ${{ matrix.name }}
     runs-on: ubuntu-latest
@@ -53,9 +53,9 @@ jobs:
           - 5050:5050
     env:
       TEST_PROVIDER_BASE_URL: ${{ matrix.TEST_PROVIDER_BASE_URL }}
-      TEST_RPC_URL: ${{ matrix.TEST_RPC_URL }}
-      TEST_ACCOUNT_PRIVATE_KEY: ${{ matrix.TEST_ACCOUNT_PRIVATE_KEY }}
-      TEST_ACCOUNT_ADDRESS: ${{ matrix.TEST_ACCOUNT_ADDRESS }}
+      TEST_RPC_URL: ${{ secrets.TEST_RPC_URL }}
+      TEST_ACCOUNT_PRIVATE_KEY: ${{ matrix.ENABLE_TEST_ACCOUNT_PRIVATE_KEY && secrets.TEST_ACCOUNT_PRIVATE_KEY }}
+      TEST_ACCOUNT_ADDRESS: ${{ matrix.ENABLE_TEST_ACCOUNT_ADDRESS && secrets.TEST_ACCOUNT_ADDRESS }}
 
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2f9f145da..198e4ea51 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -33,16 +33,15 @@ jobs:
             TEST_PROVIDER_BASE_URL: http://127.0.0.1:5050/
           - name: sequencer-goerli
             TEST_PROVIDER_BASE_URL: https://alpha4.starknet.io
-            TEST_ACCOUNT_PRIVATE_KEY: ${{ secrets.TEST_ACCOUNT_PRIVATE_KEY }}
-            TEST_ACCOUNT_ADDRESS: ${{ secrets.TEST_ACCOUNT_ADDRESS }}
+            ENABLE_TEST_ACCOUNT_PRIVATE_KEY: true
+            ENABLE_TEST_ACCOUNT_ADDRESS: true
           - name: rpc-goerli
-            TEST_RPC_URL: ${{ secrets.TEST_RPC_URL }}
-            TEST_ACCOUNT_PRIVATE_KEY: ${{ secrets.TEST_ACCOUNT_PRIVATE_KEY }}
-            TEST_ACCOUNT_ADDRESS: ${{ secrets.TEST_ACCOUNT_ADDRESS }}
+            ENABLE_TEST_RPC_URL: true
+            ENABLE_TEST_ACCOUNT_PRIVATE_KEY: true
+            ENABLE_TEST_ACCOUNT_ADDRESS: true
 
     name: Run test on ${{ matrix.name }}
     runs-on: ubuntu-latest
-    needs: ['build']
 
     services:
       devnet:
@@ -51,9 +50,9 @@ jobs:
           - 5050:5050
     env:
       TEST_PROVIDER_BASE_URL: ${{ matrix.TEST_PROVIDER_BASE_URL }}
-      TEST_RPC_URL: ${{ matrix.TEST_RPC_URL }}
-      TEST_ACCOUNT_PRIVATE_KEY: ${{ matrix.TEST_ACCOUNT_PRIVATE_KEY }}
-      TEST_ACCOUNT_ADDRESS: ${{ matrix.TEST_ACCOUNT_ADDRESS }}
+      TEST_RPC_URL: ${{ secrets.TEST_RPC_URL }}
+      TEST_ACCOUNT_PRIVATE_KEY: ${{ matrix.ENABLE_TEST_ACCOUNT_PRIVATE_KEY && secrets.TEST_ACCOUNT_PRIVATE_KEY }}
+      TEST_ACCOUNT_ADDRESS: ${{ matrix.ENABLE_TEST_ACCOUNT_ADDRESS && secrets.TEST_ACCOUNT_ADDRESS }}
 
     steps:
       - uses: actions/checkout@v2