diff --git a/pom.xml b/pom.xml
index 8f411a6f..f39e8e18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,10 @@
 		<maven-checkstyle-plugin.failsOnError>false</maven-checkstyle-plugin.failsOnError>
 		<maven-checkstyle-plugin.failOnViolation>false
 		</maven-checkstyle-plugin.failOnViolation>
+		<maven-checkstyle-plugin.includeTestSourceDirectory>false
+		</maven-checkstyle-plugin.includeTestSourceDirectory>
+		<spring-cloud-build-checkstyle.branch>master</spring-cloud-build-checkstyle.branch>
+		<checkstyle.suppressions.file>https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/${spring-cloud-build-checkstyle.branch}/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml</checkstyle.suppressions.file>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -333,10 +337,11 @@ limitations under the License.
 							<configuration>
 								<configLocation>checkstyle.xml</configLocation>
 								<headerLocation>checkstyle-header.txt</headerLocation>
-								<propertyExpansion>checkstyle.build.directory=${project.build.directory}</propertyExpansion>
+								<propertyExpansion>checkstyle.build.directory=${project.build.directory}
+									checkstyle.suppressions.file=${checkstyle.suppressions.file}</propertyExpansion>
 								<consoleOutput>true</consoleOutput>
 								<!-- TODO: Start fixing the errors -->
-								<includeTestSourceDirectory>false</includeTestSourceDirectory>
+								<includeTestSourceDirectory>${maven-checkstyle-plugin.includeTestSourceDirectory}</includeTestSourceDirectory>
 								<failsOnError>${maven-checkstyle-plugin.failsOnError}</failsOnError>
 								<failOnViolation>${maven-checkstyle-plugin.failOnViolation}</failOnViolation>
 							</configuration>
diff --git a/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml b/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml
index fff85210..91dd7e87 100644
--- a/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml
+++ b/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml
@@ -3,7 +3,8 @@
 		"-//Puppy Crawl//DTD Suppressions 1.1//EN"
 		"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 <suppressions>
-	<suppress files="[\\/]src[\\/]test[\\/]java[\\/]" checks="Javadoc*" />
-	<suppress files=".*Tests\.java" checks="Javadoc*" />
+	<suppress files="[\\/]src[\\/]test[\\/](java|groovy)[\\/]" checks="(Javadoc*|HideUtility*)" />
+	<suppress files=".*samples.*" checks="(Javadoc*|HideUtility*)" />
+	<suppress files="(.*Tests\.java|.*Tests\.groovy)" checks="Javadoc*" />
 	<suppress files="generated-sources" checks="[a-zA-Z0-9]*" />
 </suppressions>
\ No newline at end of file
diff --git a/spring-cloud-build-tools/src/main/resources/checkstyle.xml b/spring-cloud-build-tools/src/main/resources/checkstyle.xml
index c6413df9..61573a72 100644
--- a/spring-cloud-build-tools/src/main/resources/checkstyle.xml
+++ b/spring-cloud-build-tools/src/main/resources/checkstyle.xml
@@ -5,7 +5,7 @@
 <module name="com.puppycrawl.tools.checkstyle.Checker">
 
 	<module name="SuppressionFilter">
-		<property name="file" value="src/checkstyle/checkstyle-suppressions.xml"/>
+		<property name="file" value="${checkstyle.suppressions.file}"/>
 		<property name="optional" value="true"/>
 	</module>