diff --git a/config/alfresco/cmis-ws-context.xml b/config/alfresco/cmis-ws-context.xml
index 226a4186b4..fb1db41a40 100644
--- a/config/alfresco/cmis-ws-context.xml
+++ b/config/alfresco/cmis-ws-context.xml
@@ -5,28 +5,10 @@
                http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
             http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 
-    <!-- Workaround for http://jira.springframework.org/browse/SPR-6412 -->
-    <bean class="org.springframework.context.annotation.CommonAnnotationBeanPostProcessor"/>
-
     <import resource="classpath:META-INF/cxf/cxf.xml" />
     <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
     <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
 
-    <!-- Workaround for http://jira.springframework.org/browse/SPR-6412 -->
-    <bean id="org.apache.cxf.binding.soap.SoapBindingFactory"
-      class="org.apache.cxf.binding.soap.SoapBindingFactory">
-        <property name="activationNamespaces">
-            <set>
-                <value>http://schemas.xmlsoap.org/soap/</value>
-                <value>http://schemas.xmlsoap.org/wsdl/soap/</value>
-                <value>http://schemas.xmlsoap.org/wsdl/soap12/</value>
-                <value>http://www.w3.org/2003/05/soap/bindings/HTTP/</value>
-                <value>http://schemas.xmlsoap.org/wsdl/soap/http</value>
-            </set>
-        </property>
-        <property name="bus" ref="cxf"/>
-    </bean>
-
     <jaxws:endpoint address="/RepositoryService" implementor="#dmRepositoryService"
         implementorClass="org.alfresco.repo.cmis.ws.DMRepositoryServicePort">
         <jaxws:inInterceptors>
diff --git a/source/java/org/alfresco/repo/web/scripts/TestWebScriptRepoServer.java b/source/java/org/alfresco/repo/web/scripts/TestWebScriptRepoServer.java
index aa3899cfec..a34d5e9ccc 100644
--- a/source/java/org/alfresco/repo/web/scripts/TestWebScriptRepoServer.java
+++ b/source/java/org/alfresco/repo/web/scripts/TestWebScriptRepoServer.java
@@ -28,7 +28,6 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-import org.alfresco.config.FixedClassPathXmlApplicationContext;
 import org.alfresco.repo.security.authentication.AuthenticationException;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
@@ -169,7 +168,7 @@ public class TestWebScriptRepoServer extends TestWebScriptServer
                 System.arraycopy(CONFIG_LOCATIONS, 0, configLocations, 0, CONFIG_LOCATIONS.length);
                 configLocations[CONFIG_LOCATIONS.length] = appendTestConfigLocation;
             }
-            TestWebScriptRepoServer.ctx = new FixedClassPathXmlApplicationContext(configLocations);
+            TestWebScriptRepoServer.ctx = new ClassPathXmlApplicationContext(configLocations);
             TestWebScriptRepoServer.appendedTestConfiguration = appendTestConfigLocation;
         }
         
diff --git a/source/test/java/org/alfresco/repo/cmis/ws/CMISCustomTypeTest.java b/source/test/java/org/alfresco/repo/cmis/ws/CMISCustomTypeTest.java
index be23e8b5eb..a48885db85 100755
--- a/source/test/java/org/alfresco/repo/cmis/ws/CMISCustomTypeTest.java
+++ b/source/test/java/org/alfresco/repo/cmis/ws/CMISCustomTypeTest.java
@@ -32,12 +32,12 @@ import javax.xml.ws.Holder;
 import junit.framework.TestCase;
 
 import org.alfresco.cmis.CMISDictionaryModel;
-import org.alfresco.config.FixedClassPathXmlApplicationContext;
 import org.alfresco.repo.cmis.ws.utils.PropertyUtil;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.service.ServiceRegistry;
 import org.alfresco.service.cmr.security.AuthenticationService;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 public class CMISCustomTypeTest extends TestCase
 {
@@ -61,7 +61,7 @@ public class CMISCustomTypeTest extends TestCase
     {
         if (null == applicationContext)
         {
-            applicationContext = new FixedClassPathXmlApplicationContext(new String[] { "classpath:alfresco/application-context.xml", "classpath:alfresco/cmis-ws-context.xml",
+            applicationContext = new ClassPathXmlApplicationContext(new String[] { "classpath:alfresco/application-context.xml", "classpath:alfresco/cmis-ws-context.xml",
                     "classpath:cmis/cmis-test-context.xml" });
             ServiceRegistry serviceRegistry = (ServiceRegistry) applicationContext.getBean(ServiceRegistry.SERVICE_REGISTRY);
             authenticationService = serviceRegistry.getAuthenticationService();