diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptorTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptorTest.java
index 4cbe2718..016c6428 100644
--- a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptorTest.java
+++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/XwsSecurityInterceptorTest.java
@@ -25,7 +25,6 @@ import org.springframework.ws.context.MessageContext;
 import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.saaj.SaajSoapMessage;
 import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
-import org.springframework.ws.soap.saaj.saaj13.Saaj13SoapMessage;
 import org.springframework.ws.soap.security.WsSecurityValidationException;
 
 public class XwsSecurityInterceptorTest extends TestCase {
@@ -53,7 +52,7 @@ public class XwsSecurityInterceptorTest extends TestCase {
 
         };
         MessageContext context =
-                new DefaultMessageContext(new Saaj13SoapMessage(request), new SaajSoapMessageFactory(messageFactory));
+                new DefaultMessageContext(new SaajSoapMessage(request), new SaajSoapMessageFactory(messageFactory));
         interceptor.handleRequest(context, null);
         assertEquals("Invalid request", validatedRequest, ((SaajSoapMessage) context.getRequest()).getSaajMessage());
     }
@@ -74,7 +73,7 @@ public class XwsSecurityInterceptorTest extends TestCase {
         };
         SOAPMessage request = messageFactory.createMessage();
         MessageContext context =
-                new DefaultMessageContext(new Saaj13SoapMessage(request), new SaajSoapMessageFactory(messageFactory));
+                new DefaultMessageContext(new SaajSoapMessage(request), new SaajSoapMessageFactory(messageFactory));
         interceptor.handleResponse(context, null);
         assertEquals("Invalid response", securedResponse, ((SaajSoapMessage) context.getResponse()).getSaajMessage());
     }
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorTestCase.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorTestCase.java
index f1550e6c..9bff5766 100644
--- a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorTestCase.java
+++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorTestCase.java
@@ -27,7 +27,6 @@ import javax.xml.soap.SOAPMessage;
 
 import junit.framework.TestCase;
 import org.springframework.ws.soap.saaj.SaajSoapMessage;
-import org.springframework.ws.soap.saaj.saaj13.Saaj13SoapMessage;
 import org.springframework.xml.xpath.XPathExpression;
 import org.springframework.xml.xpath.XPathExpressionFactory;
 import org.w3c.dom.Document;
@@ -83,7 +82,7 @@ public abstract class XwssMessageInterceptorTestCase extends TestCase {
         try {
             is = getClass().getResourceAsStream(fileName);
             assertNotNull("Could not load SAAJ message with name [" + fileName + "]", is);
-            return new Saaj13SoapMessage(messageFactory.createMessage(mimeHeaders, is));
+            return new SaajSoapMessage(messageFactory.createMessage(mimeHeaders, is));
         }
         finally {
             if (is != null) {