diff --git a/.clang-tidy b/.clang-tidy
index 06c54854b5..f5eccdf3cc 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -202,6 +202,9 @@ WarningsAsErrors: "
 
 HeaderFilterRegex: ^(?!\/usr)(?!\/opt)
 
+ExtraArgs:
+  - -std=c++17
+
 FormatStyle: none
 
 CheckOptions:
diff --git a/.clang-tidy-ci b/.clang-tidy-ci
index 04a9f8bacc..c6dfcdb37c 100644
--- a/.clang-tidy-ci
+++ b/.clang-tidy-ci
@@ -225,6 +225,9 @@ WarningsAsErrors: "
 
 HeaderFilterRegex: ^(?!\/usr)(?!\/opt)
 
+ExtraArgs:
+  - -std=c++17
+
 CheckOptions:
   - key: bugprone-argument-comment.CommentBoolLiterals
     value: "0"