diff --git a/akka-http-core/src/test/scala/akka/http/model/UriSpec.scala b/akka-http-core/src/test/scala/akka/http/model/UriSpec.scala
index d37b02533e..7c1a899a81 100644
--- a/akka-http-core/src/test/scala/akka/http/model/UriSpec.scala
+++ b/akka-http-core/src/test/scala/akka/http/model/UriSpec.scala
@@ -302,6 +302,18 @@ class UriSpec extends WordSpec with Matchers {
       Query() shouldEqual Empty
       Query("k" -> "v") shouldEqual ("k" -> "v") +: Empty
     }
+    "encode special separators in query parameter names" in {
+      Query("a=b" -> "c").toString() === "a%3Db=c"
+      Query("a&b" -> "c").toString() === "a%26b=c"
+      Query("a+b" -> "c").toString() === "a%2Bb=c"
+      Query("a;b" -> "c").toString() === "a%3Bb=c"
+    }
+    "encode special separators in query parameter values" in {
+      Query("a" -> "b=c").toString() === "a=b%3Dc"
+      Query("a" -> "b&c").toString() === "a=b%26c"
+      Query("a" -> "b+c").toString() === "a=b%2Bc"
+      Query("a" -> "b;c").toString() === "a=b%3Bc"
+    }
   }
 
   "URIs" should {