diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index bf90f0696f1..b01bb36d2bd 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -7,7 +7,6 @@ on:
   workflow_call:
     inputs:
       compiler:
-        # only the compilers supported by setup-cpp can be used
         description: 'the C++ compiler to use'
         type: string
         required: true
@@ -33,6 +32,7 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    container: fedora:40
     steps:
       - uses: actions/checkout@v4
         with:
@@ -42,15 +42,14 @@ jobs:
         run: |
           sudo ./install-dependencies.sh
 
-      - name: Install ${{ inputs.compiler }}
-        uses: aminya/setup-cpp@master
-        with:
-          compiler: ${{ inputs.compiler }}
-          ccache: true
-          # ubuntu:latest comes with CMake 3.29, so we just need to install
-          # ninja. see
-          # https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md#tools
-          ninja: "${{ contains(inputs.enables, 'cxx-modules') }}"
+      - name: Install clang++
+        if: ${{ inputs.compiler == 'clang++' }}
+        run: |
+          sudo dnf -y install clang
+
+      - name: Install ccache
+        run: |
+          sudo dnf -y install ccache
 
       - name: Setup ccache
         uses: hendrikmuhs/ccache-action@v1
@@ -59,10 +58,15 @@ jobs:
 
       - name: Configure
         run: >
+          if [ ${{ inputs.compiler }} = "clang++" ]; then
+            CC=clang
+          else
+            CC=gcc
+          fi ;
           ./configure.py
           --ccache
           --c++-standard ${{ inputs.standard }}
-          --compiler $CXX
+          --compiler ${{ inputs.compiler }}
           --c-compiler $CC
           --mode ${{ inputs.mode }}
           ${{ inputs.options }}
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index aafba28a9d7..0c4204108ae 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -16,8 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # only the compilers supported by setup-cpp
-        compiler: [clang++-18, gcc-13]
+        compiler: [clang++, g++]
         standard: [20, 23]
         mode: [dev, debug, release]
     with: