diff --git a/runtime-testsuite/resources/org/antlr/v4/test/runtime/java/Java.test.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/java/Java.test.stg
index 5fa613bb7..179d2c52c 100644
--- a/runtime-testsuite/resources/org/antlr/v4/test/runtime/java/Java.test.stg
+++ b/runtime-testsuite/resources/org/antlr/v4/test/runtime/java/Java.test.stg
@@ -2,7 +2,6 @@ TestFile(file) ::= <<
 /* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
 package org.antlr.v4.test.runtime.java;
 
-import org.antlr.v4.test.tool.BaseTest;
 import org.junit.Ignore;
 import org.junit.Test;
 
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParserErrors.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParserErrors.java
index 6ab4607fc..492ae87f0 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParserErrors.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParserErrors.java
@@ -1,6 +1,7 @@
 /* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
 package org.antlr.v4.test.runtime.csharp;
 
+import org.antlr.v4.test.runtime.java.BaseTest;
 import org.junit.Test;
 
 @SuppressWarnings("unused")
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestCompositeLexers.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestCompositeLexers.java
index b73fd6d6c..fa3805b75 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestCompositeLexers.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestCompositeLexers.java
@@ -1,7 +1,6 @@
 /* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
 package org.antlr.v4.test.runtime.java;
 
-import org.antlr.v4.test.tool.BaseTest;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestCompositeParsers.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestCompositeParsers.java
index 9c3935782..f5d6df6f8 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestCompositeParsers.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestCompositeParsers.java
@@ -1,8 +1,6 @@
 /* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
 package org.antlr.v4.test.runtime.java;
 
-import org.antlr.v4.test.tool.BaseTest;
-import org.antlr.v4.test.tool.ErrorQueue;
 import org.antlr.v4.tool.Grammar;
 import org.junit.Test;
 
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestFullContextParsing.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestFullContextParsing.java
index 9ee6c02ae..cfda2361f 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestFullContextParsing.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestFullContextParsing.java
@@ -1,7 +1,6 @@
 /* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
 package org.antlr.v4.test.runtime.java;
 
-import org.antlr.v4.test.tool.BaseTest;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestLeftRecursion.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestLeftRecursion.java
index b43c7c09e..f67a0c2fd 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestLeftRecursion.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestLeftRecursion.java
@@ -1,7 +1,6 @@
 /* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
 package org.antlr.v4.test.runtime.java;
 
-import org.antlr.v4.test.tool.BaseTest;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestLexerErrors.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestLexerErrors.java
index b79640911..b613dec8c 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestLexerErrors.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestLexerErrors.java
@@ -1,7 +1,6 @@
 /* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
 package org.antlr.v4.test.runtime.java;
 
-import org.antlr.v4.test.tool.BaseTest;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestLexerExec.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestLexerExec.java
index 673e3c53d..1c6183988 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestLexerExec.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestLexerExec.java
@@ -1,7 +1,6 @@
 /* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
 package org.antlr.v4.test.runtime.java;
 
-import org.antlr.v4.test.tool.BaseTest;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestListeners.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestListeners.java
index 04aea5cc2..5786789f1 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestListeners.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestListeners.java
@@ -1,7 +1,6 @@
 /* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
 package org.antlr.v4.test.runtime.java;
 
-import org.antlr.v4.test.tool.BaseTest;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestParseTrees.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestParseTrees.java
index 854719f77..58cdb882d 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestParseTrees.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestParseTrees.java
@@ -1,7 +1,6 @@
 /* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
 package org.antlr.v4.test.runtime.java;
 
-import org.antlr.v4.test.tool.BaseTest;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestParserErrors.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestParserErrors.java
index fca0df214..8e2e0f987 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestParserErrors.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestParserErrors.java
@@ -1,7 +1,6 @@
 /* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
 package org.antlr.v4.test.runtime.java;
 
-import org.antlr.v4.test.tool.BaseTest;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestParserExec.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestParserExec.java
index fdccfcf98..1ead05bd7 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestParserExec.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestParserExec.java
@@ -1,7 +1,6 @@
 /* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
 package org.antlr.v4.test.runtime.java;
 
-import org.antlr.v4.test.tool.BaseTest;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestPerformance.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestPerformance.java
index ce43c1c46..c4a70e309 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestPerformance.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestPerformance.java
@@ -1,7 +1,6 @@
 /* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
 package org.antlr.v4.test.runtime.java;
 
-import org.antlr.v4.test.tool.BaseTest;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestSemPredEvalLexer.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestSemPredEvalLexer.java
index 660ea2cb7..86e3adbda 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestSemPredEvalLexer.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestSemPredEvalLexer.java
@@ -1,7 +1,6 @@
 /* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
 package org.antlr.v4.test.runtime.java;
 
-import org.antlr.v4.test.tool.BaseTest;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestSemPredEvalParser.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestSemPredEvalParser.java
index a410e91c0..11fd8acd4 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestSemPredEvalParser.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestSemPredEvalParser.java
@@ -1,7 +1,6 @@
 /* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
 package org.antlr.v4.test.runtime.java;
 
-import org.antlr.v4.test.tool.BaseTest;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestSets.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestSets.java
index e5679f6b8..c1d55808d 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestSets.java
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/TestSets.java
@@ -1,7 +1,6 @@
 /* This file is generated by TestGenerator, any edits will be overwritten by the next generation. */
 package org.antlr.v4.test.runtime.java;
 
-import org.antlr.v4.test.tool.BaseTest;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;