diff --git a/grgit-gradle/src/compatTest/groovy/org/ajoberstar/grgit/gradle/GrgitPluginMultiProjectCompatTest.groovy b/grgit-gradle/src/compatTest/groovy/org/ajoberstar/grgit/gradle/GrgitPluginMultiProjectCompatTest.groovy
new file mode 100644
index 00000000..9ea9e7c9
--- /dev/null
+++ b/grgit-gradle/src/compatTest/groovy/org/ajoberstar/grgit/gradle/GrgitPluginMultiProjectCompatTest.groovy
@@ -0,0 +1,144 @@
+package org.ajoberstar.grgit.gradle
+
+import spock.lang.Specification
+
+import org.ajoberstar.grgit.Grgit
+import org.gradle.testkit.runner.GradleRunner
+import org.gradle.testkit.runner.BuildResult
+import org.gradle.testkit.runner.TaskOutcome
+import spock.lang.TempDir
+
+class GrgitPluginMultiProjectCompatTest extends Specification {
+  @TempDir File tempDir
+  File projectDir
+    File settingsFile
+    File buildRootFile
+    File build1File
+    File build2File
+
+  def setup() {
+    projectDir = new File(tempDir, 'project')
+        settingsFile = projectFile('settings.gradle')
+        settingsFile << '''\
+include 'sub1', 'sub2'
+'''
+
+//         buildRootFile = projectFile('build.gradle')
+//         buildRootFile << '''\
+// plugins {
+//   id 'org.ajoberstar.grgit'
+// }
+
+// task checkGrgitNull {
+//   doLast {
+//     assert grgit == null
+//   }
+// }
+
+// task describeGrgit {
+//   doLast {
+//     println 'From root'
+//     println grgit.describe()
+//   }
+// }
+// '''
+
+        build1File = projectFile('sub1/build.gradle')
+        build1File << '''\
+plugins {
+  id 'org.ajoberstar.grgit'
+}
+
+task checkGrgitNull {
+  doLast {
+    assert grgit == null
+  }
+}
+
+task describeGrgit {
+  doLast {
+    println 'From sub1'
+    println grgit.describe()
+  }
+}
+'''
+
+        build2File = projectFile('sub2/build.gradle')
+        build2File << '''\
+plugins {
+  id 'org.ajoberstar.grgit'
+}
+
+task checkGrgitNull {
+  doLast {
+    assert grgit == null
+  }
+}
+
+task describeGrgit {
+  doLast {
+    println 'From sub2'
+    println grgit.describe()
+  }
+}
+'''
+  }
+
+  def 'with no repo, plugin sets grgit to null'() {
+    when:
+    def result = build('checkGrgitNull', '--configuration-cache')
+    then:
+    // result.task(':checkGrgitNull').outcome == TaskOutcome.SUCCESS
+    result.task(':sub1:checkGrgitNull').outcome == TaskOutcome.SUCCESS
+    result.task(':sub2:checkGrgitNull').outcome == TaskOutcome.SUCCESS
+  }
+
+  def 'with repo, plugin opens the repo as grgit'() {
+    given:
+    Grgit git = Grgit.init(dir: projectDir)
+    projectFile('1.txt') << '1'
+    git.add(patterns: ['1.txt'])
+    git.commit(message: 'yay')
+    git.tag.add(name: '1.0.0')
+    when:
+    def result = build('describeGrgit', '--quiet', '--configuration-cache')
+    then:
+    // result.task(':describeGrgit').outcome == TaskOutcome.SUCCESS
+    result.task(':sub1:describeGrgit').outcome == TaskOutcome.SUCCESS
+    result.task(':sub2:describeGrgit').outcome == TaskOutcome.SUCCESS
+    // result.output.normalize() == 'From root\n1.0.0\nFrom sub1\n1.0.0\nFrom sub2\n1.0.0\n'
+    result.output.normalize() == 'From sub1\n1.0.0\nFrom sub2\n1.0.0\n'
+  }
+
+  def 'with repo, plugin closes the repo after build is finished'() {
+    given:
+    Grgit git = Grgit.init(dir: projectDir)
+    projectFile('1.txt') << '1'
+    git.add(patterns: ['1.txt'])
+    git.commit(message: 'yay')
+    git.tag.add(name: '1.0.0')
+    when:
+    def result = build('describeGrgit', '--info', '--configuration-cache')
+    then:
+    // result.task(':describeGrgit').outcome == TaskOutcome.SUCCESS
+    result.task(':sub1:describeGrgit').outcome == TaskOutcome.SUCCESS
+    result.task(':sub2:describeGrgit').outcome == TaskOutcome.SUCCESS
+    result.output.contains('Closing Git repo')
+  }
+
+  private BuildResult build(String... args) {
+    return GradleRunner.create()
+      .withGradleVersion(System.properties['compat.gradle.version'])
+      .withPluginClasspath()
+      .withProjectDir(projectDir)
+      .forwardOutput()
+      .withArguments((args + '--stacktrace') as String[])
+      .build()
+  }
+
+  private File projectFile(String path) {
+    File file = new File(projectDir, path)
+    file.parentFile.mkdirs()
+    return file
+  }
+}
diff --git a/grgit-gradle/src/compatTest/groovy/org/ajoberstar/grgit/gradle/GrgitServicePluginMultiProjectCompatTest.groovy b/grgit-gradle/src/compatTest/groovy/org/ajoberstar/grgit/gradle/GrgitServicePluginMultiProjectCompatTest.groovy
new file mode 100644
index 00000000..bfe7bd57
--- /dev/null
+++ b/grgit-gradle/src/compatTest/groovy/org/ajoberstar/grgit/gradle/GrgitServicePluginMultiProjectCompatTest.groovy
@@ -0,0 +1,182 @@
+package org.ajoberstar.grgit.gradle
+
+import spock.lang.Specification
+
+import org.ajoberstar.grgit.Grgit
+import org.gradle.testkit.runner.GradleRunner
+import org.gradle.testkit.runner.BuildResult
+import org.gradle.testkit.runner.TaskOutcome
+import spock.lang.TempDir
+
+class GrgitServicePluginMultiProjectCompatTest extends Specification {
+    @TempDir File tempDir
+    File projectDir
+    File settingsFile
+    File buildRootFile
+    File build1File
+    File build2File
+
+    def setup() {
+        projectDir = new File(tempDir, 'project')
+        settingsFile = projectFile('settings.gradle')
+        settingsFile << '''\
+include 'sub1', 'sub2'
+'''
+
+        buildRootFile = projectFile('build.gradle')
+        buildRootFile << '''\
+import org.ajoberstar.grgit.gradle.GrgitService
+
+plugins {
+  id 'org.ajoberstar.grgit.service'
+}
+
+tasks.register("doStuff", DoStuffTask.class) {
+    service = grgitService.service
+}
+
+class DoStuffTask extends DefaultTask {
+    @Input
+    final Property<GrgitService> service
+
+    @Inject
+    DoStuffTask(ObjectFactory objectFactory) {
+        this.service = objectFactory.property(GrgitService.class);
+    }
+
+    @TaskAction
+    void execute() {
+        println "From root"
+        println service.get().grgit.describe()
+    }
+}
+'''
+
+        build1File = projectFile('sub1/build.gradle')
+        build1File << '''\
+import org.ajoberstar.grgit.gradle.GrgitService
+
+plugins {
+  id 'org.ajoberstar.grgit.service'
+}
+
+tasks.register("doStuff", DoStuffTask.class) {
+    service = grgitService.service
+}
+
+class DoStuffTask extends DefaultTask {
+    @Input
+    final Property<GrgitService> service
+
+    @Inject
+    DoStuffTask(ObjectFactory objectFactory) {
+        this.service = objectFactory.property(GrgitService.class);
+    }
+
+    @TaskAction
+    void execute() {
+        println "From sub1"
+        println service.get().grgit.describe()
+    }
+}
+'''
+
+        build2File = projectFile('sub2/build.gradle')
+        build2File << '''\
+import org.ajoberstar.grgit.gradle.GrgitService
+
+plugins {
+  id 'org.ajoberstar.grgit.service'
+}
+
+tasks.register("doStuff", DoStuffTask.class) {
+    service = grgitService.service
+}
+
+class DoStuffTask extends DefaultTask {
+    @Input
+    final Property<GrgitService> service
+
+    @Inject
+    DoStuffTask(ObjectFactory objectFactory) {
+        this.service = objectFactory.property(GrgitService.class);
+    }
+
+    @TaskAction
+    void execute() {
+        println "From sub2"
+        println service.get().grgit.describe()
+    }
+}
+'''
+    }
+
+    def 'with no repo, accessing service fails'() {
+        given:
+        // nothing
+        when:
+        def result = buildAndFail('doStuff', '--configuration-cache')
+        then:
+        result.task(':doStuff')?.outcome == TaskOutcome.FAILED
+        result.task(':sub1:doStuff')?.outcome == null
+        result.task(':sub2:doStuff')?.outcome == null
+    }
+
+    def 'with repo, plugin opens the repo as grgit'() {
+        given:
+        Grgit git = Grgit.init(dir: projectDir)
+        projectFile('1.txt') << '1'
+        git.add(patterns: ['1.txt'])
+        git.commit(message: 'yay')
+        git.tag.add(name: '1.0.0')
+        when:
+        def result = build('doStuff', '--quiet', '--configuration-cache')
+        then:
+        result.task(':doStuff').outcome == TaskOutcome.SUCCESS
+        result.task(':sub1:doStuff').outcome == TaskOutcome.SUCCESS
+        result.task(':sub2:doStuff').outcome == TaskOutcome.SUCCESS
+        result.output.normalize() == 'From root\n1.0.0\nFrom sub1\n1.0.0\nFrom sub2\n1.0.0\n'
+    }
+
+    def 'with repo, plugin closes the repo after build is finished'() {
+        given:
+        Grgit git = Grgit.init(dir: projectDir)
+        projectFile('1.txt') << '1'
+        git.add(patterns: ['1.txt'])
+        git.commit(message: 'yay')
+        git.tag.add(name: '1.0.0')
+        when:
+        def result = build('doStuff', '--info', '--configuration-cache')
+        then:
+        result.task(':doStuff').outcome == TaskOutcome.SUCCESS
+        result.task(':sub1:doStuff').outcome == TaskOutcome.SUCCESS
+        result.task(':sub2:doStuff').outcome == TaskOutcome.SUCCESS
+        result.output.contains('Closing Git repo')
+    }
+
+    private BuildResult build(String... args) {
+        return GradleRunner.create()
+                .withGradleVersion(System.properties['compat.gradle.version'])
+                .withPluginClasspath()
+                .withProjectDir(projectDir)
+                .forwardOutput()
+                .withArguments((args + '--stacktrace') as String[])
+                .build()
+    }
+
+    private BuildResult buildAndFail(String... args) {
+        return GradleRunner.create()
+                .withGradleVersion(System.properties['compat.gradle.version'])
+                .withPluginClasspath()
+                .withProjectDir(projectDir)
+                .forwardOutput()
+                .withArguments((args + '--stacktrace') as String[])
+                .buildAndFail()
+    }
+
+    private File projectFile(String path) {
+        File file = new File(projectDir, path)
+        file.parentFile.mkdirs()
+        return file
+    }
+}