diff --git a/build.gradle b/build.gradle
index 0d9851a14..1bf323328 100644
--- a/build.gradle
+++ b/build.gradle
@@ -169,10 +169,10 @@ allprojects {
   if (project.name == 'services') return
 
   repositories {
-    if (rootProject.mavenUrl) {
+    if (!mavenUrl.isEmpty()) {
       maven {
-        println "Java dependencies: Using repo $pluginsUrl..."
-        url rootProject.mavenUrl
+        println "Java dependencies: Using repo ${mavenUrl}..."
+        url mavenUrl
       }
     } else {
       println "Java dependencies: Using Maven Central..."
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 5570135af..3a60cb440 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import static com.google.common.base.Strings.isNullOrEmpty;
+
 buildscript {
   if (project.enableDependencyLocking.toBoolean()) {
     // Lock buildscript dependencies.
@@ -40,13 +42,13 @@ if (rootProject.enableDependencyLocking.toBoolean()) {
 }
 
 repositories {
-  if (project.ext.properties.mavenUrl == null) {
-    println "Plugin dependencies: Using Maven central..."
+  if (isNullOrEmpty(project.ext.properties.mavenUrl)) {
+    println "Java dependencies: Using Maven central..."
     mavenCentral()
     google()
   } else {
     maven {
-      println "Plugin dependencies: Using repo ${mavenUrl}..."
+      println "Java dependencies: Using repo ${mavenUrl}..."
       url mavenUrl
     }
   }
@@ -82,6 +84,7 @@ dependencies {
   testCompile deps['com.google.truth:truth']
   testCompile deps['com.google.truth.extensions:truth-java8-extension']
   testCompile deps['junit:junit']
+  testCompile deps['org.junit.jupiter:junit-jupiter-api']
   testCompile deps['org.junit.jupiter:junit-jupiter-engine']
   testCompile deps['org.junit.vintage:junit-vintage-engine']
   testCompile deps['org.mockito:mockito-core']
diff --git a/common/build.gradle b/common/build.gradle
index 327e58fe9..7b629e9d3 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -62,6 +62,7 @@ dependencies {
   testingCompile deps['io.github.java-diff-utils:java-diff-utils']
 
   testCompile deps['junit:junit']
+  testCompile deps['org.junit.jupiter:junit-jupiter-api']
   testCompile deps['org.junit.jupiter:junit-jupiter-engine']
   testCompile deps['org.junit.vintage:junit-vintage-engine']
 }
diff --git a/core/build.gradle b/core/build.gradle
index c49781e9b..8f1bf2616 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -300,6 +300,7 @@ dependencies {
   testCompile deps['org.hamcrest:hamcrest-library']
   compile deps['org.hibernate:hibernate-hikaricp']
   testCompile deps['junit:junit']
+  testCompile deps['org.junit.jupiter:junit-jupiter-api']
   testCompile deps['org.junit.jupiter:junit-jupiter-engine']
   testCompile deps['org.junit.vintage:junit-vintage-engine']
   testCompile deps['org.mockito:mockito-core']
diff --git a/db/build.gradle b/db/build.gradle
index bb8f2f5b5..4ae0cc011 100644
--- a/db/build.gradle
+++ b/db/build.gradle
@@ -155,6 +155,7 @@ dependencies {
   testCompile deps['com.google.truth:truth']
   testRuntime deps['io.github.java-diff-utils:java-diff-utils']
   testCompile deps['junit:junit']
+  testCompile deps['org.junit.jupiter:junit-jupiter-api']
   testCompile deps['org.junit.jupiter:junit-jupiter-engine']
   testCompile deps['org.junit.vintage:junit-vintage-engine']
   testCompile deps['org.testcontainers:postgresql']
diff --git a/dependencies.gradle b/dependencies.gradle
index 15aaca4ef..635f05a7d 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -98,6 +98,7 @@ ext {
       'jline:jline:1.0',
       'joda-time:joda-time:2.9.2',
       'junit:junit:4.13',
+      'org.junit.jupiter:junit-jupiter-api:5.6.0',
       'org.junit.jupiter:junit-jupiter-engine:5.6.0',
       'org.junit.vintage:junit-vintage-engine:5.6.0',
       'org.apache.avro:avro:1.8.2',
diff --git a/networking/build.gradle b/networking/build.gradle
index df1d2a4b3..1385caf04 100644
--- a/networking/build.gradle
+++ b/networking/build.gradle
@@ -34,6 +34,7 @@ dependencies {
 
   testCompile deps['com.google.truth:truth']
   testCompile deps['junit:junit']
+  testCompile deps['org.junit.jupiter:junit-jupiter-api']
   testCompile deps['org.junit.jupiter:junit-jupiter-engine']
   testCompile deps['org.junit.vintage:junit-vintage-engine']
   testCompile deps['org.bouncycastle:bcpkix-jdk15on']
diff --git a/prober/build.gradle b/prober/build.gradle
index 03692eba7..15ac56353 100644
--- a/prober/build.gradle
+++ b/prober/build.gradle
@@ -49,6 +49,7 @@ dependencies {
     testCompile deps['com.google.monitoring-client:contrib']
     testCompile deps['com.google.truth:truth']
     testCompile deps['junit:junit']
+    testCompile deps['org.junit.jupiter:junit-jupiter-api']
     testCompile deps['org.junit.jupiter:junit-jupiter-engine']
     testCompile deps['org.junit.vintage:junit-vintage-engine']
     testCompile deps['org.mockito:mockito-core']
diff --git a/proxy/build.gradle b/proxy/build.gradle
index 5b54f0d16..47a420fae 100644
--- a/proxy/build.gradle
+++ b/proxy/build.gradle
@@ -76,6 +76,7 @@ dependencies {
   testCompile deps['com.google.truth:truth']
   testCompile deps['org.yaml:snakeyaml']
   testCompile deps['junit:junit']
+  testCompile deps['org.junit.jupiter:junit-jupiter-api']
   testCompile deps['org.junit.jupiter:junit-jupiter-engine']
   testCompile deps['org.junit.vintage:junit-vintage-engine']
   testCompile deps['org.mockito:mockito-core']
diff --git a/settings.gradle b/settings.gradle
index 43ad28fbb..d9da1eb02 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-if (pluginsUrl) {
+if (!pluginsUrl.isEmpty()) {
   println "Plugins: Using repo $pluginsUrl..."
   pluginManagement {
     repositories {
diff --git a/util/build.gradle b/util/build.gradle
index aa8e67375..2751aee21 100644
--- a/util/build.gradle
+++ b/util/build.gradle
@@ -38,6 +38,7 @@ dependencies {
   testCompile deps['com.google.guava:guava-testlib']
   testCompile deps['com.google.truth:truth']
   testCompile deps['junit:junit']
+  testCompile deps['org.junit.jupiter:junit-jupiter-api']
   testCompile deps['org.junit.jupiter:junit-jupiter-engine']
   testCompile deps['org.junit.vintage:junit-vintage-engine']
   testCompile deps['org.hamcrest:hamcrest-all']