diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractImageDropboxTestCase.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractImageDropboxTestCase.java
index dd558dd27fb40f6637f843ff1ad218b8844d0021..97b090bb7806cbf4b907dbf9a5e9a039a0e884a9 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractImageDropboxTestCase.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/AbstractImageDropboxTestCase.java
@@ -25,7 +25,6 @@ import java.util.List;
 import org.apache.commons.io.FileUtils;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeTest;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetKind;
@@ -51,8 +50,7 @@ public abstract class AbstractImageDropboxTestCase extends AbstractScreeningSyst
 
     protected ImageChecker imageChecker;
 
-    @BeforeTest
-    public void dropAnExampleDataSet() throws Exception
+    protected void dropAnExampleDataSet() throws Exception
     {
         registerAdditionalOpenbisMetaData();
         File exampleDataSet = createTestDataContents();
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/MicroscopyImageDropboxTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/MicroscopyImageDropboxTest.java
index 6c1168ef1804277da375f2f6e6e0ead5564bfecb..ad3e9a3169e0f8328ecbd8055a438a5ace2a01e2 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/MicroscopyImageDropboxTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/MicroscopyImageDropboxTest.java
@@ -19,6 +19,7 @@ package ch.systemsx.cisd.openbis.screening.systemtests;
 import java.io.File;
 import java.util.Collections;
 
+import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.openbis.generic.shared.ICommonServer;
@@ -36,6 +37,12 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifierF
 @Test(groups = { "slow", "systemtest" })
 public class MicroscopyImageDropboxTest extends AbstractImageDropboxTestCase
 {
+    @Override
+    @BeforeTest
+    public void dropAnExampleDataSet() throws Exception
+    {
+        super.dropAnExampleDataSet();
+    }
 
     @Override
     protected void registerAdditionalOpenbisMetaData()
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/SimpleImageDropboxTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/SimpleImageDropboxTest.java
index f5ae05db0bbfb544c2a10fdf72d61264a44b346a..7e82c70dfe40254e6535ecba11b3cbc5ad40bc44 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/SimpleImageDropboxTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/screening/systemtests/SimpleImageDropboxTest.java
@@ -18,6 +18,7 @@ package ch.systemsx.cisd.openbis.screening.systemtests;
 
 import java.io.File;
 
+import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
@@ -30,6 +31,12 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData;
 @Test(groups = { "slow", "systemtest" })
 public class SimpleImageDropboxTest extends AbstractImageDropboxTestCase
 {
+    @Override
+    @BeforeTest
+    public void dropAnExampleDataSet() throws Exception
+    {
+        super.dropAnExampleDataSet();
+    }
 
     @Override
     protected String getDataFolderToDrop()