diff --git a/.clang-format b/.clang-format
index 21fe245..6dbfdd5 100644
--- a/.clang-format
+++ b/.clang-format
@@ -12,11 +12,9 @@ BreakBeforeBraces: Attach
 ColumnLimit: 79
 Cpp11BracedListStyle: true
 DerivePointerAlignment: false
+IncludeBlocks: Preserve
 IndentWrappedFunctionNames: true
 MaxEmptyLinesToKeep: 1
 PointerAlignment: Left
 SpaceAfterCStyleCast: true
 SpacesInContainerLiterals: false
-
-# Alas, not supported:
-# ForceEmptyLineAtEOF: true
diff --git a/test/shared/test-util.h b/test/shared/test-util.h
index 1859483..709325b 100644
--- a/test/shared/test-util.h
+++ b/test/shared/test-util.h
@@ -38,8 +38,9 @@ void no_inline no_return check_fail(const char* message);
 
 /* Polyfill `static_assert` for some versions of clang and gcc. */
 #if (defined(__clang__) || defined(__GNUC__)) && !defined(static_assert)
-#define static_assert(condition, message) typedef __attribute__( \
-    (__unused__)) int __static_assert_##__LINE__[(condition) ? 1 : -1]
+#define static_assert(condition, message) \
+  typedef __attribute__(                  \
+      (__unused__)) int __static_assert_##__LINE__[(condition) ? 1 : -1]
 #endif
 
 #endif /* TEST_UTIL_H_ */