diff --git a/Source/.clang-format b/Source/.clang-format
index 2403752f3..d30f4466e 100644
--- a/Source/.clang-format
+++ b/Source/.clang-format
@@ -1,7 +1,8 @@
 BasedOnStyle: webkit
 AlignTrailingComments: true
 AllowShortBlocksOnASingleLine: true
-AllowShortFunctionsOnASingleLine: None
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: WithoutElse
 PointerAlignment: Right
 TabWidth: 4
 UseTab: ForIndentation
diff --git a/test/.clang-format b/test/.clang-format
index 2403752f3..d30f4466e 100644
--- a/test/.clang-format
+++ b/test/.clang-format
@@ -1,7 +1,8 @@
 BasedOnStyle: webkit
 AlignTrailingComments: true
 AllowShortBlocksOnASingleLine: true
-AllowShortFunctionsOnASingleLine: None
+AllowShortFunctionsOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: WithoutElse
 PointerAlignment: Right
 TabWidth: 4
 UseTab: ForIndentation