diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 69a815d1..beb39473 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   tests:
-    name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.cppstd }}-${{ matrix.version }}-python-${{ matrix.python-version }}-${{ matrix.castxml-epic }}
+    name: ${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.cppstd }}-${{ matrix.clang-version }}-python-${{ matrix.python-version }}-${{ matrix.castxml-epic }}
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -17,7 +17,17 @@ jobs:
           # UBUNTU 22.04 - CASTXML EPIC 0
           - os: ubuntu-22.04
             compiler: gcc
-            version: "11"
+            gcc-version: "11"
+            clang-version: "13"
+            python-version: "3.13"
+            castxml: "castxml"
+            castxml-epic: 0
+            cppstd: "-std=c++98"
+          
+          - os: ubuntu-22.04
+            compiler: gcc
+            gcc-version: "11"
+            clang-version: "14"
             python-version: "3.13"
             castxml: "castxml"
             castxml-epic: 0
@@ -25,7 +35,17 @@ jobs:
 
           - os: ubuntu-22.04
             compiler: gcc
-            version: "11"
+            gcc-version: "11"
+            clang-version: "15"
+            python-version: "3.13"
+            castxml: "castxml"
+            castxml-epic: 0
+            cppstd: "-std=c++98"
+
+          - os: ubuntu-22.04
+            compiler: gcc
+            gcc-version: "11"
+            clang-version: "15"
             python-version: "3.13"
             castxml: "castxml"
             castxml-epic: 1
@@ -34,7 +54,8 @@ jobs:
           # UBUNTU 24.04 - CASTXML EPIC 0
           - os: ubuntu-24.04
             compiler: gcc
-            version: "13"
+            gcc-version: "13"
+            clang-version: "16"
             python-version: "3.9"
             castxml: "castxml"
             castxml-epic: 0
@@ -42,7 +63,8 @@ jobs:
 
           - os: ubuntu-24.04
             compiler: gcc
-            version: "13"
+            gcc-version: "13"
+            clang-version: "16"
             python-version: "3.10"
             castxml: "castxml"
             castxml-epic: 0
@@ -50,7 +72,8 @@ jobs:
 
           - os: ubuntu-24.04
             compiler: gcc
-            version: "13"
+            gcc-version: "13"
+            clang-version: "16"
             python-version: "3.11"
             castxml: "castxml"
             castxml-epic: 0
@@ -58,7 +81,8 @@ jobs:
 
           - os: ubuntu-24.04
             compiler: gcc
-            version: "13"
+            gcc-version: "13"
+            clang-version: "16"
             python-version: "3.12"
             castxml: "castxml"
             castxml-epic: 0
@@ -66,7 +90,8 @@ jobs:
 
           - os: ubuntu-24.04
             compiler: gcc
-            version: "13"
+            gcc-version: "13"
+            clang-version: "16"
             python-version: "3.13"
             castxml: "castxml"
             castxml-epic: 0
@@ -75,7 +100,8 @@ jobs:
           # UBUNTU 24.04 - CASTXML EPIC 0 - c++XX
           - os: ubuntu-24.04
             compiler: gcc
-            version: "13"
+            gcc-version: "13"
+            clang-version: "16"
             python-version: "3.13"
             castxml: "castxml"
             castxml-epic: 0
@@ -83,7 +109,8 @@ jobs:
 
           - os: ubuntu-24.04
             compiler: gcc
-            version: "13"
+            gcc-version: "13"
+            clang-version: "16"
             python-version: "3.13"
             castxml: "castxml"
             castxml-epic: 0
@@ -91,7 +118,8 @@ jobs:
 
           - os: ubuntu-24.04
             compiler: gcc
-            version: "13"
+            gcc-version: "13"
+            clang-version: "16"
             python-version: "3.13"
             castxml: "castxml"
             castxml-epic: 0
@@ -99,7 +127,8 @@ jobs:
 
           - os: ubuntu-24.04
             compiler: gcc
-            version: "13"
+            gcc-version: "13"
+            clang-version: "16"
             python-version: "3.13"
             castxml: "castxml"
             castxml-epic: 0
@@ -107,7 +136,8 @@ jobs:
 
           - os: ubuntu-24.04
             compiler: gcc
-            version: "13"
+            gcc-version: "13"
+            clang-version: "16"
             python-version: "3.13"
             castxml: "castxml"
             castxml-epic: 0
@@ -116,7 +146,8 @@ jobs:
           # UBUNTU 24.04 - CASTXML EPIC 1
           - os: ubuntu-24.04
             compiler: gcc
-            version: "13"
+            gcc-version: "13"
+            clang-version: "16"
             python-version: "3.13"
             castxml: "castxml"
             castxml-epic: 1
@@ -124,7 +155,8 @@ jobs:
 
           - os: ubuntu-24.04
             compiler: gcc
-            version: "13"
+            gcc-version: "13"
+            clang-version: "16"
             python-version: "3.13"
             castxml: "castxml"
             castxml-epic: 1
@@ -133,7 +165,7 @@ jobs:
           # MACOS
           - os: macos-13
             compiler: xcode
-            version: "default"
+            gcc-version: "default"
             python-version: "3.13"
             castxml: "castxml"
             castxml-epic: 0
@@ -157,8 +189,14 @@ jobs:
       - name: Run pycodestyle
         run: pycodestyle . --exclude=docs
 
-      - name: Write ccflags to conf file
-        run: echo "ccflags=${{ matrix.cppstd }}" >> tests/xml_generator.cfg
+      - name: Debug
+        run: ls /usr/bin/clang*
+
+      - name: Write xml_generator.cfg
+        run: |
+          echo "[xml_generator]" > tests/xml_generator.cfg
+          echo "compiler_path=/usr/bin/clang++-${{ matrix.clang-version }}" >> tests/xml_generator.cfg
+          echo "ccflags=${{ matrix.cppstd }}" >> tests/xml_generator.cfg
 
       - name: Setup castxml for Linux
         if: contains(matrix.os, 'ubuntu') && matrix.castxml == 'castxml'
diff --git a/tests/test_patcher.py b/tests/test_patcher.py
index 336e57d2..d48817d0 100644
--- a/tests/test_patcher.py
+++ b/tests/test_patcher.py
@@ -11,6 +11,9 @@
 from pygccxml import parser
 from pygccxml import utils
 
+import logging
+utils.loggers.set_level(logging.DEBUG)
+
 
 TEST_FILES = [
     "patcher.hpp",