diff --git a/src/testinputs/com/puppycrawl/tools/checkstyle/grammars/InputEmbeddedNullChar.java b/src/testinputs/com/puppycrawl/tools/checkstyle/grammars/InputEmbeddedNullChar.java
index 0388287ba..687b92c15 100644
Binary files a/src/testinputs/com/puppycrawl/tools/checkstyle/grammars/InputEmbeddedNullChar.java and b/src/testinputs/com/puppycrawl/tools/checkstyle/grammars/InputEmbeddedNullChar.java differ
diff --git a/src/tests/com/puppycrawl/tools/checkstyle/grammars/EmbeddedNullCharTest.java b/src/tests/com/puppycrawl/tools/checkstyle/grammars/EmbeddedNullCharTest.java
new file mode 100644
index 000000000..e5c4eb811
--- /dev/null
+++ b/src/tests/com/puppycrawl/tools/checkstyle/grammars/EmbeddedNullCharTest.java
@@ -0,0 +1,22 @@
+package com.puppycrawl.tools.checkstyle.grammars;
+
+import com.puppycrawl.tools.checkstyle.BaseCheckTestCase;
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck;
+
+/**
+ * Tests that embedded nulls in string literals does not halt parsing.
+ * @author Michael Studman
+ */
+public class EmbeddedNullCharTest
+    extends BaseCheckTestCase
+{
+    public void testCanParse()
+        throws Exception
+    {
+        final DefaultConfiguration checkConfig =
+            createCheckConfig(MemberNameCheck.class);
+        final String[] expected = {};
+        verify(checkConfig, getPath("grammars/InputEmbeddedNullChar.java"), expected);
+    }
+}