diff --git a/source/java/org/alfresco/web/config/ConfigAdminInterpreter.java b/source/java/org/alfresco/web/config/ConfigAdminInterpreter.java
index 2ee9a4ebed..0d67c014b6 100755
--- a/source/java/org/alfresco/web/config/ConfigAdminInterpreter.java
+++ b/source/java/org/alfresco/web/config/ConfigAdminInterpreter.java
@@ -31,12 +31,12 @@ import java.io.PrintStream;
 import java.util.List;
 
 import org.alfresco.config.ConfigDeployment;
-import org.alfresco.config.FixedClassPathXmlApplicationContext;
 import org.alfresco.i18n.I18NUtil;
 import org.alfresco.repo.admin.BaseInterpreter;
 import org.alfresco.repo.config.xml.RepoXMLConfigService;
 import org.alfresco.service.transaction.TransactionService;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 
 /**
@@ -63,7 +63,7 @@ public class ConfigAdminInterpreter extends BaseInterpreter
      */
     public static void main(String[] args)
     {
-    	ApplicationContext context = new FixedClassPathXmlApplicationContext(new String[] {"classpath:alfresco/application-context.xml","classpath:alfresco/web-client-application-context.xml"});
+    	ApplicationContext context = new ClassPathXmlApplicationContext(new String[] {"classpath:alfresco/application-context.xml","classpath:alfresco/web-client-application-context.xml"});
         runMain(context, "webClientConfigAdminInterpreter");
     }
 
diff --git a/source/java/org/alfresco/web/forms/FormsTest.java b/source/java/org/alfresco/web/forms/FormsTest.java
index bf48496927..b8b0b7eaf7 100644
--- a/source/java/org/alfresco/web/forms/FormsTest.java
+++ b/source/java/org/alfresco/web/forms/FormsTest.java
@@ -28,7 +28,6 @@ import java.io.Serializable;
 import java.util.Calendar;
 import java.util.HashMap;
 
-import org.alfresco.config.FixedClassPathXmlApplicationContext;
 import org.alfresco.model.WCMAppModel;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.authentication.MutableAuthenticationDao;
@@ -50,6 +49,7 @@ import org.apache.shale.test.mock.MockHttpServletRequest;
 import org.apache.shale.test.mock.MockHttpServletResponse;
 import org.apache.shale.test.mock.MockServletContext;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.StaticWebApplicationContext;
 import org.w3c.dom.Document;
@@ -163,7 +163,7 @@ public class FormsTest
    protected ConfigurableApplicationContext loadContext(Object key)
       throws Exception
    {
-      return new FixedClassPathXmlApplicationContext((String[])key);
+      return new ClassPathXmlApplicationContext((String[])key);
    }
 
    public void testOutputPathPatternForFormInstanceData()