diff --git a/Jenkinsfile b/Jenkinsfile
index 6e07571de3..7f5af82126 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,7 +19,7 @@ try {
 					currentBuild.result = 'FAILED: check'
 					throw e
 				} finally {
-					junit '**/build/*-results/*.xml'
+					junit '**/build/test-results/*/*.xml'
 				}
 			}
 		}
diff --git a/build.gradle b/build.gradle
index 40fed3c1e7..be5ff85269 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath 'io.spring.gradle:spring-build-conventions:0.0.16.RELEASE'
+		classpath 'io.spring.gradle:spring-build-conventions:0.0.18.RELEASE'
 		classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion"
 	}
 	repositories {
diff --git a/etc/checkstyle/checkstyle.xml b/etc/checkstyle/checkstyle.xml
index 520c7d9cb4..d614db912f 100644
--- a/etc/checkstyle/checkstyle.xml
+++ b/etc/checkstyle/checkstyle.xml
@@ -4,12 +4,12 @@
 <module name="Checker">
 	<!-- Suppressions -->
 	<module name="SuppressionFilter">
-		<property name="file" value="${configDir}/suppressions.xml"/>
+		<property name="file" value="${config_loc}/suppressions.xml"/>
 	</module>
 
 	<!-- Root Checks -->
 	<module name="RegexpHeader">
-		<property name="headerFile" value="${configDir}/header.txt"/>
+		<property name="headerFile" value="${config_loc}/header.txt"/>
 		<property name="fileExtensions" value="java"/>
 	</module>