diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9ba8eb5f6bef..867d8939164a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -117,16 +117,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        engineType: ['library', 'binary']
+        queryEngine: ['library', 'binary']
         os: [ubuntu-20.04] # macos-latest, windows-latest
         node: [12]
 
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set Engine Type
+      - name: Set CLI Engine Type
+        run: |
+          echo "PRISMA_CLI_QUERY_ENGINE_TYPE=${{ matrix.queryEngine }}" >> $GITHUB_ENV
+
+      - name: Set Client Engine Type
         run: |
-          echo "PRISMA_CLIENT_ENGINE_TYPE={{ matrix.engine }}" >> $GITHUB_ENV
+          echo "PRISMA_CLIENT_ENGINE_TYPE=${{ matrix.queryEngine }}" >> $GITHUB_ENV
 
       - run: docker-compose -f docker/docker-compose.yml up --detach postgres postgres_isolated mysql mysql_isolated mssql
 
@@ -225,7 +229,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        engineType: ['library', 'binary']
+        queryEngine: ['library', 'binary']
         database:
           - sqlite
           - postgres
@@ -237,9 +241,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set Engine Type
+      - name: Set CLI Engine Type
+        run: |
+          echo "PRISMA_CLI_QUERY_ENGINE_TYPE=${{ matrix.queryEngine }}" >> $GITHUB_ENV
+      
+      - name: Set Client Engine Type
         run: |
-          echo "PRISMA_CLIENT_ENGINE_TYPE=${{ matrix.engine }}" >> $GITHUB_ENV
+          echo "PRISMA_CLIENT_ENGINE_TYPE=${{ matrix.queryEngine }}" >> $GITHUB_ENV
 
       - run: docker-compose -f docker/docker-compose.yml up --detach ${{matrix.database}}
         if: matrix.database != 'sqlite'
@@ -301,7 +309,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cliQueryEngine: ['library', 'binary']
+        queryEngine: ['library', 'binary']
         os: [ubuntu-20.04] # macos-latest, windows-latest
         node: [12]
 
@@ -310,7 +318,11 @@ jobs:
 
       - name: Set CLI Engine Type
         run: |
-          echo "PRISMA_CLI_QUERY_ENGINE_TYPE={{ matrix.cliQueryEngine }}" >> $GITHUB_ENV
+          echo "PRISMA_CLI_QUERY_ENGINE_TYPE=${{ matrix.queryEngine }}" >> $GITHUB_ENV
+
+      - name: Set Client Engine Type
+        run: |
+          echo "PRISMA_CLIENT_ENGINE_TYPE=${{ matrix.queryEngine }}" >> $GITHUB_ENV
 
       - name: Cache .pnpm-store # From https://pnpm.io/continuous-integration
         uses: actions/cache@v1
@@ -354,7 +366,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cliQueryEngine: ['library', 'binary']
+        queryEngine: ['library', 'binary']
         os: [ubuntu-20.04] # macos-latest, windows-latest
         node: [12]
 
@@ -365,7 +377,11 @@ jobs:
 
       - name: Set CLI Engine Type
         run: |
-          echo "PRISMA_CLI_QUERY_ENGINE_TYPE={{ matrix.cliQueryEngine }}" >> $GITHUB_ENV
+          echo "PRISMA_CLI_QUERY_ENGINE_TYPE=${{ matrix.queryEngine }}" >> $GITHUB_ENV
+
+      - name: Set Client Engine Type
+        run: |
+          echo "PRISMA_CLIENT_ENGINE_TYPE=${{ matrix.queryEngine }}" >> $GITHUB_ENV
 
       - name: Cache .pnpm-store # From https://pnpm.io/continuous-integration
         uses: actions/cache@v1
@@ -421,7 +437,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cliQueryEngine: ['library', 'binary']
+        queryEngine: ['library', 'binary']
         os: [ubuntu-20.04] # macos-latest, windows-latest
         node: [12]
 
@@ -430,7 +446,11 @@ jobs:
 
       - name: Set CLI Engine Type
         run: |
-          echo "PRISMA_CLI_QUERY_ENGINE_TYPE={{ matrix.cliQueryEngine }}" >> $GITHUB_ENV
+          echo "PRISMA_CLI_QUERY_ENGINE_TYPE=${{ matrix.queryEngine }}" >> $GITHUB_ENV
+      
+      - name: Set Client Engine Type
+        run: |
+          echo "PRISMA_CLIENT_ENGINE_TYPE=${{ matrix.queryEngine }}" >> $GITHUB_ENV
 
       - name: Cache .pnpm-store # From https://pnpm.io/continuous-integration
         uses: actions/cache@v1