diff --git a/src/main/java/org/olat/repository/_spring/repositoryContext.xml b/src/main/java/org/olat/repository/_spring/repositoryContext.xml
index 126057da9e351cea2fe38b75c7208dc1161f1bc2..7c9c4d276aa4b7c3a0c194e0a35e21d570114b29 100644
--- a/src/main/java/org/olat/repository/_spring/repositoryContext.xml
+++ b/src/main/java/org/olat/repository/_spring/repositoryContext.xml
@@ -31,4 +31,10 @@
 	<constructor-arg index="1" ref="org.olat.core.commons.persistence.async.BackgroundTaskQueueManager" />
 </bean>
 
+<!-- BackgroundTaskQueueManager for increment launch-,download-counter and set LastUsage in background thread -->
+<bean id="org.olat.core.commons.persistence.async.BackgroundTaskQueueManager" class="org.olat.repository.async.BackgroundTaskQueueManager">
+	<!-- Number of retries when a task failed e.g. incrementLaunchCounter try 20 times to increment when a exception occurs -->
+	<property name="maxRetry" value="20"/>
+</bean>	
+
 </beans>
\ No newline at end of file
diff --git a/src/main/resources/serviceconfig/org/olat/core/_spring/olatcoreconfig.xml b/src/main/resources/serviceconfig/org/olat/core/_spring/olatcoreconfig.xml
index b00b4238f83b1e8cb3dd325684617064938e5385..6ed9944b41cc414b3c2e8d77cedd0021444634be 100644
--- a/src/main/resources/serviceconfig/org/olat/core/_spring/olatcoreconfig.xml
+++ b/src/main/resources/serviceconfig/org/olat/core/_spring/olatcoreconfig.xml
@@ -283,11 +283,7 @@ init-method="springInit" destroy-method="stop" lazy-init="true">
 	<property name="brokerURL" value="${jms.broker.url}" /> <!-- e.g.: tcp://localhost:61616 -->
 </bean>
 
-<!-- BackgroundTaskQueueManager for increment launch-,download-counter and set LastUsage in background thread -->
-<bean id="org.olat.core.commons.persistence.async.BackgroundTaskQueueManager" class="org.olat.core.commons.persistence.async.BackgroundTaskQueueManager">
-	<!-- Number of retries when a task failed e.g. incrementLaunchCounter try 20 times to increment when a exception occurs -->
-	<property name="maxRetry" value="20"/>
-</bean>	
+
 
 	
 	
diff --git a/src/test/java/org/olat/modules/webFeed/_spring/webFeedTestContextMock.xml b/src/test/java/org/olat/modules/webFeed/_spring/webFeedTestContextMock.xml
index 2fca75e4dae11837e7a28e2cbdc3653f14e83d31..0f530375b5321f1a9f74d34a0618aeafd21e58fe 100644
--- a/src/test/java/org/olat/modules/webFeed/_spring/webFeedTestContextMock.xml
+++ b/src/test/java/org/olat/modules/webFeed/_spring/webFeedTestContextMock.xml
@@ -18,7 +18,7 @@
 <bean id="baseSecurityManager" class="org.olat.basesecurity.BaseSecurityManager"></bean>
 
 <!-- BackgroundTaskQueueManager for increment launch-,download-counter and set LastUsage in background thread -->
-<bean id="backgroundTaskQueueManager" class="org.olat.core.commons.persistence.async.BackgroundTaskQueueManager">
+<bean id="backgroundTaskQueueManager" class="org.olat.repository.async.BackgroundTaskQueueManager">
 	<!-- Number of retries when a task failed e.g. incrementLaunchCounter try 20 times to increment when a exception occurs -->
 	<property name="maxRetry" value="20"/>
 </bean>