diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4a16c021..c9b608d6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -38,15 +38,16 @@ jobs:
       - uses: actions/checkout@v1
       - name: Install dependencies
         run: |
-            sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
-            sudo apt-get update
-            sudo apt-get -y install g++-7 lcov cmake openssl
+          sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test
+          sudo apt-get update
+          sudo apt-get -y install g++-7 lcov cmake openssl
       - name: Make scripts executable
         run: sudo chmod -R +x ./.github/workflows/test/*.sh
-      - name: Environment variables
-        run: CC=gcc-7 && CXX=g++-7
       - name: Build
         run: ./.github/workflows/test/script_desktop.sh
+        env:
+          CC: gcc-7
+          CXX: g++-7
       - name: Codecov upload
         run: bash <(curl -s https://codecov.io/bash) -t ${{ secrets.CODECOV_TOKEN }}
 
@@ -57,18 +58,25 @@ jobs:
       - uses: actions/checkout@v1
       - name: Install dependencies
         run: |
-            sudo apt-get update
-            sudo apt-get -y install clang-5.0 clang-format-5.0 clang-tidy-5.0 lcov cmake openssl
+          sudo apt-get update
+          sudo apt-get -y install clang-5.0 clang-format-5.0 clang-tidy-5.0 lcov cmake openssl
       - name: Make scripts executable
         run: sudo chmod -R +x ./.github/workflows/test/*.sh
-      - name: Environment variables
-        run: CC=clang-5.0 && CXX=clang++-5.0
       - name: Build
         run: ./.github/workflows/test/script_desktop.sh
+        env:
+          CC: clang-5.0
+          CXX: clang++-5.0
       - name: Clang Tidy
         run: ./.github/workflows/test/clang_tidy.sh
+        env:
+          CC: clang-5.0
+          CXX: clang++-5.0
       - name: Clang Format
         run: ./.github/workflows/test/clang_format.sh
+        env:
+          CC: clang-5.0
+          CXX: clang++-5.0
 
   macos:
     runs-on: macOS-latest