diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/TestInitializer.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/TestInitializer.java
index f0164963cfafe7be08e78f818c2a5924977e4ff3..a1bf9ba5acf5921d841fb82fbd764d3e565a8ce8 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/TestInitializer.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/util/TestInitializer.java
@@ -75,7 +75,7 @@ public class TestInitializer
     {
         LogInitializer.init();
 
-        if (firstTry)
+        if (firstTry && System.getProperty("rebuild-index", "true").equals("true"))
         {
             try
             {