diff --git a/apps/routerconsole/build.gradle b/apps/routerconsole/build.gradle
index 4a10634b6..da26c367e 100644
--- a/apps/routerconsole/build.gradle
+++ b/apps/routerconsole/build.gradle
@@ -7,11 +7,6 @@ sourceSets {
             srcDir 'java/src'
         }
     }
-    test {
-        scala {
-            srcDir 'java/test/scalatest'
-        }
-    }
 }
 
 dependencies {
@@ -28,6 +23,13 @@ dependencies {
 }
 
 if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
+    sourceSets {
+        test {
+            scala {
+                srcDir 'java/test/scalatest'
+            }
+        }
+    }
     task scalaTest(dependsOn: ['testClasses'], type: JavaExec) {
         main = 'org.scalatest.tools.Runner'
         args = ['-R', 'build/classes/scala/test', '-o']
diff --git a/core/build.gradle b/core/build.gradle
index f7d9bb864..64ad2f882 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -31,9 +31,6 @@ sourceSets {
             include 'net/i2p/crypto/eddsa/math/baseDblPrecmp'
             include 'net/i2p/crypto/eddsa/math/basePrecmp'
         }
-        scala {
-            srcDir 'java/test/scalatest'
-        }
     }
 }
 
@@ -46,6 +43,13 @@ dependencies {
 }
 
 if (JavaVersion.current() != JavaVersion.VERSION_1_7) {
+    sourceSets {
+        test {
+            scala {
+                srcDir 'java/test/scalatest'
+            }
+        }
+    }
     task scalaTest(dependsOn: ['testClasses'], type: JavaExec) {
         main = 'org.scalatest.tools.Runner'
         args = ['-R', 'build/classes/scala/test', '-o']