diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 664db6195..cd3ebcd98 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -31,7 +31,10 @@
         <module name="ClassTypeParameterName" />
 
         <module name="AvoidStarImport" />
-        <module name="AvoidStaticImport" />
+        <module name="AvoidStaticImport">
+	  <property name="excludes"
+		    value="org.assertj.core.api.Assertions.*, org.junit.Assert.*, org.junit.Assume.*, org.junit.internal.matchers.ThrowableMessageMatcher.*, org.hamcrest.CoreMatchers.*, org.hamcrest.Matchers.*, org.springframework.boot.configurationprocessor.ConfigurationMetadataMatchers.*, org.springframework.boot.configurationprocessor.TestCompiler.*, org.mockito.Mockito.*, org.mockito.BDDMockito.*, org.mockito.Matchers.*, org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*, org.springframework.test.web.servlet.result.MockMvcResultMatchers.*, org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*, org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.*, org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo" />
+        </module>
         <module name="RedundantImport" />
         <module name="UnusedImports" />
         <module name="OuterTypeFilename" />