diff --git a/shared/java/javastyle.gradle b/shared/java/javastyle.gradle
index b8771616c3..9df2d5f338 100644
--- a/shared/java/javastyle.gradle
+++ b/shared/java/javastyle.gradle
@@ -85,5 +85,9 @@ spotbugs {
 task javaFormat {
     dependsOn(tasks.withType(Checkstyle))
     dependsOn(tasks.withType(Pmd))
+    dependsOn 'spotlessApply'
+}
+
+tasks.withType(Checkstyle) {
+    it.mustRunAfter 'spotlessApply'
 }
-javaFormat.dependsOn 'spotlessApply'