diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5dca1fe6c..a1eec0af2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -837,7 +837,7 @@ function(get_flags CCID CCVER)
     set(GF_CXX_FLAGS ${CXX_FLAGS} PARENT_SCOPE)
 endfunction()
 
-list(APPEND CXX_FLAGS -std=c++20)
+list(APPEND CXX_FLAGS -std=c++17)
 
 if (LLAMA_FATAL_WARNINGS)
     if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6a237d36f..d1e701b0a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -119,6 +119,9 @@ llama_target_and_test(test-chat-template.cpp)
 llama_target_and_test(test-chat-template-chaton.cpp)
 llama_target_and_test(test-chaton-groupkv.cpp)
 llama_target_and_test(test-chaton-simpcfg.cpp)
+#target_compile_features(test-chaton-simpcfg PUBLIC cxx_std_20)
+target_compile_options(test-chaton-simpcfg PUBLIC -std=c++20)
+
 
 llama_target_and_test(test-grammar-parser.cpp)
 llama_target_and_test(test-llama-grammar.cpp)