diff --git a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/StandaloneMockMvcBuilder.java b/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/StandaloneMockMvcBuilder.java
index e899264026..cb42aef30e 100644
--- a/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/StandaloneMockMvcBuilder.java
+++ b/spring-test-mvc/src/main/java/org/springframework/test/web/mock/servlet/setup/StandaloneMockMvcBuilder.java
@@ -31,6 +31,7 @@ import org.springframework.mock.web.MockServletContext;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.validation.Validator;
+import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationObjectSupport;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
@@ -42,6 +43,7 @@ import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.View;
 import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
@@ -87,10 +89,14 @@ public class StandaloneMockMvcBuilder extends DefaultMockMvcBuilder<StandaloneMo
 
 	private Validator validator = null;
 
+	private ContentNegotiationManager contentNegotiationManager;
+
 	private FormattingConversionService conversionService = null;
 
 	private List<HandlerExceptionResolver> handlerExceptionResolvers = new ArrayList<HandlerExceptionResolver>();
 
+	private Long asyncRequestTimeout;
+
 	private List<ViewResolver> viewResolvers;
 
 	private LocaleResolver localeResolver = new AcceptHeaderLocaleResolver();
@@ -160,6 +166,23 @@ public class StandaloneMockMvcBuilder extends DefaultMockMvcBuilder<StandaloneMo
 		return this;
 	}
 
+	/**
+	 * Set a ContentNegotiationManager.
+	 */
+	protected void setContentNegotiationManager(ContentNegotiationManager contentNegotiationManager) {
+		this.contentNegotiationManager = contentNegotiationManager;
+	}
+
+	/**
+	 * Specify the timeout value for async execution. In Spring MVC Test, this
+	 * value is used to determine how to long to wait for async execution to
+	 * complete so that a test can verify the results synchronously.
+	 * @param timeout the timeout value in milliseconds
+	 */
+	public void setAsyncRequestTimeout(long timeout) {
+		this.asyncRequestTimeout = timeout;
+	}
+
 	/**
 	 * Provide custom resolvers for controller method arguments.
 	 */
@@ -330,11 +353,23 @@ public class StandaloneMockMvcBuilder extends DefaultMockMvcBuilder<StandaloneMo
 			}
 		}
 
+		@Override
+		public ContentNegotiationManager mvcContentNegotiationManager() {
+			return (contentNegotiationManager != null) ? contentNegotiationManager : super.mvcContentNegotiationManager();
+		}
+
 		@Override
 		public FormattingConversionService mvcConversionService() {
 			return (conversionService != null) ? conversionService : super.mvcConversionService();
 		}
 
+		@Override
+		public void configureAsyncSupport(AsyncSupportConfigurer configurer) {
+			if (asyncRequestTimeout != null) {
+				configurer.setDefaultTimeout(asyncRequestTimeout);
+			}
+		}
+
 		@Override
 		public Validator mvcValidator() {
 			Validator mvcValidator = (validator != null) ? validator : super.mvcValidator();