diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
index 87594e4820..42cb5d300a 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java
@@ -335,7 +335,7 @@ public class MockHttpServletRequestBuilder
 	 * @param sessionAttributes the session attributes
 	 */
 	public MockHttpServletRequestBuilder sessionAttrs(Map<String, Object> sessionAttributes) {
-		Assert.notEmpty(sessionAttributes, "'sessionAttrs' must not be empty");
+		Assert.notEmpty(sessionAttributes, "'sessionAttributes' must not be empty");
 		for (String name : sessionAttributes.keySet()) {
 			sessionAttr(name, sessionAttributes.get(name));
 		}
@@ -357,7 +357,7 @@ public class MockHttpServletRequestBuilder
 	 * @param flashAttributes the flash attributes
 	 */
 	public MockHttpServletRequestBuilder flashAttrs(Map<String, Object> flashAttributes) {
-		Assert.notEmpty(flashAttributes, "'flashAttrs' must not be empty");
+		Assert.notEmpty(flashAttributes, "'flashAttributes' must not be empty");
 		for (String name : flashAttributes.keySet()) {
 			flashAttr(name, flashAttributes.get(name));
 		}
@@ -708,7 +708,8 @@ public class MockHttpServletRequestBuilder
 	}
 
 	private MultiValueMap<String, String> parseFormData(final MediaType mediaType) {
-		MultiValueMap<String, String> map;HttpInputMessage message = new HttpInputMessage() {
+		MultiValueMap<String, String> map;
+		HttpInputMessage message = new HttpInputMessage() {
 			@Override
 			public InputStream getBody() throws IOException {
 				return new ByteArrayInputStream(content);
@@ -725,7 +726,7 @@ public class MockHttpServletRequestBuilder
 			map = new FormHttpMessageConverter().read(null, message);
 		}
 		catch (IOException ex) {
-			throw new IllegalStateException("Failed to parse form data in request body: ", ex);
+			throw new IllegalStateException("Failed to parse form data in request body", ex);
 		}
 		return map;
 	}
diff --git a/src/asciidoc/testing.adoc b/src/asciidoc/testing.adoc
index 8433b26167..3eaf2e4205 100644
--- a/src/asciidoc/testing.adoc
+++ b/src/asciidoc/testing.adoc
@@ -3433,7 +3433,7 @@ for the various `executeSqlScript(..)` methods for further details.
 
 
 [[testcontext-executing-sql-declaratively]]
-===== Executing SQL scripts declaratively with `@Sql`
+===== Executing SQL scripts declaratively with @Sql
 
 In addition to the aforementioned mechanisms for executing SQL scripts
 _programmatically_, SQL scripts can also be configured _declaratively_ in the Spring