diff --git a/src/org/labkey/test/util/URLBuilder.java b/src/org/labkey/test/util/URLBuilder.java
index dc067e4067..c911bd3899 100644
--- a/src/org/labkey/test/util/URLBuilder.java
+++ b/src/org/labkey/test/util/URLBuilder.java
@@ -107,7 +107,7 @@ public URLBuilder setQuery(Map<String, ?> query)
     public URLBuilder setAppResourcePath(Object... pathParts)
     {
         List<String> encodedParts = Arrays.stream(pathParts).map(Objects::requireNonNull).map(String::valueOf)
-                .map(URIUtil::encodePath).collect(Collectors.toList());
+                .map(s -> EscapeUtil.encode(s).replace("+", " ")).collect(Collectors.toList());
         setFragment("/" + String.join("/", encodedParts));
         return this;
     }
@@ -212,11 +212,11 @@ private void appendQueryString(StringBuilder url, Map<String, ?> params)
                 if (null != param.getKey())
                 {
                     url.append(firstParam ? "?" : "&");
-                    url.append(param.getKey());
+                    url.append(EscapeUtil.encode(param.getKey()));
                     if (null != param.getValue())
                     {
                         url.append("=");
-                        url.append(param.getValue());
+                        url.append(EscapeUtil.encode(String.valueOf(param.getValue())));
                     }
                     firstParam = false;
                 }