diff --git a/build.gradle b/build.gradle
index 546952f984152681cb2799dbef56b3153e109821..ac800c40c0bdea90840b833b84e0fb1955315cfb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -278,7 +278,10 @@ rat {
 
     // Proto/grpc generated wrappers
     "**/apache_beam/portability/api/*_pb2*.py",
-    "**/go/pkg/beam/model/**/*.pb.go",
+    "**/go/pkg/beam/**/*.pb.go",
+
+    // Ignore Go test data files
+    "**/go/data/**",
 
     // VCF test files
     "**/apache_beam/testing/data/vcf/*",
@@ -290,18 +293,10 @@ check.dependsOn rat
 // to be specified on the commandline when executing locally.
 // This indirection also makes Jenkins use the branch of the PR
 // for the test definitions.
-
-def javaPreCommitRoots = [
-  ":sdks:java:core",
-  ":runners:direct-java",
-  ":sdks:java:fn-execution",
-]
 task javaPreCommit() {
   dependsOn ":rat"
-  for (String javaPreCommitRoot : javaPreCommitRoots) {
-    dependsOn javaPreCommitRoot + ":buildNeeded"
-    dependsOn javaPreCommitRoot + ":buildDependents"
-  }
+  dependsOn ":sdks:java:core:buildNeeded"
+  dependsOn ":sdks:java:core:buildDependents"
   dependsOn ":examples:java:preCommit"
 }