diff --git a/lib/src/http/uri.rs b/lib/src/http/uri.rs
index a78a7fee..bd9453fe 100644
--- a/lib/src/http/uri.rs
+++ b/lib/src/http/uri.rs
@@ -546,6 +546,8 @@ mod tests {
         test_query("/////", None);
         test_query("//a///", None);
         test_query("/a/b/c#a?123", None);
+        test_query("/#", None);
+        test_query("/#?", None);
     }
 
     #[test]
@@ -564,8 +566,10 @@ mod tests {
     fn fragment_exists() {
         test_fragment("/test#abc", Some("abc"));
         test_fragment("/#abc", Some("abc"));
+        test_fragment("/#ab?c", Some("ab?c"));
         test_fragment("/a/b/c?123#a", Some("a"));
         test_fragment("/a/b/c#a?123", Some("a?123"));
+        test_fragment("/a/b/c?123#a?b", Some("a?b"));
         test_fragment("/#a", Some("a"));
     }