diff --git a/clang-tools-extra/test/.clang-format b/clang-tools-extra/test/.clang-format
--- a/clang-tools-extra/test/.clang-format
+++ b/clang-tools-extra/test/.clang-format
@@ -1,2 +1 @@
-BasedOnStyle: LLVM
-ColumnLimit: 0
+DisableFormat: true
diff --git a/clang/test/.clang-format b/clang/test/.clang-format
--- a/clang/test/.clang-format
+++ b/clang/test/.clang-format
@@ -1,3 +1 @@
-BasedOnStyle: LLVM
-ColumnLimit: 0
-AlwaysBreakTemplateDeclarations: No
+DisableFormat: true
diff --git a/llvm/test/.clang-format b/llvm/test/.clang-format
--- a/llvm/test/.clang-format
+++ b/llvm/test/.clang-format
@@ -1,2 +1 @@
-BasedOnStyle: LLVM
-ColumnLimit: 0
+DisableFormat: true