diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7718758..00b7c4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,15 +26,15 @@ if (NOT TARGET mason_interface)
     add_library ("mason_interface" INTERFACE)
     target_link_libraries ("mason_interface" INTERFACE seqan2::seqan2)
     target_include_directories ("mason_interface" INTERFACE "${CMAKE_CURRENT_LIST_DIR}/include")
-    target_compile_options ("mason_interface" INTERFACE "-Wpedantic" "-Wall")
+    target_compile_options ("mason_interface" INTERFACE)
     target_link_options ("mason_interface" INTERFACE)
     # This warning is suppressed in SeqAn2, but #pragma GCC diagnostic takes no effect with LTO (bug)
     if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-        target_compile_options ("mason_interface" INTERFACE "-Wextra" "-flto=auto")
+        target_compile_options ("mason_interface" INTERFACE "-Wextra" "-flto=auto" "-Wpedantic" "-Wall")
         target_link_options ("mason_interface" INTERFACE "-Wno-alloc-size-larger-than" "-flto=auto")
     endif ()
     if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-        target_compile_options ("mason_interface" INTERFACE "-Wextra")
+        target_compile_options ("mason_interface" INTERFACE "-Wextra" "-Wpedantic" "-Wall")
         target_link_options ("mason_interface" INTERFACE "-Wno-alloc-size-larger-than")
     endif ()
 
@@ -90,7 +90,9 @@ add_executable (mason_tests src/mason/mason_tests.cpp)
 target_link_libraries (mason_tests mason_sim)
 add_test (mason_tests ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/mason_tests)
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11)
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11
+    OR CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM"
+    OR CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
     message("Skipping test - known incompatibles with some older compilers")
 else()
     add_test (NAME app_test_mason