diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/PatternMatchingTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/WhenTest.java
similarity index 92%
rename from js/js.tests/test/org/jetbrains/k2js/test/semantics/PatternMatchingTest.java
rename to js/js.tests/test/org/jetbrains/k2js/test/semantics/WhenTest.java
index 3622d42865b..2155feab807 100644
--- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/PatternMatchingTest.java
+++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/WhenTest.java
@@ -16,13 +16,12 @@
 
 package org.jetbrains.k2js.test.semantics;
 
-import org.jetbrains.k2js.test.SingleFileTranslationTest;
 import org.mozilla.javascript.JavaScriptException;
 
-public final class PatternMatchingTest extends SingleFileTranslationTest {
+public final class WhenTest extends AbstractExpressionTest {
 
-    public PatternMatchingTest() {
-        super("patternMatching/");
+    public WhenTest() {
+        super("when/");
     }
 
     public void testWhenType() throws Exception {
diff --git a/js/js.translator/testData/patternMatching/cases/doWhileWithOneStmWhen.kt b/js/js.translator/testData/expression/when/cases/doWhileWithOneStmWhen.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/doWhileWithOneStmWhen.kt
rename to js/js.translator/testData/expression/when/cases/doWhileWithOneStmWhen.kt
diff --git a/js/js.translator/testData/patternMatching/cases/forWithOneStmWhen.kt b/js/js.translator/testData/expression/when/cases/forWithOneStmWhen.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/forWithOneStmWhen.kt
rename to js/js.translator/testData/expression/when/cases/forWithOneStmWhen.kt
diff --git a/js/js.translator/testData/patternMatching/cases/ifInWhen.kt b/js/js.translator/testData/expression/when/cases/ifInWhen.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/ifInWhen.kt
rename to js/js.translator/testData/expression/when/cases/ifInWhen.kt
diff --git a/js/js.translator/testData/patternMatching/cases/ifWithOneStmWhen.kt b/js/js.translator/testData/expression/when/cases/ifWithOneStmWhen.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/ifWithOneStmWhen.kt
rename to js/js.translator/testData/expression/when/cases/ifWithOneStmWhen.kt
diff --git a/js/js.translator/testData/patternMatching/cases/kt1665.kt b/js/js.translator/testData/expression/when/cases/kt1665.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/kt1665.kt
rename to js/js.translator/testData/expression/when/cases/kt1665.kt
diff --git a/js/js.translator/testData/patternMatching/cases/matchNullableType.kt b/js/js.translator/testData/expression/when/cases/matchNullableType.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/matchNullableType.kt
rename to js/js.translator/testData/expression/when/cases/matchNullableType.kt
diff --git a/js/js.translator/testData/patternMatching/cases/multipleCases.kt b/js/js.translator/testData/expression/when/cases/multipleCases.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/multipleCases.kt
rename to js/js.translator/testData/expression/when/cases/multipleCases.kt
diff --git a/js/js.translator/testData/patternMatching/cases/whenAsExpression.kt b/js/js.translator/testData/expression/when/cases/whenAsExpression.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/whenAsExpression.kt
rename to js/js.translator/testData/expression/when/cases/whenAsExpression.kt
diff --git a/js/js.translator/testData/patternMatching/cases/whenAsExpressionWithThrow.kt b/js/js.translator/testData/expression/when/cases/whenAsExpressionWithThrow.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/whenAsExpressionWithThrow.kt
rename to js/js.translator/testData/expression/when/cases/whenAsExpressionWithThrow.kt
diff --git a/js/js.translator/testData/patternMatching/cases/whenEvaluatesArgumentOnlyOnce.kt b/js/js.translator/testData/expression/when/cases/whenEvaluatesArgumentOnlyOnce.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/whenEvaluatesArgumentOnlyOnce.kt
rename to js/js.translator/testData/expression/when/cases/whenEvaluatesArgumentOnlyOnce.kt
diff --git a/js/js.translator/testData/patternMatching/cases/whenExecutesOnlyOnce.kt b/js/js.translator/testData/expression/when/cases/whenExecutesOnlyOnce.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/whenExecutesOnlyOnce.kt
rename to js/js.translator/testData/expression/when/cases/whenExecutesOnlyOnce.kt
diff --git a/js/js.translator/testData/patternMatching/cases/whenNotType.kt b/js/js.translator/testData/expression/when/cases/whenNotType.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/whenNotType.kt
rename to js/js.translator/testData/expression/when/cases/whenNotType.kt
diff --git a/js/js.translator/testData/patternMatching/cases/whenType.kt b/js/js.translator/testData/expression/when/cases/whenType.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/whenType.kt
rename to js/js.translator/testData/expression/when/cases/whenType.kt
diff --git a/js/js.translator/testData/patternMatching/cases/whenValue.kt b/js/js.translator/testData/expression/when/cases/whenValue.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/whenValue.kt
rename to js/js.translator/testData/expression/when/cases/whenValue.kt
diff --git a/js/js.translator/testData/patternMatching/cases/whenValueOrType.kt b/js/js.translator/testData/expression/when/cases/whenValueOrType.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/whenValueOrType.kt
rename to js/js.translator/testData/expression/when/cases/whenValueOrType.kt
diff --git a/js/js.translator/testData/patternMatching/cases/whenWithIf.kt b/js/js.translator/testData/expression/when/cases/whenWithIf.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/whenWithIf.kt
rename to js/js.translator/testData/expression/when/cases/whenWithIf.kt
diff --git a/js/js.translator/testData/patternMatching/cases/whenWithOneStmWhen.kt b/js/js.translator/testData/expression/when/cases/whenWithOneStmWhen.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/whenWithOneStmWhen.kt
rename to js/js.translator/testData/expression/when/cases/whenWithOneStmWhen.kt
diff --git a/js/js.translator/testData/patternMatching/cases/whenWithOnlyElse.kt b/js/js.translator/testData/expression/when/cases/whenWithOnlyElse.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/whenWithOnlyElse.kt
rename to js/js.translator/testData/expression/when/cases/whenWithOnlyElse.kt
diff --git a/js/js.translator/testData/patternMatching/cases/whenWithoutExpression.kt b/js/js.translator/testData/expression/when/cases/whenWithoutExpression.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/whenWithoutExpression.kt
rename to js/js.translator/testData/expression/when/cases/whenWithoutExpression.kt
diff --git a/js/js.translator/testData/patternMatching/cases/whileWithOneStmWhen.kt b/js/js.translator/testData/expression/when/cases/whileWithOneStmWhen.kt
similarity index 100%
rename from js/js.translator/testData/patternMatching/cases/whileWithOneStmWhen.kt
rename to js/js.translator/testData/expression/when/cases/whileWithOneStmWhen.kt