diff --git a/parent/pom.xml b/parent/pom.xml
index 53e01718c..3b2e0e499 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -28,7 +28,7 @@
         <org.apache.maven.plugins.javadoc.version>3.1.0</org.apache.maven.plugins.javadoc.version>
         <org.springframework.version>4.0.3.RELEASE</org.springframework.version>
         <org.eclipse.tycho.compiler-jdt.version>0.26.0</org.eclipse.tycho.compiler-jdt.version>
-        <com.puppycrawl.tools.checkstyle.version>8.14</com.puppycrawl.tools.checkstyle.version>
+        <com.puppycrawl.tools.checkstyle.version>8.18</com.puppycrawl.tools.checkstyle.version>
         <add.release.arguments />
         <forkCount>1</forkCount>
         <assertj.version>3.11.1</assertj.version>
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/runner/CompilingStatement.java b/processor/src/test/java/org/mapstruct/ap/testutil/runner/CompilingStatement.java
index a292ef6a2..0b2d29738 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/runner/CompilingStatement.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/runner/CompilingStatement.java
@@ -25,6 +25,7 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import com.puppycrawl.tools.checkstyle.api.AutomaticBean;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.Statement;
 import org.mapstruct.ap.testutil.WithClasses;
@@ -214,10 +215,18 @@ abstract class CompilingStatement extends Statement {
                 new InputSource( getClass().getClassLoader().getResourceAsStream(
                     "checkstyle-for-generated-sources.xml" ) ),
                 new PropertiesExpander( properties ),
-                true ) );
+                ConfigurationLoader.IgnoredModulesOptions.OMIT
+            ) );
 
             ByteArrayOutputStream errorStream = new ByteArrayOutputStream();
-            checker.addListener( new DefaultLogger( ByteStreams.nullOutputStream(), true, errorStream, true ) );
+            checker.addListener(
+                new DefaultLogger(
+                    ByteStreams.nullOutputStream(),
+                    AutomaticBean.OutputStreamOptions.CLOSE,
+                    errorStream,
+                    AutomaticBean.OutputStreamOptions.CLOSE
+                )
+            );
 
             int errors = checker.process( findGeneratedFiles( new File( sourceOutputDir ) ) );
             if ( errors > 0 ) {