diff --git a/source/test-java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java b/source/test-java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java
index adf953a285..c886c5f261 100644
--- a/source/test-java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java
+++ b/source/test-java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java
@@ -36,6 +36,7 @@ import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.i18n.MessageService;
+import org.alfresco.repo.policy.PolicyComponent;
 import org.alfresco.repo.tenant.TenantAdminService;
 import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.service.cmr.coci.CheckOutCheckInService;
@@ -350,6 +351,7 @@ public class DictionaryModelTypeTest extends BaseAlfrescoSpringTest
     private NamespaceService namespaceService;
     private CheckOutCheckInService cociService;
     private DictionaryDAO dictionaryDAO;
+    private PolicyComponent policyComponent;
     
     /**
      * On setup in transaction override
@@ -366,6 +368,7 @@ public class DictionaryModelTypeTest extends BaseAlfrescoSpringTest
         this.cociService = (CheckOutCheckInService)this.applicationContext.getBean("checkOutCheckInService");
         this.dictionaryDAO = (DictionaryDAO)this.applicationContext.getBean("dictionaryDAO");
         this.nodeService = (NodeService)this.applicationContext.getBean("NodeService");
+        this.policyComponent = (PolicyComponent)this.applicationContext.getBean("policyComponent");
         
         TenantAdminService tenantAdminService = (TenantAdminService)this.applicationContext.getBean("tenantAdminService");
         MessageService messageService = (MessageService)this.applicationContext.getBean("messageService");
@@ -383,6 +386,7 @@ public class DictionaryModelTypeTest extends BaseAlfrescoSpringTest
         bootstrap.setNodeService(this.nodeService);
         bootstrap.setNamespaceService(this.namespaceService);
         bootstrap.setMessageService(messageService);
+        bootstrap.setPolicyComponent(policyComponent);
         
         RepositoryLocation location = new RepositoryLocation();
         location.setStoreProtocol(this.storeRef.getProtocol());
diff --git a/source/test-java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java b/source/test-java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java
index 9b124b4407..5b22da892e 100644
--- a/source/test-java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java
+++ b/source/test-java/org/alfresco/repo/dictionary/DictionaryRepositoryBootstrapTest.java
@@ -26,6 +26,7 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.i18n.MessageService;
 import org.alfresco.repo.policy.BehaviourFilter;
+import org.alfresco.repo.policy.PolicyComponent;
 import org.alfresco.repo.tenant.TenantAdminService;
 import org.alfresco.service.cmr.dictionary.DictionaryException;
 import org.alfresco.service.cmr.dictionary.ModelDefinition;
@@ -96,6 +97,8 @@ public class DictionaryRepositoryBootstrapTest extends BaseAlfrescoSpringTest
     /** The message service */
     private MessageService messageService;
     
+    private PolicyComponent policyComponent;
+    
     /**
      * @see org.springframework.test.AbstractTransactionalSpringContextTests#onSetUpInTransaction()
      */
@@ -113,6 +116,8 @@ public class DictionaryRepositoryBootstrapTest extends BaseAlfrescoSpringTest
         this.tenantAdminService = (TenantAdminService)this.applicationContext.getBean("tenantAdminService");
         this.namespaceService = (NamespaceService)this.applicationContext.getBean("namespaceService");
         this.messageService = (MessageService)this.applicationContext.getBean("messageService");
+        this.policyComponent = (PolicyComponent)this.applicationContext.getBean("policyComponent");
+        
         
         this.bootstrap = new DictionaryRepositoryBootstrap();
         this.bootstrap.setContentService(this.contentService);
@@ -122,6 +127,7 @@ public class DictionaryRepositoryBootstrapTest extends BaseAlfrescoSpringTest
         this.bootstrap.setNodeService(this.nodeService);
         this.bootstrap.setNamespaceService(this.namespaceService);
         this.bootstrap.setMessageService(this.messageService);
+        this.bootstrap.setPolicyComponent(this.policyComponent);
         
         RepositoryLocation location = new RepositoryLocation();
         location.setStoreProtocol(this.storeRef.getProtocol());
diff --git a/source/test-java/org/alfresco/repo/jscript/ScriptNodeTest.java b/source/test-java/org/alfresco/repo/jscript/ScriptNodeTest.java
index 623fdb1e5d..7c87ad3630 100644
--- a/source/test-java/org/alfresco/repo/jscript/ScriptNodeTest.java
+++ b/source/test-java/org/alfresco/repo/jscript/ScriptNodeTest.java
@@ -37,6 +37,7 @@ import org.alfresco.repo.dictionary.DictionaryRepositoryBootstrap;
 import org.alfresco.repo.dictionary.RepositoryLocation;
 import org.alfresco.repo.i18n.MessageService;
 import org.alfresco.repo.model.Repository;
+import org.alfresco.repo.policy.PolicyComponent;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.tenant.TenantAdminService;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
@@ -141,6 +142,7 @@ public class ScriptNodeTest
     private static MessageService              MESSAGE_SERVICE;
     private static TransactionService          TRANSACTION_SERVICE;
     private static DictionaryModelType         DICTIONARY_MODEL_TYPE;
+    private static PolicyComponent             POLICY_COMPONENT;
     
     private static TestSiteAndMemberInfo USER_ONES_TEST_SITE;
     private static NodeRef               USER_ONES_TEST_FILE;
@@ -179,6 +181,7 @@ public class ScriptNodeTest
         MESSAGE_SERVICE       = APP_CONTEXT_INIT.getApplicationContext().getBean("messageService", MessageService.class);
         TRANSACTION_SERVICE   = APP_CONTEXT_INIT.getApplicationContext().getBean("transactionComponent", TransactionService.class);
         DICTIONARY_MODEL_TYPE = APP_CONTEXT_INIT.getApplicationContext().getBean("dictionaryModelType", DictionaryModelType.class);
+        POLICY_COMPONENT      = APP_CONTEXT_INIT.getApplicationContext().getBean("policyComponent", PolicyComponent.class);
 		
         USER_ONES_TEST_SITE = STATIC_TEST_SITES.createTestSiteWithUserPerRole(GUID.generate(), "sitePreset", SiteVisibility.PRIVATE, USER_ONE_NAME);
         USER_ONES_TEST_FILE = STATIC_TEST_NODES.createQuickFile(MimetypeMap.MIMETYPE_TEXT_PLAIN, USER_ONES_TEST_SITE.doclib, "test.txt", USER_ONE_NAME);		
@@ -220,6 +223,7 @@ public class ScriptNodeTest
         bootstrap.setNodeService(NODE_SERVICE);
         bootstrap.setNamespaceService(NAMESPACE_SERVICE);
         bootstrap.setMessageService(MESSAGE_SERVICE);
+        bootstrap.setPolicyComponent(POLICY_COMPONENT);
 
         List<String> storeUrlsToValidate = new ArrayList<String>(1);
         storeUrlsToValidate.add(this.storeRef.toString());