diff --git a/jadx-core/src/test/java/jadx/tests/JadxClasspathTest.java b/jadx-core/src/test/java/jadx/tests/functional/JadxClasspathTest.java
similarity index 97%
rename from jadx-core/src/test/java/jadx/tests/JadxClasspathTest.java
rename to jadx-core/src/test/java/jadx/tests/functional/JadxClasspathTest.java
index 0392472d2..67e05a919 100644
--- a/jadx-core/src/test/java/jadx/tests/JadxClasspathTest.java
+++ b/jadx-core/src/test/java/jadx/tests/functional/JadxClasspathTest.java
@@ -1,4 +1,4 @@
-package jadx.tests;
+package jadx.tests.functional;
 
 import jadx.core.clsp.ClspGraph;
 import jadx.core.dex.instructions.args.ArgType;
diff --git a/jadx-core/src/test/java/jadx/tests/StringUtilsTest.java b/jadx-core/src/test/java/jadx/tests/functional/StringUtilsTest.java
similarity index 96%
rename from jadx-core/src/test/java/jadx/tests/StringUtilsTest.java
rename to jadx-core/src/test/java/jadx/tests/functional/StringUtilsTest.java
index 1bd53fcb8..71689b647 100644
--- a/jadx-core/src/test/java/jadx/tests/StringUtilsTest.java
+++ b/jadx-core/src/test/java/jadx/tests/functional/StringUtilsTest.java
@@ -1,4 +1,4 @@
-package jadx.tests;
+package jadx.tests.functional;
 
 import jadx.core.utils.StringUtils;
 
diff --git a/jadx-core/src/test/java/jadx/tests/TypeMergeTest.java b/jadx-core/src/test/java/jadx/tests/functional/TypeMergeTest.java
similarity index 99%
rename from jadx-core/src/test/java/jadx/tests/TypeMergeTest.java
rename to jadx-core/src/test/java/jadx/tests/functional/TypeMergeTest.java
index d90f02fa6..83b30a454 100644
--- a/jadx-core/src/test/java/jadx/tests/TypeMergeTest.java
+++ b/jadx-core/src/test/java/jadx/tests/functional/TypeMergeTest.java
@@ -1,4 +1,4 @@
-package jadx.tests;
+package jadx.tests.functional;
 
 import jadx.core.clsp.ClspGraph;
 import jadx.core.dex.instructions.args.ArgType;
diff --git a/jadx-core/src/test/java/jadx/api/TestDuplicateCast.java b/jadx-core/src/test/java/jadx/tests/internal/TestDuplicateCast.java
similarity index 95%
rename from jadx-core/src/test/java/jadx/api/TestDuplicateCast.java
rename to jadx-core/src/test/java/jadx/tests/internal/TestDuplicateCast.java
index 5e34606b0..9b358b95c 100644
--- a/jadx-core/src/test/java/jadx/api/TestDuplicateCast.java
+++ b/jadx-core/src/test/java/jadx/tests/internal/TestDuplicateCast.java
@@ -1,5 +1,6 @@
-package jadx.api;
+package jadx.tests.internal;
 
+import jadx.api.InternalJadxTest;
 import jadx.core.dex.instructions.InsnType;
 import jadx.core.dex.instructions.args.InsnWrapArg;
 import jadx.core.dex.nodes.ClassNode;
diff --git a/jadx-core/src/test/java/jadx/api/TestFieldIncrement.java b/jadx-core/src/test/java/jadx/tests/internal/TestFieldIncrement.java
similarity index 95%
rename from jadx-core/src/test/java/jadx/api/TestFieldIncrement.java
rename to jadx-core/src/test/java/jadx/tests/internal/TestFieldIncrement.java
index 31e3ce733..2ed1ead4f 100644
--- a/jadx-core/src/test/java/jadx/api/TestFieldIncrement.java
+++ b/jadx-core/src/test/java/jadx/tests/internal/TestFieldIncrement.java
@@ -1,5 +1,6 @@
-package jadx.api;
+package jadx.tests.internal;
 
+import jadx.api.InternalJadxTest;
 import jadx.core.dex.instructions.ArithNode;
 import jadx.core.dex.instructions.ArithOp;
 import jadx.core.dex.instructions.InsnType;
diff --git a/jadx-core/src/test/java/jadx/api/TestStringBuilderElimination.java b/jadx-core/src/test/java/jadx/tests/internal/TestStringBuilderElimination.java
similarity index 92%
rename from jadx-core/src/test/java/jadx/api/TestStringBuilderElimination.java
rename to jadx-core/src/test/java/jadx/tests/internal/TestStringBuilderElimination.java
index 730b71e72..5cf7d161f 100644
--- a/jadx-core/src/test/java/jadx/api/TestStringBuilderElimination.java
+++ b/jadx-core/src/test/java/jadx/tests/internal/TestStringBuilderElimination.java
@@ -1,5 +1,6 @@
-package jadx.api;
+package jadx.tests.internal;
 
+import jadx.api.InternalJadxTest;
 import jadx.core.dex.nodes.ClassNode;
 
 import org.junit.Test;