diff --git a/config/alfresco/application-context-core.xml b/config/alfresco/application-context-core.xml
index 0214c9d9de..dfd28a0a5e 100644
--- a/config/alfresco/application-context-core.xml
+++ b/config/alfresco/application-context-core.xml
@@ -44,4 +44,5 @@
     <import resource="classpath:alfresco/tagging-services-context.xml"/>
     <import resource="classpath:alfresco/invitation-service-context.xml"/>
     <import resource="classpath*:alfresco/patch/*-context.xml" />
+    <import resource="classpath*:alfresco/linkvalidation-service-context.xml"/>
 </beans>
diff --git a/config/alfresco/application-context-highlevel.xml b/config/alfresco/application-context-highlevel.xml
index 87b719a815..978b0d6423 100644
--- a/config/alfresco/application-context-highlevel.xml
+++ b/config/alfresco/application-context-highlevel.xml
@@ -17,5 +17,4 @@
     <import resource="classpath:alfresco/cmis-api-context.xml" />
     <import resource="classpath:alfresco/period-type-context.xml" />
     <import resource="classpath*:alfresco/domain/*-context.xml" />
-    <import resource="classpath*:alfresco/linkvalidation-service-context.xml"/>
 </beans>
diff --git a/source/java/org/alfresco/RepositoryStartStopTest.java b/source/java/org/alfresco/RepositoryStartStopTest.java
index f4015754ea..c95b60ab6e 100644
--- a/source/java/org/alfresco/RepositoryStartStopTest.java
+++ b/source/java/org/alfresco/RepositoryStartStopTest.java
@@ -167,9 +167,6 @@ public class RepositoryStartStopTest extends TestCase
      *  Test that we can bring up and close down
      *  a context twice without error, using it
      *  when running. 
-     *  
-     *  - the full context breaks
-     *  when you close and re-open it!
      */
     public void testOpenCloseOpenCloseFull() throws Exception
     {
@@ -209,9 +206,6 @@ public class RepositoryStartStopTest extends TestCase
      * Does this by opening and closing contexts
      *  4 different times, sometimes full ones,
      *  sometimes minimal ones with no autostart.
-     *  
-     *  - the full context breaks
-     *  when you close and re-open it!
      */
     public void testOpenCloseRepeatedly() throws Exception {
        assertNoCachedApplicationContext();