diff --git a/src/share/classes/java/net/URI.java b/src/share/classes/java/net/URI.java
index 5712821e9d8ace2a9147e49c37aa8d284ac0aed6..6997a427467d3a96bf941b363473cee936fa7b59 100644
--- a/src/share/classes/java/net/URI.java
+++ b/src/share/classes/java/net/URI.java
@@ -1711,6 +1711,8 @@ public final class URI
                     i++;
                     continue;
                 }
+                if (d != '%')
+                    return false;
                 i++;
                 if (toLower(s.charAt(i)) != toLower(t.charAt(i)))
                     return false;
diff --git a/test/java/net/URI/Test.java b/test/java/net/URI/Test.java
index fb0fa3326294652965b93e3ada87e28fb7902cd0..b24bedf19f38ac36cf7b48c7ad220da7592f0902 100644
--- a/test/java/net/URI/Test.java
+++ b/test/java/net/URI/Test.java
@@ -23,7 +23,7 @@
 
 /* @test
  * @summary Unit test for java.net.URI
- * @bug 4464135 4505046 4503239 4438319 4991359 4866303 7023363
+ * @bug 4464135 4505046 4503239 4438319 4991359 4866303 7023363 7041800
  * @author Mark Reinhold
  */
 
@@ -1428,6 +1428,8 @@ public class Test {
         gt(s, new URI("http://jag:CafeBabe@java.sun.com:94/b/c/d?q#f"));
         lt(s, new URI("http://jag:cafebabe@java.sun.com:94/b/c/d?r#f"));
         lt(s, new URI("http://jag:cafebabe@java.sun.com:94/b/c/d?q#g"));
+        eq(new URI("http://host/a%00bcd"), new URI("http://host/a%00bcd"));
+        ne(new URI("http://host/a%00bcd"), new URI("http://host/aZ00bcd"));
 
         lt("p", "s:p");
         lt("s:p", "T:p");