diff --git a/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateIntegrationTest.java b/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateIntegrationTest.java
index 819210cb..a211b826 100644
--- a/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateIntegrationTest.java
+++ b/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateIntegrationTest.java
@@ -68,6 +68,7 @@ import org.springframework.ws.soap.SoapMessage;
 import org.springframework.ws.soap.SoapMessageFactory;
 import org.springframework.ws.soap.axiom.AxiomSoapMessageFactory;
 import org.springframework.ws.soap.client.SoapFaultClientException;
+import org.springframework.ws.soap.saaj.SaajSoapMessageFactory;
 import org.springframework.ws.transport.http.CommonsHttpMessageSender;
 import org.springframework.xml.transform.StringResult;
 import org.springframework.xml.transform.StringSource;
@@ -84,11 +85,9 @@ public class WebServiceTemplateIntegrationTest extends XMLTestCase {
         return new ServerTestSetup(new TestSuite(WebServiceTemplateIntegrationTest.class));
     }
 
-/*
     public void testSaaj() throws Exception {
         doSoap(new SaajSoapMessageFactory(MessageFactory.newInstance()));
     }
-*/
 
     public void testAxiom() throws Exception {
         doSoap(new AxiomSoapMessageFactory());
diff --git a/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java b/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java
index db45ef30..440f15e9 100644
--- a/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java
+++ b/core/src/test/java/org/springframework/ws/client/core/WebServiceTemplateTest.java
@@ -69,6 +69,8 @@ public class WebServiceTemplateTest extends XMLTestCase {
     }
 
     public void testMarshalAndSendNoMarshallerSet() throws Exception {
+        connectionMock.close();
+        connectionControl.replay();
         template.setMarshaller(null);
         try {
             template.marshalSendAndReceive(new Object());
@@ -77,9 +79,12 @@ public class WebServiceTemplateTest extends XMLTestCase {
         catch (IllegalStateException ex) {
             // expected behavior
         }
+        connectionControl.verify();
     }
 
     public void testMarshalAndSendNoUnmarshallerSet() throws Exception {
+        connectionMock.close();
+        connectionControl.replay();
         template.setUnmarshaller(null);
         try {
             template.marshalSendAndReceive(new Object());
@@ -88,6 +93,7 @@ public class WebServiceTemplateTest extends XMLTestCase {
         catch (IllegalStateException ex) {
             // expected behavior
         }
+        connectionControl.verify();
     }
 
     public void testSendAndReceiveMessageResponse() throws Exception {