diff --git a/.clang-format b/.clang-format
index 9f8b391e3..c1f442a68 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,3 +3,17 @@ BasedOnStyle: Google
 DerivePointerAlignment: false
 PointerAlignment: Left
 SortIncludes: true
+
+# The following should match defaults on Windows,
+# but were found to be different on Travis.
+
+AlignConsecutiveMacros: false
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: WithoutElse
+BraceWrapping:
+  AfterCaseLabel: false
+  SplitEmptyNamespace: true
+IncludeBlocks: Regroup
+SpaceAfterLogicalNot: false