diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
index e38a9b27c20..2d2802f94e0 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilder.java
@@ -358,13 +358,11 @@ final class HtmlUnitRequestBuilder implements RequestBuilder, Mergeable {
 	}
 
 	private void params(MockHttpServletRequest request, UriComponents uriComponents) {
-		for (Entry<String, List<String>> values : uriComponents.getQueryParams().entrySet()) {
-			String name = values.getKey();
-			for (String value : values.getValue()) {
+		for (Entry<String, List<String>> entry : uriComponents.getQueryParams().entrySet()) {
+			String name = entry.getKey();
+			for (String value : entry.getValue()) {
 				try {
-					if (value != null) {
-						value = URLDecoder.decode(value, "UTF-8");
-					}
+					value = (value != null ? URLDecoder.decode(value, "UTF-8") : "");
 					request.addParameter(name, value);
 				}
 				catch (UnsupportedEncodingException e) {
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
index 61e09c3271f..3248113d690 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/HtmlUnitRequestBuilderTests.java
@@ -417,7 +417,7 @@ public class HtmlUnitRequestBuilderTests {
 		MockHttpServletRequest actualRequest = requestBuilder.buildRequest(servletContext);
 
 		assertThat(actualRequest.getParameterMap().size(), equalTo(1));
-		assertThat(actualRequest.getParameter("name"), nullValue());
+		assertThat(actualRequest.getParameter("name"), equalTo(""));
 	}
 
 	@Test