diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
index ef23d87282c6f7c8c7df9db3ad02cbea6d30ce8f..665352671873e98cdeae398f213ebe266051c87c 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
@@ -493,7 +493,7 @@ public class DssComponentTest extends SystemTestCase
             // The default dss service.properties has a post-registration maintenance
             // task scheduled to run every 30 seconds, so wait until it has run and cleaned
             // up the queue.
-            Thread.sleep(31 * 1000);
+            Thread.sleep(40 * 1000);
         } catch (InterruptedException e)
         {
         }