diff --git a/openbis/build.gradle b/openbis/build.gradle
index 725ae18a9341287fe0417b66b6202c1c0bbfffa2..a55a722f13fcda0518e86ec06f3a6c76916f59e3 100644
--- a/openbis/build.gradle
+++ b/openbis/build.gradle
@@ -89,7 +89,10 @@ task copyTestData(type: Copy, dependsOn: testClasses) {
     into "${project.buildDir}/classes/test/ch/systemsx/cisd/openbis/generic/shared/basic"
     include "*.properties"
 }
+testProjectSamplesEnabled.dependsOn(copyTestData)
+testProjectSamplesEnabled.dependsOn(cleanDbSuiteProjectSamplesEnabled)
 test.dependsOn(copyTestData)
 test.dependsOn(cleanDbSuite)
+test.dependsOn(testProjectSamplesEnabled)
 
 apply from: 'gwtdev.gradle'
\ No newline at end of file