diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/Main.java b/datamover/source/java/ch/systemsx/cisd/datamover/Main.java
index 3b03ee70a56ae4c265b0b04d8c664feb092dd1a3..50f938bac36ca352320cdfd75618450b3b1ad5fd 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/Main.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/Main.java
@@ -177,8 +177,8 @@ public final class Main
         initLog();
         final Parameters parameters = new Parameters(args);
         printInitialLogMessage(parameters);
-        selfTest(parameters);
         startupServer(parameters);
+        selfTest(parameters);
         if (operationLog.isInfoEnabled())
         {
             operationLog.info("Datamover ready and waiting for data.");