diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index c19c5a4968d..3d466b098d7 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -149,6 +149,8 @@ import org.jetbrains.kotlin.jvm.abi.AbstractCompileAgainstJvmAbiTest
 import org.jetbrains.kotlin.jvm.abi.AbstractJvmAbiContentTest
 import org.jetbrains.kotlin.kapt3.test.AbstractClassFileToSourceStubConverterTest
 import org.jetbrains.kotlin.kapt3.test.AbstractKotlinKaptContextTest
+import org.jetbrains.kotlin.nj2k.AbstractNewJavaToKotlinConverterSingleFileTest
+import org.jetbrains.kotlin.nj2k.AbstractNullabilityAnalysisTest
 import org.jetbrains.kotlin.noarg.AbstractBlackBoxCodegenTestForNoArg
 import org.jetbrains.kotlin.noarg.AbstractBytecodeListingTestForNoArg
 import org.jetbrains.kotlin.psi.patternMatching.AbstractPsiUnifierTest
@@ -957,6 +959,15 @@ fun main(args: Array<String>) {
         }
     }
 
+    testGroup("nj2k/tests", "nj2k/testData") {
+        testClass<AbstractNewJavaToKotlinConverterSingleFileTest> {
+            model("newJ2k", extension = "java")
+        }
+        testClass<AbstractNullabilityAnalysisTest> {
+            model("nullabilityAnalysis")
+        }
+    }
+
     testGroup("jps-plugin/jps-tests/test", "jps-plugin/testData") {
         testClass<AbstractIncrementalJvmJpsTest> {
             model("incremental/multiModule/common", extension = null, excludeParentDirs = true)
diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35 b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35
index 3e65b3e2fa3..407a19b980d 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt.as35
@@ -143,6 +143,8 @@ import org.jetbrains.kotlin.kapt.cli.test.AbstractArgumentParsingTest
 import org.jetbrains.kotlin.kapt.cli.test.AbstractKaptToolIntegrationTest
 import org.jetbrains.kotlin.kapt3.test.AbstractClassFileToSourceStubConverterTest
 import org.jetbrains.kotlin.kapt3.test.AbstractKotlinKaptContextTest
+import org.jetbrains.kotlin.nj2k.AbstractNewJavaToKotlinConverterSingleFileTest
+import org.jetbrains.kotlin.nj2k.AbstractNullabilityAnalysisTest
 import org.jetbrains.kotlin.noarg.AbstractBlackBoxCodegenTestForNoArg
 import org.jetbrains.kotlin.noarg.AbstractBytecodeListingTestForNoArg
 import org.jetbrains.kotlin.psi.patternMatching.AbstractPsiUnifierTest
@@ -934,6 +936,16 @@ fun main(args: Array<String>) {
             model("fileOrElement", extension = "java")
         }
     }
+
+    testGroup("nj2k/tests", "nj2k/testData") {
+        testClass<AbstractNewJavaToKotlinConverterSingleFileTest> {
+            model("newJ2k", extension = "java")
+        }
+        testClass<AbstractNullabilityAnalysisTest> {
+            model("nullabilityAnalysis")
+        }
+    }
+
 /*  There is no jps in AS
     ....
 */
diff --git a/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java b/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
index eb216f695a1..601fc22ff58 100644
--- a/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
+++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/NewJavaToKotlinConverterSingleFileTestGenerated.java
@@ -25,7 +25,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         KotlinTestUtils.runTest(this::doTest, TargetBackend.ANY, testDataFilePath);
     }
 
-    public void testAllFilesPresentInFileOrElement() throws Exception {
+    public void testAllFilesPresentInNewJ2k() throws Exception {
         KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("nj2k/testData/newJ2k"), Pattern.compile("^(.+)\\.java$"), TargetBackend.ANY, true);
     }
 
@@ -2855,11 +2855,6 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
         public void testSpaceBeforeAssignment() throws Exception {
             runTest("nj2k/testData/newJ2k/issues/spaceBeforeAssignment.java");
         }
-
-        @TestMetadata("unfinishedReferenceExpression.java")
-        public void testUnfinishedReferenceExpression() throws Exception {
-            runTest("nj2k/testData/newJ2k/issues/unfinishedReferenceExpression.java");
-        }
     }
 
     @TestMetadata("nj2k/testData/newJ2k/kotlinApiAccess")
@@ -3806,7 +3801,7 @@ public class NewJavaToKotlinConverterSingleFileTestGenerated extends AbstractNew
 
         @TestMetadata("java8MapForEachWithFullJdk.java")
         public void testJava8MapForEachWithFullJdk() throws Exception {
-            runTest("j2k/testData/fileOrElement/postProcessing/java8MapForEachWithFullJdk.java");
+            runTest("nj2k/testData/newJ2k/postProcessing/java8MapForEachWithFullJdk.java");
         }
 
         @TestMetadata("NotIs.java")