diff --git a/.idea/modules.xml b/.idea/modules.xml
index ca1b3d09c207..d4b7a1320f66 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1154,6 +1154,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/terminal/completion/intellij.terminal.completion.iml" filepath="$PROJECT_DIR$/plugins/terminal/completion/intellij.terminal.completion.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/terminal/frontend/intellij.terminal.frontend.iml" filepath="$PROJECT_DIR$/plugins/terminal/frontend/intellij.terminal.frontend.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/terminal/sh/intellij.terminal.sh.iml" filepath="$PROJECT_DIR$/plugins/terminal/sh/intellij.terminal.sh.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/terminal/tests/intellij.terminal.tests.iml" filepath="$PROJECT_DIR$/plugins/terminal/tests/intellij.terminal.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/testng/intellij.testng.iml" filepath="$PROJECT_DIR$/plugins/testng/intellij.testng.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/testng_rt/intellij.testng.rt.iml" filepath="$PROJECT_DIR$/plugins/testng_rt/intellij.testng.rt.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/testng_rt/tests/intellij.testng.rt.tests.iml" filepath="$PROJECT_DIR$/plugins/testng_rt/tests/intellij.testng.rt.tests.iml" />
diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt
index 5a27c38a0b9e..f42f9af8c8f4 100644
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -1241,6 +1241,7 @@ plugins/terminal/backend
 plugins/terminal/completion
 plugins/terminal/frontend
 plugins/terminal/sh
+plugins/terminal/tests
 plugins/testng
 plugins/testng_rt
 plugins/testng_rt/tests
diff --git a/java/java-terminal/BUILD.bazel b/java/java-terminal/BUILD.bazel
index 8c69aa2ee116..2cbabc959a2f 100644
--- a/java/java-terminal/BUILD.bazel
+++ b/java/java-terminal/BUILD.bazel
@@ -48,7 +48,6 @@ jvm_library(
     "//plugins/terminal/completion",
     "//plugins/terminal/completion:completion_test_lib",
     "//plugins/terminal",
-    "//plugins/terminal:terminal_test_lib",
   ]
 )
 ### auto-generated section `build intellij.java.terminal.tests` end
diff --git a/plugins/git4idea/BUILD.bazel b/plugins/git4idea/BUILD.bazel
index 993918f803cd..2bf83df8231c 100644
--- a/plugins/git4idea/BUILD.bazel
+++ b/plugins/git4idea/BUILD.bazel
@@ -204,7 +204,6 @@ jvm_library(
     "//platform/backend/observation:observation_test_lib",
     "//platform/util/coroutines",
     "//plugins/terminal",
-    "//plugins/terminal:terminal_test_lib",
     "//plugins/terminal/completion",
     "//plugins/terminal/completion:completion_test_lib",
     "@lib//:http-client",
diff --git a/plugins/mcp-server/BUILD.bazel b/plugins/mcp-server/BUILD.bazel
index 47607f9eda19..e0621f26176f 100644
--- a/plugins/mcp-server/BUILD.bazel
+++ b/plugins/mcp-server/BUILD.bazel
@@ -112,7 +112,6 @@ jvm_library(
     "//platform/platform-util-io:ide-util-io",
     "//platform/execution-impl",
     "//plugins/terminal",
-    "//plugins/terminal:terminal_test_lib",
     "//platform/vcs-api:vcs",
     "//plugins/git4idea:vcs-git",
     "//plugins/git4idea:vcs-git_test_lib",
diff --git a/plugins/terminal/BUILD.bazel b/plugins/terminal/BUILD.bazel
index 9636964f0dba..47ea0b15413b 100644
--- a/plugins/terminal/BUILD.bazel
+++ b/plugins/terminal/BUILD.bazel
@@ -71,84 +71,4 @@ jvm_library(
   ],
   runtime_deps = [":terminal_resources"]
 )
-
-jvm_library(
-  name = "terminal_test_lib",
-  visibility = ["//visibility:public"],
-  srcs = glob(["tests/**/*.kt", "tests/**/*.java"], allow_empty = True),
-  associates = [":terminal"],
-  deps = [
-    "//platform/analysis-api:analysis",
-    "//platform/code-style-api:codeStyle",
-    "//platform/util/concurrency",
-    "//platform/util/concurrency:concurrency_test_lib",
-    "//platform/core-api:core",
-    "//platform/editor-ui-api:editor-ui",
-    "//platform/indexing-api:indexing",
-    "//platform/lang-api:lang",
-    "//platform/platform-impl:ide-impl",
-    "//platform/ide-core-impl",
-    "@lib//:guava",
-    "@lib//:pty4j",
-    "@lib//:jna",
-    "//platform/projectModel-api:projectModel",
-    "//platform/remote-core",
-    "//platform/remote-servers/api:remoteServers",
-    "//platform/remote-servers/impl",
-    "@lib//:junit4",
-    "//platform/testFramework",
-    "//platform/testFramework:testFramework_test_lib",
-    "@lib//:jediterm-core",
-    "@lib//:jediterm-ui",
-    "//platform/execution-impl",
-    "//platform/configuration-store-impl:configurationStore-tests_test_lib",
-    "@lib//:winp",
-    "//platform/statistics",
-    "//platform/statistics:statistics_test_lib",
-    "//platform/analysis-impl",
-    "//platform/core-ui",
-    "//platform/lang-impl",
-    "//platform/editor-ui-ex:editor-ex",
-    "//platform/platform-impl/codeinsight-inline:ide-codeinsight-inline",
-    "//platform/platform-util-io:ide-util-io",
-    "//plugins/terminal/completion",
-    "//plugins/terminal/completion:completion_test_lib",
-    "@lib//:kotlinx-serialization-core",
-    "@lib//:kotlinx-serialization-json",
-    "@lib//:caffeine",
-    "//platform/refactoring",
-    "@lib//:terminal-terminal-completion-db-with-extensions",
-    "//platform/util/coroutines",
-    "//platform/util/text-matching",
-    "@lib//:terminal-completion-ranking-sh",
-    "//platform/feedback",
-    "@lib//:kotlinx-datetime-jvm",
-    "//platform/diagnostic/telemetry",
-    "//platform/diagnostic/telemetry:telemetry_test_lib",
-    "//platform/platform-impl/internal",
-    "@lib//:opentelemetry-provided",
-    "@lib//:opentelemetry-semconv-provided",
-    "@lib//:opentelemetry-extension-kotlin-provided",
-    "//platform/platform-impl/ui",
-    "@lib//:assert_j",
-    "//platform/kernel/shared:kernel",
-    "//platform/project/shared:project",
-    "//platform/eel",
-    "//platform/eel-provider",
-    "//platform/util/jdom",
-  ],
-  runtime_deps = [
-    ":terminal_resources",
-    ":terminal_test_resources",
-  ]
-)
-### auto-generated section `build intellij.terminal` end
-
-### auto-generated section `test intellij.terminal` start
-load("@community//build:tests-options.bzl", "jps_test")
-
-jps_test(
-  name = "terminal_test",
-  runtime_deps = [":terminal_test_lib"]
-)
-### auto-generated section `test intellij.terminal` end
\ No newline at end of file
+### auto-generated section `build intellij.terminal` end
\ No newline at end of file
diff --git a/plugins/terminal/backend/BUILD.bazel b/plugins/terminal/backend/BUILD.bazel
index 522a6b98b553..07fcd21503a1 100644
--- a/plugins/terminal/backend/BUILD.bazel
+++ b/plugins/terminal/backend/BUILD.bazel
@@ -46,7 +46,6 @@ jvm_library(
     "//platform/ide-core-impl",
     "//platform/projectModel-api:projectModel",
     "//plugins/terminal",
-    "//plugins/terminal:terminal_test_lib",
     "@lib//:jediterm-core",
     "@lib//:jediterm-ui",
     "@lib//:pty4j",
diff --git a/plugins/terminal/frontend/BUILD.bazel b/plugins/terminal/frontend/BUILD.bazel
index 08a3aecb19d5..c075594bd67d 100644
--- a/plugins/terminal/frontend/BUILD.bazel
+++ b/plugins/terminal/frontend/BUILD.bazel
@@ -56,7 +56,6 @@ jvm_library(
     "//platform/projectModel-api:projectModel",
     "//platform/refactoring",
     "//plugins/terminal",
-    "//plugins/terminal:terminal_test_lib",
     "//platform/execution-impl",
     "//platform/util/coroutines",
     "//platform/editor-ui-ex:editor-ex",
diff --git a/plugins/terminal/intellij.terminal.iml b/plugins/terminal/intellij.terminal.iml
index 5cb1b37cd059..f67826fb5f21 100644
--- a/plugins/terminal/intellij.terminal.iml
+++ b/plugins/terminal/intellij.terminal.iml
@@ -31,7 +31,6 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/testResources" type="java-test-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
diff --git a/plugins/terminal/tests/BUILD.bazel b/plugins/terminal/tests/BUILD.bazel
new file mode 100644
index 000000000000..95b84fe289e4
--- /dev/null
+++ b/plugins/terminal/tests/BUILD.bazel
@@ -0,0 +1,25 @@
+### auto-generated section `build intellij.terminal.tests` start
+load("@rules_jvm//:jvm.bzl", "jvm_library")
+
+jvm_library(
+  name = "tests",
+  visibility = ["//visibility:public"],
+  srcs = glob([], allow_empty = True)
+)
+
+jvm_library(
+  name = "tests_test_lib",
+  module_name = "intellij.terminal.tests",
+  visibility = ["//visibility:public"],
+  srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True)
+)
+### auto-generated section `build intellij.terminal.tests` end
+
+### auto-generated section `test intellij.terminal.tests` start
+load("@community//build:tests-options.bzl", "jps_test")
+
+jps_test(
+  name = "tests_test",
+  runtime_deps = [":tests_test_lib"]
+)
+### auto-generated section `test intellij.terminal.tests` end
\ No newline at end of file
diff --git a/plugins/terminal/tests/intellij.terminal.tests.iml b/plugins/terminal/tests/intellij.terminal.tests.iml
new file mode 100644
index 000000000000..ee1899fd5ff9
--- /dev/null
+++ b/plugins/terminal/tests/intellij.terminal.tests.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/python/BUILD.bazel b/python/BUILD.bazel
index 2a6bae0e6d3b..97a636174b33 100644
--- a/python/BUILD.bazel
+++ b/python/BUILD.bazel
@@ -116,7 +116,6 @@ jvm_library(
   srcs = glob([], allow_empty = True),
   deps = [
     "//plugins/terminal",
-    "//plugins/terminal:terminal_test_lib",
     "//python:pycharm-community",
     "//python:pycharm-community-customization",
     "//python/pluginCore:community-plugin",
diff --git a/python/python-terminal/BUILD.bazel b/python/python-terminal/BUILD.bazel
index ae9fb8f664cb..ced70887187c 100644
--- a/python/python-terminal/BUILD.bazel
+++ b/python/python-terminal/BUILD.bazel
@@ -32,7 +32,6 @@ jvm_library(
   deps = [
     "//python:python-community-impl",
     "//plugins/terminal",
-    "//plugins/terminal:terminal_test_lib",
     "@lib//:mockito",
     "//platform/core-api:core",
     "//platform/projectModel-api:projectModel",