diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 4bca5fb9510..b5bbaa28e65 100755
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -649,20 +649,19 @@ fun main(args: Array<String>) {
         }
 
         // Not supported yet
-        testClass<AbstractJavaStreamTraceTestCase> {
-            //            model("debugger/tinyApp/src/streams/java")
-        }
+//        testClass<AbstractJavaStreamTraceTestCase> {
+//                        model("debugger/tinyApp/src/streams/java")
+//        }
+
+//        testClass<AbstractCollectionTraceTestCase> {
+//                        model("debugger/tinyApp/src/streams/collection")
+//        }
 
         testClass<AbstractSequenceTraceTestCase> {
             // We need to implement mapping logic for terminal operations
             model("debugger/tinyApp/src/streams/sequence", excludeDirs = listOf("terminal"))
         }
 
-        // Not supported yet
-        testClass<AbstractCollectionTraceTestCase> {
-            //            model("debugger/tinyApp/src/streams/collection")
-        }
-
         testClass<AbstractStubBuilderTest> {
             model("stubs", extension = "kt")
         }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/CollectionTraceTestCaseGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/CollectionTraceTestCaseGenerated.java
deleted file mode 100644
index afe8b2bfa52..00000000000
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/CollectionTraceTestCaseGenerated.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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.idea.debugger.sequence.exec;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TargetBackend;
-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")
-@RunWith(JUnit3RunnerWithInners.class)
-public class CollectionTraceTestCaseGenerated extends AbstractCollectionTraceTestCase {
-}
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/JavaStreamTraceTestCaseGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/JavaStreamTraceTestCaseGenerated.java
deleted file mode 100644
index 59b508f740a..00000000000
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/sequence/exec/JavaStreamTraceTestCaseGenerated.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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.idea.debugger.sequence.exec;
-
-import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
-import org.jetbrains.kotlin.test.TargetBackend;
-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")
-@RunWith(JUnit3RunnerWithInners.class)
-public class JavaStreamTraceTestCaseGenerated extends AbstractJavaStreamTraceTestCase {
-}