diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java
index d3e15b2d..480c352f 100644
--- a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java
+++ b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootAnnotationMethodEndpointMappingTest.java
@@ -33,6 +33,7 @@ import org.springframework.ws.server.EndpointAdapter;
 import org.springframework.ws.server.EndpointMapping;
 import org.springframework.ws.server.MessageDispatcher;
 import org.springframework.ws.server.endpoint.MethodEndpoint;
+import org.springframework.ws.server.endpoint.adapter.DefaultMethodEndpointAdapter;
 import org.springframework.ws.server.endpoint.adapter.PayloadMethodEndpointAdapter;
 import org.springframework.ws.soap.saaj.SaajSoapMessage;
 import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
@@ -73,12 +74,13 @@ public class PayloadRootAnnotationMethodEndpointMappingTest  {
         request.getSOAPBody().addBodyElement(QName.valueOf("{http://springframework.org/spring-ws}Request"));
         MessageContext messageContext =
                 new DefaultMessageContext(new SaajSoapMessage(request), new SaajSoapMessageFactory(messageFactory));
-        EndpointAdapter adapter = new PayloadMethodEndpointAdapter();
+        DefaultMethodEndpointAdapter adapter = new DefaultMethodEndpointAdapter();
+        adapter.afterPropertiesSet();
 
         MessageDispatcher messageDispatcher = new SoapMessageDispatcher();
         messageDispatcher.setApplicationContext(applicationContext);
         messageDispatcher.setEndpointMappings(Collections.<EndpointMapping>singletonList(mapping));
-        messageDispatcher.setEndpointAdapters(Collections.singletonList(adapter));
+        messageDispatcher.setEndpointAdapters(Collections.<EndpointAdapter>singletonList(adapter));
 
         messageDispatcher.receive(messageContext);
 
diff --git a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootEndpoint.java b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootEndpoint.java
index e33f3d40..0f499d3f 100644
--- a/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootEndpoint.java
+++ b/core/src/test/java/org/springframework/ws/server/endpoint/mapping/PayloadRootEndpoint.java
@@ -23,6 +23,7 @@ import org.apache.commons.logging.LogFactory;
 
 import org.springframework.ws.server.endpoint.annotation.Endpoint;
 import org.springframework.ws.server.endpoint.annotation.PayloadRoot;
+import org.springframework.ws.server.endpoint.annotation.RequestPayload;
 
 @Endpoint
 public class PayloadRootEndpoint {
@@ -37,7 +38,7 @@ public class PayloadRootEndpoint {
 
     @PayloadRoot(localPart = "Request", namespace = "http://springframework.org/spring-ws")
     @org.springframework.ws.server.endpoint.mapping.Log
-    public void doIt(Source payload) {
+    public void doIt(@RequestPayload Source payload) {
         doItInvoked = true;
         logger.info("In doIt()");
     }