diff --git a/buildSrc/src/main/groovy/atlas-web-app.java-conventions.gradle b/buildSrc/src/main/groovy/atlas-web-app.java-conventions.gradle
index aafd45fb..55330537 100644
--- a/buildSrc/src/main/groovy/atlas-web-app.java-conventions.gradle
+++ b/buildSrc/src/main/groovy/atlas-web-app.java-conventions.gradle
@@ -121,19 +121,19 @@ test {
     jvmArgs '-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005'
   }
 
+  if (project.hasProperty('excludeTests')) {
+    exclude project.property('excludeTests')
+  }
+
   if (project.hasProperty('testResultsPath')) {
-    reporting.baseDir = "${buildDir}/reports/" + project.property('testResultsPath')
-    testResultsDirName = "${buildDir}/test-results/" + project.property('testResultsPath')
+    testReportDirName = project.property('testResultsPath')
+    testResultsDirName = project.property('testResultsPath')
 
     jacoco {
       destinationFile = file("${buildDir}/jacoco/${project.property('testResultsPath')}.exec")
     }
   }
 
-  if (project.hasProperty('excludeTests')) {
-    exclude project.property('excludeTests')
-  }
-
   testLogging {
     outputs.upToDateWhen {false}
     showStandardStreams = true
@@ -148,7 +148,7 @@ jacocoTestReport {
   executionData.setFrom fileTree(dir: "${buildDir}/jacoco", include: '*.exec' )
 
   reports {
-    html.destination file("${buildDir}/jacoco/html")
+    html.outputLocation = layout.buildDirectory.dir("reports/jacoco")
   }
 }