diff --git a/conf/rbkmoney_google_checkstyle.xml b/conf/rbkmoney_google_checkstyle.xml
index 2a1d9fd..1dbd887 100644
--- a/conf/rbkmoney_google_checkstyle.xml
+++ b/conf/rbkmoney_google_checkstyle.xml
@@ -235,11 +235,17 @@
         </module>
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="VariableDeclarationUsageDistance"/>
-        <module name="CustomImportOrder">
-            <property name="sortImportsInGroupAlphabetically" value="true"/>
-            <property name="separateLineBetweenGroups" value="true"/>
-            <property name="customImportOrderRules" value="STATIC###THIRD_PARTY_PACKAGE"/>
-            <property name="tokens" value="IMPORT, STATIC_IMPORT, PACKAGE_DEF"/>
+        <!-- Switched from CustomImportOrder to ImportOrder to match IDEA defaults -->
+        <module name="ImportOrder">
+            <property name="groups" value="*,javax,java"/>
+            <property name="ordered" value="true"/>
+            <property name="separated" value="true"/>
+            <property name="option" value="bottom"/>
+            <property name="sortStaticImportsAlphabetically" value="true"/>
+        </module>
+        <module name="SuppressionXpathSingleFilter">
+            <property name="checks" value="ImportOrder"/>
+            <property name="message" value="^'java\..*'.*"/>
         </module>
         <module name="MethodParamPad">
             <property name="tokens"