diff --git a/.clang-format b/.clang-format
index 28009ef37..5fbd33049 100644
--- a/.clang-format
+++ b/.clang-format
@@ -4,4 +4,8 @@ BasedOnStyle: LLVM
 Language: Cpp
 
 AlwaysBreakTemplateDeclarations: true
+
+# Disable formatting options which may break tests.
+SortIncludes: false
+ReflowCommends: false
 ---