diff --git a/openbis/build.gradle b/openbis/build.gradle
index 7e3a556eb71c8a5f3446b0039ce5a8bc7c9bc4ce..725ae18a9341287fe0417b66b6202c1c0bbfffa2 100644
--- a/openbis/build.gradle
+++ b/openbis/build.gradle
@@ -63,10 +63,24 @@ sourceSets {
 
 task cleanDbSuite(type: Test) {
     useTestNG()
-    options.suites('sourceTest/java/tests_system_cleandb_excluding_authorization.xml')
+    options.suites('sourceTest/java/tests_system_cleandb_excluding_authorization_project_samples.xml')
     reports.html.destination = file("${project.buildDir}/reports/tests-cleandb")
 }
 
+task cleanDbSuiteProjectSamplesEnabled(type: Test) {
+    useTestNG()
+    systemProperty "project-samples-enabled", 'true'
+    options.suites('sourceTest/java/tests_system_cleandb_excluding_authorization.xml')
+    reports.html.destination = file("${project.buildDir}/reports/tests-cleandb-project-samples")
+}
+
+task testProjectSamplesEnabled(type: Test) {
+    useTestNG()
+    systemProperty "project-samples-enabled", 'true'
+    options.suites('sourceTest/java/tests_project_samples.xml')
+    reports.html.destination = file("${project.buildDir}/reports/tests-project-samples")
+}
+
 
 // This task is here to make WebAppsPropertiesTest to work. It requires some data files
 // to be present on the same directory than the class file itself.
diff --git a/openbis/source/java/service.properties b/openbis/source/java/service.properties
index 75b63a2a454fda7820308bfdb9441935dbcd809c..91606b1c98995764eb2facfa8bfe1ed677cc51c0 100644
--- a/openbis/source/java/service.properties
+++ b/openbis/source/java/service.properties
@@ -11,6 +11,8 @@ script-folder = ./source/
 
 core-plugins-folder = source/core-plugins
 
+project-samples-enabled = false
+
 data-set-types-with-no-experiment-needed = .*
 
 # Supported: currently only 'postgresql' is supported
diff --git a/openbis/sourceTest/java/tests.xml b/openbis/sourceTest/java/tests.xml
index 873904d5e4b93dfaef1943a41a15813800947d82..da6b8ac956fd1a20597c4af413e747144facaed2 100644
--- a/openbis/sourceTest/java/tests.xml
+++ b/openbis/sourceTest/java/tests.xml
@@ -3,6 +3,7 @@
     <groups>
       <run>
         <exclude name="abstract" />
+        <exclude name="project-samples" />
         <exclude name="broken" />
         <exclude name="scalability"/>
         <exclude name="system-cleandb"/>
diff --git a/openbis/sourceTest/java/tests_project_samples.xml b/openbis/sourceTest/java/tests_project_samples.xml
new file mode 100644
index 0000000000000000000000000000000000000000..873904d5e4b93dfaef1943a41a15813800947d82
--- /dev/null
+++ b/openbis/sourceTest/java/tests_project_samples.xml
@@ -0,0 +1,39 @@
+<suite name="All" verbose="2" >
+  <test name="unit" annotations="JDK">
+    <groups>
+      <run>
+        <exclude name="abstract" />
+        <exclude name="broken" />
+        <exclude name="scalability"/>
+        <exclude name="system-cleandb"/>
+      </run>
+    </groups>
+    <packages>
+      <package name="ch.systemsx.cisd.openbis.*">
+        <exclude name="ch.systemsx.cisd.openbis.common.*" />
+        <exclude name="ch.systemsx.cisd.openbis.remoteapitest.*" />
+        <exclude name="ch.systemsx.cisd.openbis.systemtest.*" />
+      </package>
+      <package name="ch.ethz.sis.openbis.*">
+        <exclude name="ch.ethz.sis.openbis.systemtest.*" />
+      </package>      
+    </packages>     
+  </test>
+  
+  <test name="system" annotations="JDK">
+    <groups>
+      <run>
+        <exclude name="abstract" />
+        <exclude name="broken" />
+        <exclude name="scalability"/>
+        <exclude name="system-cleandb"/>
+      </run>
+    </groups>
+    <packages>
+        <package name="ch.systemsx.cisd.openbis.remoteapitest.*" />
+        <package name="ch.systemsx.cisd.openbis.systemtest.*" />
+        <package name="ch.ethz.sis.openbis.systemtest.*" />
+    </packages>
+  </test>
+  
+</suite>
diff --git a/openbis/sourceTest/java/tests_system_cleandb_excluding_authorization_project_samples.xml b/openbis/sourceTest/java/tests_system_cleandb_excluding_authorization_project_samples.xml
new file mode 100644
index 0000000000000000000000000000000000000000..4b5f2991f04e77a770d720d1bcbbcbb63bad2379
--- /dev/null
+++ b/openbis/sourceTest/java/tests_system_cleandb_excluding_authorization_project_samples.xml
@@ -0,0 +1,17 @@
+<suite name="All" verbose="2" parallel = "false" threadCount = "1">
+  <test name="system-cleandb" annotations="JDK">
+    <groups>
+      <run>
+        <include name="system-cleandb"/>
+        <exclude name="authorization"/>
+        <exclude name="project-samples"/>
+        <exclude name="broken"/>
+      </run>
+    </groups>
+    <packages>
+      <package name="ch.systemsx.cisd.openbis.systemtest.*" />
+      <package name="ch.ethz.sis.openbis.systemtest.*" />
+    </packages>
+  </test>
+  
+</suite>