diff --git a/pom.xml b/pom.xml
index 5f767d78..d1dc3d29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,7 +76,7 @@
 		<artifactory-maven-plugin.version>2.2.1</artifactory-maven-plugin.version>
 		<license-maven-plugin.version>1.16</license-maven-plugin.version>
 		<spring-javaformat-checkstyle.version>0.0.7</spring-javaformat-checkstyle.version>
-		<maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
+		<maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
 		<disable.checks>false</disable.checks>
 		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failOnViolation>true
diff --git a/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml b/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml
index 2fb36263..b7204284 100644
--- a/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml
+++ b/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml
@@ -3,11 +3,13 @@
 		"-//Puppy Crawl//DTD Suppressions 1.1//EN"
 		"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 <suppressions>
+	<suppress files="[\\/]src[\\/]test[\\/](java|groovy)[\\/]"
+			  checks="(Javadoc*|HideUtility*)"/>
 	<suppress files=".*sample.*" checks="(Javadoc*|HideUtility*)"/>
 	<suppress files=".*example.*" checks="(Javadoc*|HideUtility*)"/>
 	<suppress files=".*integration-tests.*" checks="(Javadoc*|HideUtility*)"/>
 	<suppress files="(.*Tests\.java|.*Tests\.groovy)" checks="Javadoc*"/>
-	<suppress files=".*src.test.java.*" checks="Javadoc*|HideUtility*"/>
+	<suppress files=".*src.test.java.*" checks="Javadoc*"/>
 	<suppress files="generated-sources" checks="[a-zA-Z0-9]*"/>
 	<suppress files=".*target.*" checks="[a-zA-Z0-9]*"/>
 	<suppress files=".*build.*" checks="[a-zA-Z0-9]*"/>
diff --git a/spring-cloud-build-tools/src/main/resources/checkstyle.xml b/spring-cloud-build-tools/src/main/resources/checkstyle.xml
index c3e1de40..e140830d 100644
--- a/spring-cloud-build-tools/src/main/resources/checkstyle.xml
+++ b/spring-cloud-build-tools/src/main/resources/checkstyle.xml
@@ -122,6 +122,11 @@
 			<property name="excludeScope" value="package"/>
 			<property name="authorFormat" value=".+\s.+"/>
 		</module>
+		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
+			<property name="scope" value="public"/>
+			<property name="excludeScope" value="package"/>
+			<property name="allowMissingJavadoc" value="true"/>
+		</module>
 		<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocVariableCheck">
 			<property name="scope" value="public"/>
 		</module>