diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index 41b59e0..c7af73f 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -47,6 +47,7 @@ jobs:
 
     - name: Run test
       run: make -j 4 check
+      working-directory: _build
 
     - name: Archive test log file
       if: failure()
@@ -57,13 +58,7 @@ jobs:
 
     - name: Dist test
       run: make distcheck
-
-    - name: Archive test log file
-      if: failure()
-      uses: actions/upload-artifact@v2
-      with:
-        name: dist-report-ubuntu
-        path: test-suite.log
+      working-directory: _build
 
   x86_macos:
 
@@ -91,37 +86,26 @@ jobs:
         git clone https://github.com/TREX-CoE/trexio.git
         cd trexio
         ./autogen.sh
-        mkdir _build
-        cd _build
-        ../configure --enable-silent-rules
-        make -j 4
-
-    - name: Run test
-      run: make -j 4 check
-
-    - name: Archive test log file
-      if: failure()
-      uses: actions/upload-artifact@v2
-      with:
-        name: test-report-ubuntu
-        path: test-suite.log
-
-    - name: Dist test
-      run: make distcheck
-
-    - name: Archive test log file
-      if: failure()
-      uses: actions/upload-artifact@v2
-      with:
         ./configure --prefix=${PWD}/_install --enable-silent-rules
         make -j 4
         make install
 
+    - name: Test TREXIO
+      run: make -j 4 check
+      working-directory: trexio
+
+    - name: Archive TREXIO test log file
+      if: failure()
+      uses: actions/upload-artifact@v2
+      with:
+        name: test-report-trexio-macos
+        path: trexio/test-suite.log
+
     - name: Build QMCkl
       run: |
         export PKG_CONFIG_PATH=${PWD}/trexio/_install/lib/pkgconfig:$PKG_CONFIG_PATH
         ./autogen.sh
-        ./configure --enable-silent-rules --enable-debug
+        ./configure CC=gcc-10 FC=gfortran-10 --enable-silent-rules --enable-debug
         make -j 4
 
     - name: Run test