diff --git a/lib/OpenLayers/Ajax.js b/lib/OpenLayers/Ajax.js
index 4058e5a0d5..8c721e9a13 100644
--- a/lib/OpenLayers/Ajax.js
+++ b/lib/OpenLayers/Ajax.js
@@ -60,7 +60,7 @@ OpenLayers.loadURL = function(uri, params, caller,
                                   onComplete, onFailure) {
 
     if (OpenLayers.ProxyHost && OpenLayers.String.startsWith(uri, "http")) {
-        uri = OpenLayers.ProxyHost + escapeURIComponent(uri);
+        uri = OpenLayers.ProxyHost + encodeURIComponent(uri);
     }
 
     var success = (onComplete) ? OpenLayers.Function.bind(onComplete, caller)
diff --git a/tests/list-tests.html b/tests/list-tests.html
index 1f5bd4cafc..40b56125f8 100644
--- a/tests/list-tests.html
+++ b/tests/list-tests.html
@@ -1,4 +1,5 @@
 <ul id="testlist">
+    <li>test_Ajax.html</li>
     <li>test_BaseTypes.html</li>
     <li>BaseTypes/test_Bounds.html</li>
     <li>BaseTypes/test_Class.html</li>
@@ -24,6 +25,7 @@
     <li>Format/test_GeoRSS.html</li>
     <li>Format/test_GML.html</li>
     <li>Format/test_JSON.html</li>
+    <li>Format/test_OSM.html</li>
     <li>Format/test_KML.html</li>
     <li>Format/test_SLD.html</li>
     <li>Format/test_WKT.html</li>
diff --git a/tests/test_Ajax.html b/tests/test_Ajax.html
new file mode 100644
index 0000000000..fc52c0ead8
--- /dev/null
+++ b/tests/test_Ajax.html
@@ -0,0 +1,19 @@
+<html>
+<head>
+  <script src="../lib/OpenLayers.js"></script>
+  <script type="text/javascript">
+
+    function test_Ajax_loadUrl(t) {
+        t.plan(1);
+        var req = OpenLayers.Ajax.Request;
+        OpenLayers.ProxyHost = "/?url=";
+        OpenLayers.Ajax.Request = function(uri) {
+            t.eq(uri, "/?url=http%3A%2F%2Fexample.com%2F%3Fformat%3Dimage%2Bkml", "URI matches what we expect from loadurl");
+        }
+        OpenLayers.loadURL("http://example.com/?format=image+kml");
+    }
+  </script>
+</head>
+<body>
+</body>
+</html>
