diff --git a/plugins/gitlab/gitlab-yaml/intellij.vcs.gitlab.yaml.iml b/plugins/gitlab/gitlab-yaml/intellij.vcs.gitlab.yaml.iml
index a8afc4f0255e..394f3932aed3 100644
--- a/plugins/gitlab/gitlab-yaml/intellij.vcs.gitlab.yaml.iml
+++ b/plugins/gitlab/gitlab-yaml/intellij.vcs.gitlab.yaml.iml
@@ -5,6 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -12,5 +13,7 @@
     <orderEntry type="module" module-name="intellij.yaml" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.base" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.json.tests" scope="TEST" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/gitlab/test/org/jetbrains/plugins/gitlab/yaml/GitlabYamlJsonSchemaValidationTest.kt b/plugins/gitlab/gitlab-yaml/testSrc/org/jetbrains/plugins/gitlab/yaml/GitlabYamlJsonSchemaValidationTest.kt
similarity index 95%
rename from plugins/gitlab/test/org/jetbrains/plugins/gitlab/yaml/GitlabYamlJsonSchemaValidationTest.kt
rename to plugins/gitlab/gitlab-yaml/testSrc/org/jetbrains/plugins/gitlab/yaml/GitlabYamlJsonSchemaValidationTest.kt
index a3af964540ed..4d6be648730e 100644
--- a/plugins/gitlab/test/org/jetbrains/plugins/gitlab/yaml/GitlabYamlJsonSchemaValidationTest.kt
+++ b/plugins/gitlab/gitlab-yaml/testSrc/org/jetbrains/plugins/gitlab/yaml/GitlabYamlJsonSchemaValidationTest.kt
@@ -4,7 +4,6 @@ package org.jetbrains.plugins.gitlab.yaml
 import com.intellij.testFramework.fixtures.BasePlatformTestCase
 import com.jetbrains.jsonSchema.JsonSchemaHighlightingTestBase
 import org.jetbrains.yaml.schema.YamlJsonSchemaHighlightingInspection
-import java.util.function.Predicate
 
 internal class GitlabYamlJsonSchemaValidationTest : BasePlatformTestCase() {
   override fun setUp() {
@@ -41,7 +40,7 @@ internal class GitlabYamlJsonSchemaValidationTest : BasePlatformTestCase() {
           }
         }
       }
-    """.trimIndent(), ".json", Predicate { true })
+    """.trimIndent(), ".json") { true }
   }
 
   fun `test custom gitlab ci yaml tags does not produce warnings`() {
diff --git a/plugins/gitlab/intellij.vcs.gitlab.iml b/plugins/gitlab/intellij.vcs.gitlab.iml
index 07256f7adcf0..19a510e0b619 100644
--- a/plugins/gitlab/intellij.vcs.gitlab.iml
+++ b/plugins/gitlab/intellij.vcs.gitlab.iml
@@ -73,7 +73,5 @@
     <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
     <orderEntry type="library" scope="TEST" name="io.mockk" level="project" />
     <orderEntry type="library" scope="TEST" name="io.mockk.jvm" level="project" />
-    <orderEntry type="module" module-name="intellij.yaml" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.json.tests" scope="TEST" />
   </component>
 </module>
\ No newline at end of file