diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4c7f8a8..cafdeca 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,6 +17,7 @@ jobs:
           - gcc:13
           - gcc:12
           - gcc:11
+          - clang:22
           - clang:21
           - clang:20
           - clang:19
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1793bd3..5d6ab01 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -6,6 +6,11 @@ function(add_test_suite name)
     add_executable(${name} ${name}.cpp)
     target_link_libraries(${name} PRIVATE ScopeGuard Catch2::Catch2WithMain trompeloeil::trompeloeil)
     add_test(${name} ${name})
+
+    # Workaround for catch2 #3076
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "22")
+        target_compile_options(${name} PRIVATE -Wno-c2y-extensions)
+    endif()
 endfunction()