diff --git a/java/build.gradle.kts b/java/build.gradle.kts
index 3617b457f..71dbffe69 100644
--- a/java/build.gradle.kts
+++ b/java/build.gradle.kts
@@ -15,6 +15,11 @@ sourceSets{
             exclude("processing/mode/java/preproc/**")
         }
     }
+    test{
+        java{
+            srcDirs("test")
+        }
+    }
 }
 
 dependencies{
@@ -29,6 +34,9 @@ dependencies{
     implementation("org.eclipse.lsp4j:org.eclipse.lsp4j:0.22.0")
     implementation("org.jsoup:jsoup:1.17.2")
     implementation("org.antlr:antlr4:4.7.2")
+
+    testImplementation("junit:junit:4.13.2")
+    testImplementation("org.mockito:mockito-core:4.11.0")
 }
 
 tasks.compileJava{
@@ -43,3 +51,8 @@ tasks.register<Copy>("extraResources"){
 }
 tasks.jar { dependsOn("extraResources") }
 tasks.processResources{ finalizedBy("extraResources") }
+tasks.compileTestJava{ finalizedBy("extraResources") }
+
+tasks.test {
+    useJUnit()
+}
\ No newline at end of file
diff --git a/java/lsp/build.gradle.kts b/java/lsp/build.gradle.kts
index cf915ad88..8633dcab4 100644
--- a/java/lsp/build.gradle.kts
+++ b/java/lsp/build.gradle.kts
@@ -25,6 +25,7 @@ sourceSets{
 
 dependencies{
     implementation(project(":core"))
+    implementation(project(":java:preprocessor"))
 
     implementation("org.eclipse.lsp4j:org.eclipse.lsp4j:0.22.0")
     implementation("org.jsoup:jsoup:1.17.2")
diff --git a/java/test/processing/mode/java/CachedRuntimePathFactoryTest.java b/java/test/processing/mode/java/CachedRuntimePathFactoryTest.java
index fdf42e541..33d9bfcf8 100644
--- a/java/test/processing/mode/java/CachedRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/CachedRuntimePathFactoryTest.java
@@ -23,6 +23,7 @@ package processing.mode.java;
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
+import processing.mode.java.preproc.ImportStatement;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/java/test/processing/mode/java/CodeFolderRuntimePathFactoryTest.java b/java/test/processing/mode/java/CodeFolderRuntimePathFactoryTest.java
index 95b0c90f4..8cdeed6b1 100644
--- a/java/test/processing/mode/java/CodeFolderRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/CodeFolderRuntimePathFactoryTest.java
@@ -23,6 +23,7 @@ package processing.mode.java;
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
+import processing.mode.java.preproc.ImportStatement;
 
 import java.io.File;
 import java.util.List;
diff --git a/java/test/processing/mode/java/CoreLibraryRuntimePathFactoryTest.java b/java/test/processing/mode/java/CoreLibraryRuntimePathFactoryTest.java
index 9f9b608e3..939e0117c 100644
--- a/java/test/processing/mode/java/CoreLibraryRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/CoreLibraryRuntimePathFactoryTest.java
@@ -23,6 +23,7 @@ package processing.mode.java;
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
+import processing.mode.java.preproc.ImportStatement;
 
 import java.util.List;
 
diff --git a/java/test/processing/mode/java/ImportStatementTest.java b/java/test/processing/mode/java/ImportStatementTest.java
index a4a3dd97f..14bf310c9 100644
--- a/java/test/processing/mode/java/ImportStatementTest.java
+++ b/java/test/processing/mode/java/ImportStatementTest.java
@@ -3,6 +3,7 @@ package processing.mode.java;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import processing.mode.java.preproc.ImportStatement;
 
 
 public class ImportStatementTest {
diff --git a/java/test/processing/mode/java/JavaFxRuntimePathFactoryTest.java b/java/test/processing/mode/java/JavaFxRuntimePathFactoryTest.java
index b61889cd6..c4c67e973 100644
--- a/java/test/processing/mode/java/JavaFxRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/JavaFxRuntimePathFactoryTest.java
@@ -23,6 +23,7 @@ package processing.mode.java;
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
+import processing.mode.java.preproc.ImportStatement;
 
 import java.util.List;
 
diff --git a/java/test/processing/mode/java/JavaRuntimePathFactoryTest.java b/java/test/processing/mode/java/JavaRuntimePathFactoryTest.java
index ae6742227..637f058d8 100644
--- a/java/test/processing/mode/java/JavaRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/JavaRuntimePathFactoryTest.java
@@ -23,6 +23,7 @@ package processing.mode.java;
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
+import processing.mode.java.preproc.ImportStatement;
 
 import java.util.List;
 
diff --git a/java/test/processing/mode/java/LibrarySearchRuntimePathFactoryTest.java b/java/test/processing/mode/java/LibrarySearchRuntimePathFactoryTest.java
index ed7210fd4..92a516fc3 100644
--- a/java/test/processing/mode/java/LibrarySearchRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/LibrarySearchRuntimePathFactoryTest.java
@@ -23,6 +23,7 @@ package processing.mode.java;
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
+import processing.mode.java.preproc.ImportStatement;
 
 import java.util.List;
 
diff --git a/java/test/processing/mode/java/LibrarySketchRuntimePathFactoryTest.java b/java/test/processing/mode/java/LibrarySketchRuntimePathFactoryTest.java
index c9df2b28c..a65e5de1c 100644
--- a/java/test/processing/mode/java/LibrarySketchRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/LibrarySketchRuntimePathFactoryTest.java
@@ -23,6 +23,7 @@ package processing.mode.java;
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
+import processing.mode.java.preproc.ImportStatement;
 
 import java.util.List;
 
diff --git a/java/test/processing/mode/java/ModeSearchRuntimePathFactoryTest.java b/java/test/processing/mode/java/ModeSearchRuntimePathFactoryTest.java
index 16ff85b85..6576a3e45 100644
--- a/java/test/processing/mode/java/ModeSearchRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/ModeSearchRuntimePathFactoryTest.java
@@ -23,6 +23,7 @@ package processing.mode.java;
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
+import processing.mode.java.preproc.ImportStatement;
 
 import java.util.List;
 
diff --git a/java/test/processing/mode/java/ModeSketchRuntimePathFactoryTest.java b/java/test/processing/mode/java/ModeSketchRuntimePathFactoryTest.java
index 5081311bf..c41408637 100644
--- a/java/test/processing/mode/java/ModeSketchRuntimePathFactoryTest.java
+++ b/java/test/processing/mode/java/ModeSketchRuntimePathFactoryTest.java
@@ -23,6 +23,7 @@ package processing.mode.java;
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
+import processing.mode.java.preproc.ImportStatement;
 
 import java.util.List;
 
diff --git a/java/test/processing/mode/java/ParserTests.java b/java/test/processing/mode/java/ParserTests.java
index 040600228..d3f7ddeb7 100644
--- a/java/test/processing/mode/java/ParserTests.java
+++ b/java/test/processing/mode/java/ParserTests.java
@@ -15,9 +15,9 @@ import org.junit.Before;
 import org.junit.Test;
 
 import processing.app.Preferences;
-import processing.app.SketchException;
 import processing.mode.java.preproc.PreprocessorResult;
 import processing.mode.java.preproc.PdePreprocessIssueException;
+import processing.mode.java.preproc.SketchException;
 
 
 public class ParserTests {
diff --git a/java/test/processing/mode/java/ProcessingTestUtil.java b/java/test/processing/mode/java/ProcessingTestUtil.java
index 40c7dde34..40f42d557 100644
--- a/java/test/processing/mode/java/ProcessingTestUtil.java
+++ b/java/test/processing/mode/java/ProcessingTestUtil.java
@@ -7,10 +7,10 @@ import java.io.StringWriter;
 import java.util.Optional;
 
 import processing.app.Preferences;
-import processing.app.SketchException;
 import processing.mode.java.preproc.PdePreprocessor;
 import processing.mode.java.preproc.PreprocessorResult;
 import processing.mode.java.preproc.PdePreprocessIssueException;
+import processing.mode.java.preproc.SketchException;
 
 
 public class ProcessingTestUtil {
diff --git a/java/test/processing/mode/java/RuntimePathBuilderTest.java b/java/test/processing/mode/java/RuntimePathBuilderTest.java
index 96063a187..6f0c1856a 100644
--- a/java/test/processing/mode/java/RuntimePathBuilderTest.java
+++ b/java/test/processing/mode/java/RuntimePathBuilderTest.java
@@ -23,6 +23,8 @@ package processing.mode.java;
 import org.junit.Before;
 import org.junit.Test;
 import processing.app.Sketch;
+import processing.mode.java.preproc.ImportStatement;
+
 
 import java.io.File;
 import java.util.Arrays;
diff --git a/java/test/processing/mode/java/RuntimePathFactoryTestUtil.java b/java/test/processing/mode/java/RuntimePathFactoryTestUtil.java
index 1303a02a3..665f9761d 100644
--- a/java/test/processing/mode/java/RuntimePathFactoryTestUtil.java
+++ b/java/test/processing/mode/java/RuntimePathFactoryTestUtil.java
@@ -24,6 +24,7 @@ import org.mockito.Mockito;
 import processing.app.Library;
 import processing.app.Sketch;
 import processing.app.SketchException;
+import processing.mode.java.preproc.ImportStatement;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/java/test/processing/mode/java/SourceUtilTest.java b/java/test/processing/mode/java/SourceUtilTest.java
index 53a57de1f..ac333829b 100644
--- a/java/test/processing/mode/java/SourceUtilTest.java
+++ b/java/test/processing/mode/java/SourceUtilTest.java
@@ -2,6 +2,7 @@ package processing.mode.java;
 
 import org.junit.Assert;
 import org.junit.Test;
+import processing.mode.java.preproc.SourceUtil;
 
 
 public class SourceUtilTest {
diff --git a/java/test/processing/mode/java/preproc/PrintWriterWithEditGenTest.java b/java/test/processing/mode/java/preproc/PrintWriterWithEditGenTest.java
index c29e6b606..0306359a3 100644
--- a/java/test/processing/mode/java/preproc/PrintWriterWithEditGenTest.java
+++ b/java/test/processing/mode/java/preproc/PrintWriterWithEditGenTest.java
@@ -5,8 +5,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import processing.mode.java.TextTransform;
-
 import java.util.List;
 
 import static org.junit.Assert.*;