diff --git a/parent/pom.xml b/parent/pom.xml
index b1acddb2..f85d9845 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.springframework.ws</groupId>
     <artifactId>spring-ws-parent</artifactId>
@@ -28,7 +29,7 @@
         <url>http://fisheye3.cenqua.com/browse/springframework/spring-ws/trunk</url>
     </scm>
     <properties>
-        <spring.version>2.5.5</spring.version>
+        <spring.version>2.5.6</spring.version>
     </properties>
     <repositories>
         <repository>
@@ -424,7 +425,7 @@
             <dependency>
                 <groupId>com.sun.xml.messaging.saaj</groupId>
                 <artifactId>saaj-impl</artifactId>
-                <version>1.3</version>
+                <version>1.3.2</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.activation</groupId>
diff --git a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorEncryptTest.java b/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorEncryptTest.java
index 0f878b70..b1eafa0a 100644
--- a/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorEncryptTest.java
+++ b/security/src/test/java/org/springframework/ws/soap/security/xwss/XwssMessageInterceptorEncryptTest.java
@@ -20,6 +20,7 @@ import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
 import javax.xml.soap.SOAPMessage;
 
+import com.sun.xml.wss.impl.callback.DecryptionKeyCallback;
 import com.sun.xml.wss.impl.callback.EncryptionKeyCallback;
 
 import org.springframework.core.io.ClassPathResource;
@@ -96,11 +97,6 @@ public class XwssMessageInterceptorEncryptTest extends AbstractXwssMessageInterc
                 "/SOAP-ENV:Envelope/SOAP-ENV:Header/wsse:Security/xenc:EncryptedKey", result);
     }
 
-    /*
-    This test fails under JDK 1.6, giving a IllegalArgumentException:
-    com.sun.xml.internal.messaging.saaj.soap.LocalStrings != com.sun.xml.messaging.saaj.soap.LocalStrings
-
-     No idea how to fix it
     public void testDecrypt() throws Exception {
         interceptor.setPolicyConfiguration(new ClassPathResource("decrypt-config.xml", getClass()));
         CallbackHandler handler = new AbstractCallbackHandler() {
@@ -126,10 +122,10 @@ public class XwssMessageInterceptorEncryptTest extends AbstractXwssMessageInterc
         interceptor.setCallbackHandler(handler);
         interceptor.afterPropertiesSet();
         SaajSoapMessage message = loadSaajMessage("encrypted-soap.xml");
-        interceptor.validateMessage(message);
+        interceptor.validateMessage(message, null);
         SOAPMessage result = message.getSaajMessage();
         assertNotNull("No result returned", result);
         assertXpathNotExists("Security Header not removed", "/SOAP-ENV:Envelope/SOAP-ENV:Header/wsse:Security", result);
-    }*/
+    }
 
 }