diff --git a/source/java/org/alfresco/repo/node/integrity/IncompleteNodeTaggerTest.java b/source/java/org/alfresco/repo/node/integrity/IncompleteNodeTaggerTest.java
index ed0bf18b8b..40eb92edbf 100644
--- a/source/java/org/alfresco/repo/node/integrity/IncompleteNodeTaggerTest.java
+++ b/source/java/org/alfresco/repo/node/integrity/IncompleteNodeTaggerTest.java
@@ -33,11 +33,9 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.transaction.TransactionService;
-import org.alfresco.util.ApplicationContextHelper;
 import org.alfresco.util.PropertyMap;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.context.ApplicationContext;
 
 /**
  * Checks that tagging of <i>incomplete</i> nodes is done properly.
@@ -48,12 +46,6 @@ import org.springframework.context.ApplicationContext;
 public class IncompleteNodeTaggerTest extends TestCase
 {
     private static Log logger = LogFactory.getLog(IncompleteNodeTaggerTest.class);
-
-    private static ApplicationContext ctx;
-    static
-    {
-        ctx = ApplicationContextHelper.getApplicationContext();
-    }
     
     private IncompleteNodeTagger tagger;
     private ServiceRegistry serviceRegistry;
@@ -65,7 +57,7 @@ public class IncompleteNodeTaggerTest extends TestCase
     
     public void setUp() throws Exception
     {
-        DictionaryDAO dictionaryDao = (DictionaryDAO) ctx.getBean("dictionaryDAO");
+        DictionaryDAO dictionaryDao = (DictionaryDAO) IntegrityTest.ctx.getBean("dictionaryDAO");
         ClassLoader cl = BaseNodeServiceTest.class.getClassLoader();
         // load the test model
         InputStream modelStream = cl.getResourceAsStream("org/alfresco/repo/node/integrity/IntegrityTest_model.xml");
@@ -73,11 +65,11 @@ public class IncompleteNodeTaggerTest extends TestCase
         M2Model model = M2Model.createModel(modelStream);
         dictionaryDao.putModel(model);
 
-        tagger = (IncompleteNodeTagger) ctx.getBean("incompleteNodeTagger");
+        tagger = (IncompleteNodeTagger) IntegrityTest.ctx.getBean("incompleteNodeTagger");
 
-        serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
+        serviceRegistry = (ServiceRegistry) IntegrityTest.ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
         nodeService = serviceRegistry.getNodeService();
-        this.authenticationComponent = (AuthenticationComponent)ctx.getBean("authenticationComponent");
+        this.authenticationComponent = (AuthenticationComponent)IntegrityTest.ctx.getBean("authenticationComponent");
         
         this.authenticationComponent.setSystemUserAsCurrentUser();
         
diff --git a/source/java/org/alfresco/repo/node/integrity/IntegrityTest.java b/source/java/org/alfresco/repo/node/integrity/IntegrityTest.java
index 8d4c7933c4..c036134d4d 100644
--- a/source/java/org/alfresco/repo/node/integrity/IntegrityTest.java
+++ b/source/java/org/alfresco/repo/node/integrity/IntegrityTest.java
@@ -79,7 +79,7 @@ public class IntegrityTest extends TestCase
     public static final QName TEST_PROP_INT_B = QName.createQName(NAMESPACE, "prop-int-b");
     public static final QName TEST_PROP_INT_C = QName.createQName(NAMESPACE, "prop-int-c");
     
-    private static ApplicationContext ctx;
+    public static ApplicationContext ctx;
     static
     {
         ctx = ApplicationContextHelper.getApplicationContext();
diff --git a/source/java/org/alfresco/repo/node/integrity/IntegrityTest_model.xml b/source/java/org/alfresco/repo/node/integrity/IntegrityTest_model.xml
index f39557d573..87e8630782 100644
--- a/source/java/org/alfresco/repo/node/integrity/IntegrityTest_model.xml
+++ b/source/java/org/alfresco/repo/node/integrity/IntegrityTest_model.xml
@@ -115,7 +115,7 @@
          <properties>
             <property name="test:prop-int-a">
                <type>d:int</type>
-               <mandatory>true</mandatory>
+               <mandatory enforced="true">true</mandatory>
             </property>
             <property name="test:prop-int-b">
                <type>d:int</type>