diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index 0e5c6cbebb0..699e130ed22 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -22,7 +22,7 @@ publishing {
   publications {
     maven(MavenPublication) { MavenPublication publication ->
       if (project.plugins.hasPlugin('com.gradleup.shadow')) {
-        publication.artifact(project.tasks.shadowJar)
+        publication.artifact(project.tasks.named("shadowJar"))
 
         // Required by Maven Central:
         publication.artifact sourcesJar
diff --git a/gradle/test-suites.gradle b/gradle/test-suites.gradle
index 2ffd077fd19..cdcedb8a741 100644
--- a/gradle/test-suites.gradle
+++ b/gradle/test-suites.gradle
@@ -57,8 +57,8 @@ ext.addTestSuiteExtendingForDir = { testSuiteName, parentSuiteName, dirName ->
   }
 
   tasks.register("${testSuiteName}Jar", Jar) {
-    dependsOn(tasks.named("${testSuiteName}Classes").get())
-    from(sourceSets.named(testSuiteName).get().output)
+    dependsOn(tasks.named("${testSuiteName}Classes"))
+    from(sourceSets.named(testSuiteName).map { it.output })
     archiveClassifier = testSuiteName
   }