diff --git a/org.eclipse.jgit.test/tests.bzl b/org.eclipse.jgit.test/tests.bzl
index 7ff90d484..345da8110 100644
--- a/org.eclipse.jgit.test/tests.bzl
+++ b/org.eclipse.jgit.test/tests.bzl
@@ -7,6 +7,7 @@ def tests(tests):
     for src in tests:
         name = src[len("tst/"):len(src) - len(".java")].replace("/", "_")
         labels = []
+        timeout = "moderate"
         if name.startswith("org_eclipse_jgit_"):
             package = name[len("org.eclipse.jgit_"):]
             if package.startswith("internal_storage_"):
@@ -51,6 +52,8 @@ def tests(tests):
         heap_size = "-Xmx256m"
         if src.endswith("HugeCommitMessageTest.java"):
             heap_size = "-Xmx512m"
+        if src.endswith("EolRepositoryTest.java") or src.endswith("GcCommitSelectionTest.java"):
+            timeout = "long"
 
         junit_tests(
             name = name,
@@ -68,4 +71,5 @@ def tests(tests):
             ],
             flaky = flaky,
             jvm_flags = [heap_size, "-Dfile.encoding=UTF-8"],
+            timeout = timeout,
         )