diff --git a/SocketIO-MacTests/SocketEngineTest.swift b/SocketIO-MacTests/SocketEngineTest.swift
index 7b2388c..ec543a1 100644
--- a/SocketIO-MacTests/SocketEngineTest.swift
+++ b/SocketIO-MacTests/SocketEngineTest.swift
@@ -86,4 +86,20 @@ class SocketEngineTest: XCTestCase {
         engine.parsePollingMessage("41:42[\"stringTest\",\"lïne one\\nlīne \\rtwo\"]")
         waitForExpectationsWithTimeout(3, handler: nil)
     }
+
+    func testEncodeURLProperly() {
+        engine.connectParams = [
+            "created": "2016-05-04T18:31:15+0200"
+        ]
+
+        XCTAssertEqual(engine.urlPolling.query, "transport=polling&b64=1&created=2016-05-04T18%3A31%3A15%2B0200")
+        XCTAssertEqual(engine.urlWebSocket.query, "transport=websocket&created=2016-05-04T18%3A31%3A15%2B0200")
+
+        engine.connectParams = [
+            "forbidden": "!*'();:@&=+$,/?%#[]\" {}"
+        ]
+
+        XCTAssertEqual(engine.urlPolling.query, "transport=polling&b64=1&forbidden=%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23%5B%5D%22%20%7B%7D")
+        XCTAssertEqual(engine.urlWebSocket.query, "transport=websocket&forbidden=%21%2A%27%28%29%3B%3A%40%26%3D%2B%24%2C%2F%3F%25%23%5B%5D%22%20%7B%7D")
+    }
 }