diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java
index c6e98c194d0..c7b397f3647 100644
--- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java
+++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/parser/Lexer.java
@@ -1453,7 +1453,7 @@ public class Lexer extends Scanner {
 
             // Scan identifier. It might be quoted, indicating that no string editing should take place.
             final char quoteChar = ch0;
-            final boolean noStringEditing = isStringDelimiter(quoteChar);
+            final boolean noStringEditing = quoteChar == '"' || quoteChar == '\'';
             if (noStringEditing) {
                 skip(1);
             }
diff --git a/nashorn/test/script/nosecurity/JDK-8073613.js b/nashorn/test/script/nosecurity/JDK-8073613.js
index 04d50aba7db..5376ba7b366 100644
--- a/nashorn/test/script/nosecurity/JDK-8073613.js
+++ b/nashorn/test/script/nosecurity/JDK-8073613.js
@@ -44,10 +44,6 @@ print(<<'EOM')
 ${a}${b}
 EOM
 
-print(<<`EOM`)
-${c}
-EOM
-
 print(<<"EOM")
 $\{a}
 EOM
diff --git a/nashorn/test/script/nosecurity/JDK-8073613.js.EXPECTED b/nashorn/test/script/nosecurity/JDK-8073613.js.EXPECTED
index 27192117a85..7ef62b4ece3 100644
--- a/nashorn/test/script/nosecurity/JDK-8073613.js.EXPECTED
+++ b/nashorn/test/script/nosecurity/JDK-8073613.js.EXPECTED
@@ -1,5 +1,4 @@
 23
 ${a}${b}
 ${a}${b}
-${c}
 $\{a}