diff --git a/org.springframework.web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java b/org.springframework.web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
index 048114d4b49..4303503858c 100644
--- a/org.springframework.web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
+++ b/org.springframework.web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
@@ -30,6 +30,7 @@ import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.http.HttpHeaders;
@@ -115,7 +116,7 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
 	}
 
 	private boolean isFormSubmittal(HttpServletRequest request) {
-		return FORM_CONTENT_TYPE.equals(request.getContentType()) &&
+		return request.getContentType() != null && request.getContentType().contains(FORM_CONTENT_TYPE) &&
 				(METHOD_POST.equalsIgnoreCase(request.getMethod()) || METHOD_PUT.equalsIgnoreCase(request.getMethod()));
 	}
 
diff --git a/org.springframework.web/src/test/java/org/springframework/http/server/ServletHttpRequestTests.java b/org.springframework.web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
similarity index 95%
rename from org.springframework.web/src/test/java/org/springframework/http/server/ServletHttpRequestTests.java
rename to org.springframework.web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
index fc4d716ca05..30fd57b6b79 100644
--- a/org.springframework.web/src/test/java/org/springframework/http/server/ServletHttpRequestTests.java
+++ b/org.springframework.web/src/test/java/org/springframework/http/server/ServletServerHttpRequestTests.java
@@ -32,7 +32,7 @@ import static org.junit.Assert.*;
 /**
  * @author Arjen Poutsma
  */
-public class ServletHttpRequestTests {
+public class ServletServerHttpRequestTests {
 
 	private ServletServerHttpRequest request;
 
@@ -88,7 +88,8 @@ public class ServletHttpRequestTests {
 
 	@Test
 	public void getFormBody() throws Exception {
-		mockRequest.setContentType("application/x-www-form-urlencoded");
+		// Charset (SPR-8676)
+		mockRequest.setContentType("application/x-www-form-urlencoded; charset=UTF-8");
 		mockRequest.setMethod("POST");
 		mockRequest.addParameter("name 1", "value 1");
 		mockRequest.addParameter("name 2", new String[] {"value 2+1", "value 2+2"});
@@ -98,4 +99,5 @@ public class ServletHttpRequestTests {
 		byte[] content = "name+1=value+1&name+2=value+2%2B1&name+2=value+2%2B2&name+3".getBytes("UTF-8");
 		assertArrayEquals("Invalid content returned", content, result);
 	}
+
 }
\ No newline at end of file
diff --git a/org.springframework.web/src/test/java/org/springframework/http/server/ServletHttpResponseTests.java b/org.springframework.web/src/test/java/org/springframework/http/server/ServletServerHttpResponseTests.java
similarity index 97%
rename from org.springframework.web/src/test/java/org/springframework/http/server/ServletHttpResponseTests.java
rename to org.springframework.web/src/test/java/org/springframework/http/server/ServletServerHttpResponseTests.java
index 01fc88775cb..bad9ccdb840 100644
--- a/org.springframework.web/src/test/java/org/springframework/http/server/ServletHttpResponseTests.java
+++ b/org.springframework.web/src/test/java/org/springframework/http/server/ServletServerHttpResponseTests.java
@@ -30,7 +30,7 @@ import org.springframework.http.HttpStatus;
 /**
  * @author Arjen Poutsma
  */
-public class ServletHttpResponseTests {
+public class ServletServerHttpResponseTests {
 
 	private ServletServerHttpResponse response;