diff --git a/compiler/testData/diagnostics/testsWithJava9/kt11167.kt b/compiler/testData/diagnostics/tests/kt11167.kt
similarity index 87%
rename from compiler/testData/diagnostics/testsWithJava9/kt11167.kt
rename to compiler/testData/diagnostics/tests/kt11167.kt
index 56696a9babc..c68da98130d 100644
--- a/compiler/testData/diagnostics/testsWithJava9/kt11167.kt
+++ b/compiler/testData/diagnostics/tests/kt11167.kt
@@ -1,4 +1,6 @@
-//WITH_RUNTIME
+// FIR_IDENTICAL
+// JDK_KIND: FULL_JDK_9
+// WITH_STDLIB
 import java.util.stream.IntStream
 
 fun foo(s: IntStream) {
diff --git a/compiler/testData/diagnostics/testsWithJava9/kt11167.txt b/compiler/testData/diagnostics/tests/kt11167.txt
similarity index 100%
rename from compiler/testData/diagnostics/testsWithJava9/kt11167.txt
rename to compiler/testData/diagnostics/tests/kt11167.txt
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index c4100e77895..da147e88f5a 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -374,6 +374,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
             runTest("compiler/testData/diagnostics/tests/IsExpressions.kt");
         }
 
+        @Test
+        @TestMetadata("kt11167.kt")
+        public void testKt11167() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/kt11167.kt");
+        }
+
         @Test
         @TestMetadata("kt13401.kt")
         public void testKt13401() throws Exception {
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
index 158fa299781..1287c50f77b 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
@@ -374,6 +374,12 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
             runTest("compiler/testData/diagnostics/tests/IsExpressions.kt");
         }
 
+        @Test
+        @TestMetadata("kt11167.kt")
+        public void testKt11167() throws Exception {
+            runTest("compiler/testData/diagnostics/tests/kt11167.kt");
+        }
+
         @Test
         @TestMetadata("kt13401.kt")
         public void testKt13401() throws Exception {
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithJdk9Test.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithJdk9Test.kt
deleted file mode 100644
index f955621639d..00000000000
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsWithJdk9Test.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2010-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jetbrains.kotlin.checkers
-
-import org.jetbrains.kotlin.test.TestJdkKind
-
-abstract class AbstractDiagnosticsWithJdk9Test : AbstractDiagnosticsTest() {
-
-    override fun getTestJdkKind(files: List<TestFile>): TestJdkKind {
-        return TestJdkKind.FULL_JDK_9
-    }
-}
\ No newline at end of file
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsWithJdk9TestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsWithJdk9TestGenerated.java
deleted file mode 100644
index a18684b1a66..00000000000
--- a/compiler/tests-gen/org/jetbrains/kotlin/checkers/DiagnosticsWithJdk9TestGenerated.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * 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.checkers;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
-@SuppressWarnings("all")
-@TestMetadata("compiler/testData/diagnostics/testsWithJava9")
-@TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
-public class DiagnosticsWithJdk9TestGenerated extends AbstractDiagnosticsWithJdk9Test {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, this, testDataFilePath);
-    }
-
-    public void testAllFilesPresentInTestsWithJava9() throws Exception {
-        KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJava9"), Pattern.compile("^(.+)\\.kt$"), null, true);
-    }
-
-    @TestMetadata("kt11167.kt")
-    public void testKt11167() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJava9/kt11167.kt");
-    }
-}
diff --git a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
index 78922ab6224..b6335d57f23 100644
--- a/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
+++ b/compiler/tests/org/jetbrains/kotlin/generators/tests/GenerateCompilerTests.kt
@@ -84,10 +84,6 @@ fun main(args: Array<String>) {
                 model("diagnostics/testWithModifiedMockJdk")
             }
 
-            testClass<AbstractDiagnosticsWithJdk9Test> {
-                model("diagnostics/testsWithJava9")
-            }
-
             testClass<AbstractDiagnosticsWithJdk15Test> {
                 model("diagnostics/testsWithJava15")
             }