diff --git a/BUILD.bazel b/BUILD.bazel
index 81b2e671d75b..c025315cf6ef 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -265,6 +265,8 @@ jvm_library(
   visibility = ["//visibility:public"],
   srcs = glob([], allow_empty = True),
   deps = [
+    "//spellchecker",
+    "//spellchecker:spellchecker_test_lib",
     "//java/java-tests:tests_test_lib",
     "//plugins/junit/java-tests:java-tests_test_lib",
     "//jvm/jvm-analysis-java-tests:analysis-java-tests_test_lib",
diff --git a/intellij.idea.community.main.iml b/intellij.idea.community.main.iml
index 82742799194e..df3873ec89eb 100644
--- a/intellij.idea.community.main.iml
+++ b/intellij.idea.community.main.iml
@@ -49,6 +49,7 @@
     <orderEntry type="module" module-name="intellij.java.resources" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.resources.en" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.spellchecker" scope="RUNTIME" />
+    <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
     <orderEntry type="module" module-name="intellij.jsp.base" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="RUNTIME" />
     <orderEntry type="module" module-name="intellij.platform.testRunner" scope="RUNTIME" />
diff --git a/spellchecker/BUILD.bazel b/spellchecker/BUILD.bazel
index 25a98be44571..93c404e55c6e 100644
--- a/spellchecker/BUILD.bazel
+++ b/spellchecker/BUILD.bazel
@@ -45,6 +45,7 @@ jvm_library(
     "//platform/vcs-api:vcs",
     "//platform/vcs-impl",
     "//platform/util/jdom",
+    "@lib//:kotlin-stdlib",
     "@lib//:kotlinx-coroutines-core",
     "@lib//:caffeine",
   ],
@@ -85,6 +86,9 @@ jvm_library(
     "//platform/vcs-impl",
     "//platform/vcs-impl:vcs-impl_test_lib",
     "//platform/util/jdom",
+    "@lib//:kotlin-stdlib",
+    "@lib//:kotlin-test",
+    "@lib//:kotlin-test-junit",
     "@lib//:kotlinx-coroutines-core",
     "@lib//:caffeine",
     "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark",
diff --git a/spellchecker/intellij.spellchecker.iml b/spellchecker/intellij.spellchecker.iml
index b69d6d322e72..2ef2f14e0c7c 100644
--- a/spellchecker/intellij.spellchecker.iml
+++ b/spellchecker/intellij.spellchecker.iml
@@ -51,6 +51,9 @@
     <orderEntry type="module" module-name="intellij.platform.vcs" />
     <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="library" scope="TEST" name="kotlin-test" level="project" />
+    <orderEntry type="library" scope="TEST" name="kotlin-test-junit" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="library" name="caffeine" level="project" />
     <orderEntry type="module" module-name="intellij.tools.ide.metrics.benchmark" scope="TEST" />
diff --git a/spellchecker/resources/tests/testGroups.properties b/spellchecker/resources/tests/testGroups.properties
index e06a9408bd20..e69de29bb2d1 100644
--- a/spellchecker/resources/tests/testGroups.properties
+++ b/spellchecker/resources/tests/testGroups.properties
@@ -1,2 +0,0 @@
-[SPELLCHECKER_TESTS]
-com.intellij.spellchecker.*
diff --git a/spellchecker/testSrc/com/intellij/spellchecker/dataset/DataSetQualityTest.kt b/spellchecker/testSrc/com/intellij/spellchecker/dataset/DataSetQualityTest.kt
index 50b2f2c6d1e4..f2df80246c33 100644
--- a/spellchecker/testSrc/com/intellij/spellchecker/dataset/DataSetQualityTest.kt
+++ b/spellchecker/testSrc/com/intellij/spellchecker/dataset/DataSetQualityTest.kt
@@ -4,8 +4,8 @@ package com.intellij.spellchecker.dataset
 import com.intellij.spellchecker.SpellCheckerManager
 import com.intellij.spellchecker.dataset.Datasets.WordWithMisspellings
 import com.intellij.spellchecker.inspection.SpellcheckerInspectionTestCase
-import org.junit.Assert.assertTrue
-import org.junit.jupiter.api.assertAll
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
 private const val MAX_WORD_LENGTH = 32
 
@@ -21,19 +21,19 @@ class DataSetQualityTest : SpellcheckerInspectionTestCase() {
 
   private fun doSpellcheckingTest(dataset: List<WordWithMisspellings>) {
     val manager = SpellCheckerManager.getInstance(project)
-    assertAll(*dataset.flatMap { word ->
-      mutableListOf(
-        { assertFalse("${word.word} should not be misspelled, but it is", manager.hasProblem(word.word)) },
-        { assertLessThanOrEqualMaxWordLength("${word.word} exceeds max word length $MAX_WORD_LENGTH", word.word.length) }
-      ) +
-      word.misspellings.map { misspelling ->
-        { assertTrue("$misspelling should be misspelled, but it is", manager.hasProblem(misspelling)) }
-        { assertLessThanOrEqualMaxWordLength("$misspelling exceeds max word length $MAX_WORD_LENGTH", misspelling.length) }
+
+    dataset.forEach { word ->
+      assertFalse(manager.hasProblem(word.word), "${word.word} should not be misspelled, but it is")
+      assertLessThanOrEqualMaxWordLength("${word.word} exceeds max word length $MAX_WORD_LENGTH", word.word.length)
+
+      word.misspellings.forEach { misspelling ->
+        assertTrue(manager.hasProblem(misspelling), "$misspelling should be misspelled, but it is")
+        assertLessThanOrEqualMaxWordLength("$misspelling exceeds max word length $MAX_WORD_LENGTH", misspelling.length)
       }
-    }.toTypedArray())
+    }
   }
 }
 
 private fun assertLessThanOrEqualMaxWordLength(message: String, actual: Int) {
-  assertTrue(message, actual <= MAX_WORD_LENGTH)
+  assertTrue(actual <= MAX_WORD_LENGTH, message)
 }