diff --git a/build.gradle b/build.gradle
index 73a9d578bd3..26921e81815 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,6 +66,8 @@ ext {
     plumeScriptsHome = "${project(':checker').projectDir}/bin-devel/.plume-scripts"
     htmlToolsHome = "${project(':checker').projectDir}/bin-devel/.html-tools"
     doLikeJavacHome = "${project(':checker').projectDir}/bin/.do-like-javac"
+    templateforCheckerDir = "${parentDir}/templatefora-checker"
+    demosDir = "${parentDir}/checker-framework.demos"
 
     javadocMemberLevel = JavadocMemberLevel.PROTECTED
 
@@ -865,7 +867,8 @@ createCloneTask('getGitScripts', 'https://github.com/eisop-plume-lib/git-scripts
 createCloneTask('getPlumeScripts', 'https://github.com/eisop-plume-lib/plume-scripts.git', plumeScriptsHome)
 createCloneTask('getHtmlTools', 'https://github.com/plume-lib/html-tools.git', htmlToolsHome)
 createCloneTask('getDoLikeJavac', 'https://github.com/opprop/do-like-javac.git', doLikeJavacHome)
-
+createCloneTask('getTemplatefora-checker', 'https://github.com/eisop/templatefora-checker.git', templateforCheckerDir)
+createCloneTask('getDemos', 'https://github.com/eisop/checker-framework.demos.git', demosDir)
 
 // No group so it does not show up in the output of `gradlew tasks`
 task pythonIsInstalled(type: Exec) {
diff --git a/checker/build.gradle b/checker/build.gradle
index caedf1412ce..e32fdb91ede 100644
--- a/checker/build.gradle
+++ b/checker/build.gradle
@@ -327,28 +327,9 @@ task demosTests(dependsOn: assembleForJavac, group: 'Verification') {
     def injected = project.objects.newInstance(InjectedExecOps)
 
     doLast {
-        File demosDir = new File(projectDir, '../../checker-framework.demos');
-        if (!demosDir.exists()) {
-            injected.execOps.exec {
-                workingDir file(demosDir.toString() + '/../')
-                executable 'git'
-                args = [
-                    'clone',
-                    '--depth',
-                    '1',
-                    'https://github.com/eisop/checker-framework.demos.git'
-                ]
-            }
-        } else {
-            injected.execOps.exec {
-                workingDir demosDir
-                executable 'git'
-                args = [
-                    'pull',
-                    'https://github.com/eisop/checker-framework.demos.git'
-                ]
-                ignoreExitValue = true
-            }
+        injected.execOps.exec {
+            workingDir = rootDir
+            commandLine "./gradlew", "getDemos"
         }
         ant.properties.put('checker.lib', file("${projectDir}/dist/checker.jar").absolutePath)
         ant.ant(dir: demosDir.toString())
@@ -361,28 +342,9 @@ task templateTests(dependsOn: assembleForJavac, group: 'Verification') {
     def injected = project.objects.newInstance(InjectedExecOps)
 
     doLast {
-        File templateforCheckerDir = new File(projectDir, '../../templatefora-checker');
-        if (!templateforCheckerDir.exists()) {
-            injected.execOps.exec {
-                workingDir file(templateforCheckerDir.toString() + '/../')
-                executable 'git'
-                args = [
-                    'clone',
-                    '--depth',
-                    '1',
-                    'https://github.com/eisop/templatefora-checker.git'
-                ]
-            }
-        } else {
-            injected.execOps.exec {
-                workingDir templateforCheckerDir
-                executable 'git'
-                args = [
-                    'pull',
-                    'https://github.com/eisop/templatefora-checker.git'
-                ]
-                ignoreExitValue = true
-            }
+        injected.execOps.exec {
+            workingDir = rootDir
+            commandLine "./gradlew", "getTemplatefora-checker"
         }
         println "Running Gradle build in $templateforCheckerDir"
         injected.execOps.exec {
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 73848a6b390..b11db7dd358 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -7,7 +7,7 @@ Version 3.42.0-eisop6 (January ??, 2025)
 
 **Closed issues:**
 
-eisop#1003, eisop#1033.
+eisop#1003, eisop#1033, eisop#1051.
 
 
 Version 3.42.0-eisop5 (December 20, 2024)