diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
index 2bc5cf160d8..238db3bcc3e 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
@@ -806,15 +806,4 @@ class KotlinGradleIT : BaseGradleIT() {
             assertNotNull(metaInfDir.listFiles().singleOrNull { it.name.endsWith(".kotlin_module") })
         }
     }
-
-    @Test
-    fun testScripting() {
-        Project("kotlinScripting").build("build") {
-            assertSuccessful()
-            assertCompiledKotlinSources(
-                listOf("app/src/main/kotlin/world.greet.kts", "script-template/src/main/kotlin/GreetScriptTemplate.kt")
-            )
-            assertFileExists("${kotlinClassesDir("app", "main")}World_greet.class")
-        }
-    }
 }
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt
index 80266791b30..3d87ded8122 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt
@@ -1,6 +1,5 @@
 package org.jetbrains.kotlin.gradle
 
-import org.jetbrains.kotlin.gradle.util.checkBytecodeContains
 import org.jetbrains.kotlin.gradle.util.modify
 import org.junit.Test
 import java.io.File
@@ -83,25 +82,6 @@ class SimpleKotlinGradleIT : BaseGradleIT() {
         }
     }
 
-    @Test
-    fun testGradleSubplugin() {
-        val project = Project("kotlinGradleSubplugin")
-
-        project.build("compileKotlin", "build") {
-            assertSuccessful()
-            assertContains("ExampleSubplugin loaded")
-            assertContains("Project component registration: exampleValue")
-            assertTasksExecuted(":compileKotlin")
-        }
-
-        project.build("compileKotlin", "build") {
-            assertSuccessful()
-            assertContains("ExampleSubplugin loaded")
-            assertNotContains("Project component registration: exampleValue")
-            assertTasksUpToDate(":compileKotlin")
-        }
-    }
-
     @Test
     fun testDestinationDirReferencedDuringEvaluation() {
         Project("destinationDirReferencedDuringEvaluation").build("build") {
@@ -110,88 +90,6 @@ class SimpleKotlinGradleIT : BaseGradleIT() {
         }
     }
 
-    @Test
-    fun testAllOpenPlugin() {
-        Project("allOpenSimple").build("build") {
-            assertSuccessful()
-
-            val classesDir = File(project.projectDir, kotlinClassesDir())
-            val openClass = File(classesDir, "test/OpenClass.class")
-            val closedClass = File(classesDir, "test/ClosedClass.class")
-            assertTrue(openClass.exists())
-            assertTrue(closedClass.exists())
-
-            checkBytecodeContains(
-                openClass,
-                "public class test/OpenClass {",
-                "public method()V"
-            )
-
-            checkBytecodeContains(
-                closedClass,
-                "public final class test/ClosedClass {",
-                "public final method()V"
-            )
-        }
-    }
-
-    @Test
-    fun testKotlinSpringPlugin() {
-        Project("allOpenSpring").build("build") {
-            assertSuccessful()
-
-            val classesDir = File(project.projectDir, kotlinClassesDir())
-            val openClass = File(classesDir, "test/OpenClass.class")
-            val closedClass = File(classesDir, "test/ClosedClass.class")
-            assertTrue(openClass.exists())
-            assertTrue(closedClass.exists())
-
-            checkBytecodeContains(
-                openClass,
-                "public class test/OpenClass {",
-                "public method()V"
-            )
-
-            checkBytecodeContains(
-                closedClass,
-                "public final class test/ClosedClass {",
-                "public final method()V"
-            )
-        }
-    }
-
-    @Test
-    fun testKotlinJpaPlugin() {
-        Project("noArgJpa").build("build") {
-            assertSuccessful()
-
-            val classesDir = File(project.projectDir, kotlinClassesDir())
-
-            fun checkClass(name: String) {
-                val testClass = File(classesDir, "test/$name.class")
-                assertTrue(testClass.exists())
-                checkBytecodeContains(testClass, "public <init>()V")
-            }
-
-            checkClass("Test")
-            checkClass("Test2")
-        }
-    }
-
-    @Test
-    fun testNoArgKt18668() {
-        Project("noArgKt18668").build("build") {
-            assertSuccessful()
-        }
-    }
-
-    @Test
-    fun testSamWithReceiverSimple() {
-        Project("samWithReceiverSimple").build("build") {
-            assertSuccessful()
-        }
-    }
-
     @Test
     fun testBuildDirLazyEvaluation() {
         val project = Project("kotlinProject")
diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt
new file mode 100644
index 00000000000..f077a4047f8
--- /dev/null
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle
+
+import org.jetbrains.kotlin.gradle.util.checkBytecodeContains
+import org.junit.Test
+import java.io.File
+import kotlin.test.assertTrue
+
+class SubpluginsIT : BaseGradleIT() {
+    @Test
+    fun testGradleSubplugin() {
+        val project = Project("kotlinGradleSubplugin")
+
+        project.build("compileKotlin", "build") {
+            assertSuccessful()
+            assertContains("ExampleSubplugin loaded")
+            assertContains("Project component registration: exampleValue")
+            assertTasksExecuted(":compileKotlin")
+        }
+
+        project.build("compileKotlin", "build") {
+            assertSuccessful()
+            assertContains("ExampleSubplugin loaded")
+            assertNotContains("Project component registration: exampleValue")
+            assertTasksUpToDate(":compileKotlin")
+        }
+    }
+
+    @Test
+    fun testAllOpenPlugin() {
+        Project("allOpenSimple").build("build") {
+            assertSuccessful()
+
+            val classesDir = File(project.projectDir, kotlinClassesDir())
+            val openClass = File(classesDir, "test/OpenClass.class")
+            val closedClass = File(classesDir, "test/ClosedClass.class")
+            assertTrue(openClass.exists())
+            assertTrue(closedClass.exists())
+
+            checkBytecodeContains(
+                openClass,
+                "public class test/OpenClass {",
+                "public method()V"
+            )
+
+            checkBytecodeContains(
+                closedClass,
+                "public final class test/ClosedClass {",
+                "public final method()V"
+            )
+        }
+    }
+
+    @Test
+    fun testKotlinSpringPlugin() {
+        Project("allOpenSpring").build("build") {
+            assertSuccessful()
+
+            val classesDir = File(project.projectDir, kotlinClassesDir())
+            val openClass = File(classesDir, "test/OpenClass.class")
+            val closedClass = File(classesDir, "test/ClosedClass.class")
+            assertTrue(openClass.exists())
+            assertTrue(closedClass.exists())
+
+            checkBytecodeContains(
+                openClass,
+                "public class test/OpenClass {",
+                "public method()V"
+            )
+
+            checkBytecodeContains(
+                closedClass,
+                "public final class test/ClosedClass {",
+                "public final method()V"
+            )
+        }
+    }
+
+    @Test
+    fun testKotlinJpaPlugin() {
+        Project("noArgJpa").build("build") {
+            assertSuccessful()
+
+            val classesDir = File(project.projectDir, kotlinClassesDir())
+
+            fun checkClass(name: String) {
+                val testClass = File(classesDir, "test/$name.class")
+                assertTrue(testClass.exists())
+                checkBytecodeContains(testClass, "public <init>()V")
+            }
+
+            checkClass("Test")
+            checkClass("Test2")
+        }
+    }
+
+    @Test
+    fun testNoArgKt18668() {
+        Project("noArgKt18668").build("build") {
+            assertSuccessful()
+        }
+    }
+
+    @Test
+    fun testSamWithReceiverSimple() {
+        Project("samWithReceiverSimple").build("build") {
+            assertSuccessful()
+        }
+    }
+
+    @Test
+    fun testScripting() {
+        Project("kotlinScripting").build("build") {
+            assertSuccessful()
+            assertCompiledKotlinSources(
+                listOf("app/src/main/kotlin/world.greet.kts", "script-template/src/main/kotlin/GreetScriptTemplate.kt")
+            )
+            assertFileExists("${kotlinClassesDir("app", "main")}World_greet.class")
+        }
+    }
+}
\ No newline at end of file