diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/LineCollector.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/LineCollector.kt
index 6d2e9ffe00a..9cb2c7cb818 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/LineCollector.kt
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/LineCollector.kt
@@ -147,6 +147,19 @@ class LineCollector : RecursiveJsVisitor() {
         }
     }
 
+
+    override fun visitSingleLineComment(comment: JsSingleLineComment) {
+        withStatement(comment) {
+            lineNumbersByStatement[comment]?.add(-1)
+        }
+    }
+
+    override fun visitMultiLineComment(comment: JsMultiLineComment) {
+        withStatement(comment) {
+            lineNumbersByStatement[comment]?.add(-1)
+        }
+    }
+
     private fun withStatement(statement: JsStatement, action: () -> Unit) {
         val oldStatement = currentStatement
         currentStatement = statement
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/testOld/utils/DirectiveTestUtils.java b/js/js.tests/test/org/jetbrains/kotlin/js/testOld/utils/DirectiveTestUtils.java
index a055d7f848a..9a5bc29dbee 100644
--- a/js/js.tests/test/org/jetbrains/kotlin/js/testOld/utils/DirectiveTestUtils.java
+++ b/js/js.tests/test/org/jetbrains/kotlin/js/testOld/utils/DirectiveTestUtils.java
@@ -687,7 +687,7 @@ public class DirectiveTestUtils {
         private final List<String> positionalArguments = new ArrayList<>();
         private final Map<String, String> namedArguments = new HashMap<>();
         private final String entry;
-        private final Pattern argumentsPattern = Pattern.compile("\\w+(=((\".*?\")|([\\w$_;])+))?");
+        private final Pattern argumentsPattern = Pattern.compile("[\\w$_;]+(=((\".*?\")|[\\w$_;]+))?");
 
         ArgumentsHelper(@NotNull String directiveEntry) {
             entry = directiveEntry;