diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 7136b8d86b..2e85e64852 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -218,6 +218,9 @@
     ORDER CHECKS
     -->
 
+    <!-- Checks that the default is after all the cases in a switch statement. -->
+    <module name="DefaultComesLast"/>
+
     <!-- Checks that the order of at-clauses follows the tagOrder default property value order.
          @author, @version, @param, @return, @throws, @exception, @see, @since, @serial, @serialField, @serialData, @deprecated
     -->
@@ -245,6 +248,9 @@
     WHITESPACE CHECKS
     -->
 
+    <!-- Checks that there is no whitespace before the colon in a switch block. -->
+    <module name="NoWhitespaceBeforeCaseDefaultColon"/>
+
     <!-- Checks that comments are indented relative to their position in the code -->
     <module name="CommentsIndentation"/>
 
@@ -358,6 +364,12 @@
     <!-- Checks that all Javadoc comments start from the second line. -->
     <module name="JavadocContentLocationCheck" />
 
+    <!-- Checks the indentation of the continuation lines in block tags. -->
+    <module name="JavadocTagContinuationIndentation">
+      <property name="offset" value="0"/>
+      <property name="violateExecutionOnNonTightHtml" value="true"/>
+    </module>
+
     <!-- Checks the Javadoc's format for every method (excluding getters, setters and constructors). -->
     <module name="JavadocMethod">
       <property name="allowMissingParamTags" value="true"/>