diff --git a/test/net/sourceforge/plantuml/LoadJsonTest.java b/test/net/sourceforge/plantuml/LoadJsonTest.java
index cd5302be7..3ff4c3bb9 100644
--- a/test/net/sourceforge/plantuml/LoadJsonTest.java
+++ b/test/net/sourceforge/plantuml/LoadJsonTest.java
@@ -1,9 +1,9 @@
 package net.sourceforge.plantuml;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static net.sourceforge.plantuml.test.TestUtils.writeUtf8File;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.util.Lists.newArrayList;
+import static test.utils.TestUtils.writeUtf8File;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/test/net/sourceforge/plantuml/TestFileDirOption.java b/test/net/sourceforge/plantuml/TestFileDirOption.java
index d68165ef6..5e71d1937 100644
--- a/test/net/sourceforge/plantuml/TestFileDirOption.java
+++ b/test/net/sourceforge/plantuml/TestFileDirOption.java
@@ -1,9 +1,9 @@
 package net.sourceforge.plantuml;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static net.sourceforge.plantuml.test.TestUtils.writeUtf8File;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.util.Lists.newArrayList;
+import static test.utils.TestUtils.writeUtf8File;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java b/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java
index 74bdf712a..52507fb51 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/FeatureTest.java
@@ -1,8 +1,8 @@
 package net.sourceforge.plantuml.tim.stdlib;
 
-import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput;
+import static test.utils.JunitUtils.StringJsonConverter;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java
index c84f32bd8..80635e456 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonKeyTest.java
@@ -1,8 +1,8 @@
 package net.sourceforge.plantuml.tim.stdlib;
 
-import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput;
+import static test.utils.JunitUtils.StringJsonConverter;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java
index 1b720c9e5..0fe35543c 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/GetJsonTypeTest.java
@@ -1,8 +1,8 @@
 package net.sourceforge.plantuml.tim.stdlib;
 
-import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput;
+import static test.utils.JunitUtils.StringJsonConverter;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java b/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java
index d149c26b9..3b50a2d30 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/LowerTest.java
@@ -1,8 +1,8 @@
 package net.sourceforge.plantuml.tim.stdlib;
 
-import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput;
+import static test.utils.JunitUtils.StringJsonConverter;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java b/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java
index 137ff9bef..6bcfd105e 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/SizeTest.java
@@ -1,8 +1,8 @@
 package net.sourceforge.plantuml.tim.stdlib;
 
-import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput;
+import static test.utils.JunitUtils.StringJsonConverter;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java b/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java
index 049f0b531..35c1e2e87 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java
+++ b/test/net/sourceforge/plantuml/tim/stdlib/UpperTest.java
@@ -1,8 +1,8 @@
 package net.sourceforge.plantuml.tim.stdlib;
 
-import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput;
+import static test.utils.JunitUtils.StringJsonConverter;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
diff --git a/test/net/sourceforge/plantuml/tim/stdlib/_TemplateStdlibTest.template b/test/net/sourceforge/plantuml/tim/stdlib/_TemplateStdlibTest.template
index a949f6023..d85b08db0 100644
--- a/test/net/sourceforge/plantuml/tim/stdlib/_TemplateStdlibTest.template
+++ b/test/net/sourceforge/plantuml/tim/stdlib/_TemplateStdlibTest.template
@@ -1,8 +1,8 @@
 package net.sourceforge.plantuml.tim.stdlib;
 
-import static net.sourceforge.plantuml.test.JunitUtils.StringJsonConverter;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutput;
 import static net.sourceforge.plantuml.tim.TimTestUtils.assertTimExpectedOutputFromInput;
+import static test.utils.JunitUtils.StringJsonConverter;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayNameGenerator.ReplaceUnderscores;
diff --git a/test/testhelper/TestHelper.java b/test/test/example/TestExample.java
similarity index 77%
rename from test/testhelper/TestHelper.java
rename to test/test/example/TestExample.java
index 0a06fd1c8..1fc15a8d4 100644
--- a/test/testhelper/TestHelper.java
+++ b/test/test/example/TestExample.java
@@ -1,11 +1,11 @@
-package testhelper;
+package test.example;
 
-import static net.sourceforge.plantuml.test.PlantUmlTestUtils.exportDiagram;
+import static test.utils.PlantUmlTestUtils.exportDiagram;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 
-class TestHelper {
+class TestExample {
 
 	@Test
 	public void test_help_themes() throws Exception {
diff --git a/test/net/sourceforge/plantuml/test/ImageTestUtils.java b/test/test/utils/ImageTestUtils.java
similarity index 98%
rename from test/net/sourceforge/plantuml/test/ImageTestUtils.java
rename to test/test/utils/ImageTestUtils.java
index cd989f3a7..21dcd284a 100644
--- a/test/net/sourceforge/plantuml/test/ImageTestUtils.java
+++ b/test/test/utils/ImageTestUtils.java
@@ -1,4 +1,4 @@
-package net.sourceforge.plantuml.test;
+package test.utils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/test/net/sourceforge/plantuml/test/ImageTestUtilsTest.java b/test/test/utils/ImageTestUtilsTest.java
similarity index 93%
rename from test/net/sourceforge/plantuml/test/ImageTestUtilsTest.java
rename to test/test/utils/ImageTestUtilsTest.java
index 5d96a85a7..c29cb1687 100644
--- a/test/net/sourceforge/plantuml/test/ImageTestUtilsTest.java
+++ b/test/test/utils/ImageTestUtilsTest.java
@@ -1,9 +1,9 @@
-package net.sourceforge.plantuml.test;
+package test.utils;
 
-import static net.sourceforge.plantuml.test.ImageTestUtils.assertImageSizeEqual;
-import static net.sourceforge.plantuml.test.ImageTestUtils.assertImagesEqual;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
+import static test.utils.ImageTestUtils.assertImageSizeEqual;
+import static test.utils.ImageTestUtils.assertImagesEqual;
 
 import java.awt.image.BufferedImage;
 
diff --git a/test/net/sourceforge/plantuml/test/JunitUtils.java b/test/test/utils/JunitUtils.java
similarity index 95%
rename from test/net/sourceforge/plantuml/test/JunitUtils.java
rename to test/test/utils/JunitUtils.java
index 8064ba1fc..e0b6add41 100644
--- a/test/net/sourceforge/plantuml/test/JunitUtils.java
+++ b/test/test/utils/JunitUtils.java
@@ -1,4 +1,4 @@
-package net.sourceforge.plantuml.test;
+package test.utils;
 
 import org.junit.jupiter.params.converter.ArgumentConversionException;
 import org.junit.jupiter.params.converter.SimpleArgumentConverter;
diff --git a/test/net/sourceforge/plantuml/test/PlantUmlTestUtils.java b/test/test/utils/PlantUmlTestUtils.java
similarity index 98%
rename from test/net/sourceforge/plantuml/test/PlantUmlTestUtils.java
rename to test/test/utils/PlantUmlTestUtils.java
index e4bac23ce..f1f5774ad 100644
--- a/test/net/sourceforge/plantuml/test/PlantUmlTestUtils.java
+++ b/test/test/utils/PlantUmlTestUtils.java
@@ -1,4 +1,4 @@
-package net.sourceforge.plantuml.test;
+package test.utils;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/test/net/sourceforge/plantuml/test/StringTestUtils.java b/test/test/utils/StringTestUtils.java
similarity index 96%
rename from test/net/sourceforge/plantuml/test/StringTestUtils.java
rename to test/test/utils/StringTestUtils.java
index 2248dc201..df3705a85 100644
--- a/test/net/sourceforge/plantuml/test/StringTestUtils.java
+++ b/test/test/utils/StringTestUtils.java
@@ -1,4 +1,4 @@
-package net.sourceforge.plantuml.test;
+package test.utils;
 
 import static java.util.Objects.requireNonNull;
 
diff --git a/test/net/sourceforge/plantuml/test/TestUtils.java b/test/test/utils/TestUtils.java
similarity index 89%
rename from test/net/sourceforge/plantuml/test/TestUtils.java
rename to test/test/utils/TestUtils.java
index 2506ddf4a..d381f545e 100644
--- a/test/net/sourceforge/plantuml/test/TestUtils.java
+++ b/test/test/utils/TestUtils.java
@@ -1,4 +1,4 @@
-package net.sourceforge.plantuml.test;
+package test.utils;
 
 import static java.nio.charset.StandardCharsets.UTF_8;