diff --git a/google-checks.xml b/google-checks.xml
index aa1e5335b6b..5f1d75b1e7e 100644
--- a/google-checks.xml
+++ b/google-checks.xml
@@ -167,9 +167,9 @@
         </module>
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="CustomImportOrder">
-            <property name="specialImportsRegExp" value="com.google"/>
+            <property name="specialImportsRegExp" value="^javax\."/>
             <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
+            <property name="customImportOrderRules" value="STATIC###SAME_PACKAGE(2)###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS"/>
         </module>
         <module name="MethodParamPad"/>
         <module name="OperatorWrap">