diff --git a/src/org/labkey/test/util/APIContainerHelper.java b/src/org/labkey/test/util/APIContainerHelper.java
index 676e4b4cc9..e2fde4b495 100644
--- a/src/org/labkey/test/util/APIContainerHelper.java
+++ b/src/org/labkey/test/util/APIContainerHelper.java
@@ -31,8 +31,6 @@
 
 import java.io.IOException;
 import java.net.SocketTimeoutException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -197,10 +195,10 @@ public void renameFolder(String project, String folderName, String newFolderName
     @LogMethod
     public void renameFolder(@LoggedParam String containerPath, @LoggedParam String newName, final boolean createAlias)
     {
-        Map<String, String> params = new HashMap<>();
-        params.put("name", URLEncoder.encode(newName, StandardCharsets.UTF_8));
-        params.put("addAlias", String.valueOf(createAlias));
-        params.put("titleSameAsName", String.valueOf(true));
+        Map<String, Object> params = new HashMap<>();
+        params.put("name", newName);
+        params.put("addAlias", createAlias);
+        params.put("titleSameAsName", true);
         SimpleHttpRequest simpleHttpRequest = new SimpleHttpRequest(WebTestHelper.buildURL("admin", containerPath, "renameFolder", params), "POST");
         simpleHttpRequest.copySession(_test.getDriver());
 
diff --git a/src/org/labkey/test/util/Crawler.java b/src/org/labkey/test/util/Crawler.java
index 8a698455aa..3e2eb03ba6 100644
--- a/src/org/labkey/test/util/Crawler.java
+++ b/src/org/labkey/test/util/Crawler.java
@@ -1430,9 +1430,9 @@ String queryStringFromEntries(List<Map.Entry<String,String>> list)
         {
             if (!sb.isEmpty())
                 sb.append('&');
-            sb.append(URLEncoder.encode(e.getKey(), StandardCharsets.UTF_8));
+            sb.append(EscapeUtil.encode(e.getKey()));
             sb.append('=');
-            sb.append(null==e.getValue()?"":URLEncoder.encode(e.getValue(), StandardCharsets.UTF_8));
+            sb.append(EscapeUtil.encode(e.getValue()));
         }
         );
         return sb.toString();
diff --git a/src/org/labkey/test/util/EscapeUtil.java b/src/org/labkey/test/util/EscapeUtil.java
index 753f8bc07e..d34cefab3c 100644
--- a/src/org/labkey/test/util/EscapeUtil.java
+++ b/src/org/labkey/test/util/EscapeUtil.java
@@ -78,7 +78,9 @@ static public String jsString(String s)
      */
     public static String encode(String s)
     {
-        return s == null ? "" : URLEncoder.encode(s, StandardCharsets.UTF_8);
+        return s == null ? "" : URLEncoder.encode(s, StandardCharsets.UTF_8)
+            // Product often doesn't decode '+' into ' '. "%20" is a more reliable encoding
+            .replace("+", "%20");
     }
 
     /**