diff --git a/core/build.gradle b/core/build.gradle
index ba0469ca35..db161f711b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -29,11 +29,7 @@ sourceSets {
             }
         }
         resources {
-            srcDir 'java/test/junit'
-            include 'resources/*'
-            include 'net/i2p/crypto/eddsa/test.data'
-            include 'net/i2p/crypto/eddsa/math/baseDblPrecmp'
-            include 'net/i2p/crypto/eddsa/math/basePrecmp'
+            srcDir 'java/test/resources'
         }
     }
     jmh {
diff --git a/core/java/build.xml b/core/java/build.xml
index b65ca43fe0..a4e0f735ee 100644
--- a/core/java/build.xml
+++ b/core/java/build.xml
@@ -237,14 +237,6 @@
             </classpath>
             <compilerarg line="${javac.compilerargs}" />
         </javac>
-        <!-- EdDSA test vectors -->
-        <copy todir="./build/obj">
-            <fileset dir="./test/junit/">
-                <include name="net/i2p/crypto/eddsa/test.data"/>
-                <include name="net/i2p/crypto/eddsa/math/baseDblPrecmp"/>
-                <include name="net/i2p/crypto/eddsa/math/basePrecmp"/>
-            </fileset>
-        </copy>
     </target>
     <!-- jars with tests -->
     <target name="jarScalaTest" depends="scalatest.compileTest">
@@ -321,6 +313,7 @@
                 <pathelement location="${scalatest.jar}" />
                 <pathelement location="./build/obj_cobertura" />
                 <pathelement location="./build/obj" />
+                <pathelement location="./test/resources" />
                 <pathelement location="../../build/jbigi.jar" />
                 <pathelement location="${with.clover}" />
                 <pathelement location="${with.cobertura}" />
@@ -363,6 +356,7 @@
                 <pathelement location="${junit.home}/junit4.jar" />
                 <pathelement location="./build/obj_cobertura" />
                 <pathelement location="./build/obj" />
+                <pathelement location="./test/resources" />
                 <pathelement location="../../build/jbigi.jar" />
                 <pathelement location="${with.clover}" />
                 <pathelement location="${with.cobertura}" />
diff --git a/core/java/test/junit/resources/i2pseeds.su3 b/core/java/test/resources/i2pseeds.su3
similarity index 100%
rename from core/java/test/junit/resources/i2pseeds.su3
rename to core/java/test/resources/i2pseeds.su3
diff --git a/core/java/test/junit/resources/keystore.ks b/core/java/test/resources/keystore.ks
similarity index 100%
rename from core/java/test/junit/resources/keystore.ks
rename to core/java/test/resources/keystore.ks
diff --git a/core/java/test/junit/resources/meeh_at_mail.i2p.crt b/core/java/test/resources/meeh_at_mail.i2p.crt
similarity index 100%
rename from core/java/test/junit/resources/meeh_at_mail.i2p.crt
rename to core/java/test/resources/meeh_at_mail.i2p.crt
diff --git a/core/java/test/junit/net/i2p/crypto/eddsa/math/baseDblPrecmp b/core/java/test/resources/net/i2p/crypto/eddsa/math/baseDblPrecmp
similarity index 100%
rename from core/java/test/junit/net/i2p/crypto/eddsa/math/baseDblPrecmp
rename to core/java/test/resources/net/i2p/crypto/eddsa/math/baseDblPrecmp
diff --git a/core/java/test/junit/net/i2p/crypto/eddsa/math/basePrecmp b/core/java/test/resources/net/i2p/crypto/eddsa/math/basePrecmp
similarity index 100%
rename from core/java/test/junit/net/i2p/crypto/eddsa/math/basePrecmp
rename to core/java/test/resources/net/i2p/crypto/eddsa/math/basePrecmp
diff --git a/core/java/test/junit/net/i2p/crypto/eddsa/test.data b/core/java/test/resources/net/i2p/crypto/eddsa/test.data
similarity index 100%
rename from core/java/test/junit/net/i2p/crypto/eddsa/test.data
rename to core/java/test/resources/net/i2p/crypto/eddsa/test.data
diff --git a/core/java/test/junit/resources/publicKeyFile.crt b/core/java/test/resources/publicKeyFile.crt
similarity index 100%
rename from core/java/test/junit/resources/publicKeyFile.crt
rename to core/java/test/resources/publicKeyFile.crt
diff --git a/core/java/test/scalatest/net/i2p/crypto/CertUtilSpec.scala b/core/java/test/scalatest/net/i2p/crypto/CertUtilSpec.scala
index 63c5d5095c..033fcb5a28 100644
--- a/core/java/test/scalatest/net/i2p/crypto/CertUtilSpec.scala
+++ b/core/java/test/scalatest/net/i2p/crypto/CertUtilSpec.scala
@@ -10,10 +10,7 @@ import org.scalatest.Matchers
 class CertUtilSpec extends FunSpec with Matchers {
 
   describe("CertUtil") {
-    // For some stupid gradle issues, it don't copies reosurces. So hacky way.
-    // When added to junit directory, it get copied. Until a better way is found,
-    // this is the non-optimal solution.
-    val certFileUrl = getClass.getResource("/resources/meeh_at_mail.i2p.crt")
+    val certFileUrl = getClass.getResource("/meeh_at_mail.i2p.crt")
     val certFile = new File(certFileUrl.toURI)
 
     it("should be able to read a certificate") {
diff --git a/core/java/test/scalatest/net/i2p/crypto/SU3FileSpec.scala b/core/java/test/scalatest/net/i2p/crypto/SU3FileSpec.scala
index a75bd0f2fd..e5bf6fc9f3 100644
--- a/core/java/test/scalatest/net/i2p/crypto/SU3FileSpec.scala
+++ b/core/java/test/scalatest/net/i2p/crypto/SU3FileSpec.scala
@@ -17,10 +17,10 @@ class SU3FileSpec extends FunSpec with Matchers {
   }
 
   describe("SU3File") {
-    val certFileUrl = getClass.getResource("/resources/meeh_at_mail.i2p.crt")
+    val certFileUrl = getClass.getResource("/meeh_at_mail.i2p.crt")
     val certFile = new File(certFileUrl.toURI)
 
-    val seedFileUrl = getClass.getResource("/resources/i2pseeds.su3")
+    val seedFileUrl = getClass.getResource("/i2pseeds.su3")
     val seedFile = new File(seedFileUrl.toURI)
 
     it("should be able to verify a valid file") {
diff --git a/history.txt b/history.txt
index 2b9a929bf2..920c8b2b71 100644
--- a/history.txt
+++ b/history.txt
@@ -5,6 +5,7 @@
    - Fix compilation bug after SSU HMAC implementation move
    - Temporarily mitigate discrepancy between Ant and Gradle in
      SingleFileNamingServiceTest
+   - Unify core test resources across JUnit and ScalaTest
 
 2019-08-05 zzz
  * i2ptunnel: