diff --git a/integration-tests/templates/test_yeastx/openbis_test_yeastx_openbis.sql b/integration-tests/templates/test_yeastx/openbis_test_yeastx_openbis.sql
index 1d01ad55005740519fa02361477b256b209d8f86..6ff8630b8fc856f50ee8224e8d2a4e5324434078 100644
--- a/integration-tests/templates/test_yeastx/openbis_test_yeastx_openbis.sql
+++ b/integration-tests/templates/test_yeastx/openbis_test_yeastx_openbis.sql
@@ -683,7 +683,7 @@ CREATE SEQUENCE data_id_seq
 -- Name: data_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
 --
 
-SELECT pg_catalog.setval('data_id_seq', 1, true);
+SELECT pg_catalog.setval('data_id_seq', 2, true);
 
 
 --
@@ -1819,6 +1819,7 @@ COPY controlled_vocabulary_terms (id, code, registration_timestamp, covo_id, per
 --
 
 COPY data (id, code, dsty_id, data_producer_code, production_timestamp, registration_timestamp, is_placeholder, is_valid, modification_timestamp, expe_id, dast_id, is_derived, samp_id) FROM stdin;
+1	20090925182754736-36	1	\N	\N	2009-02-10 15:40:42.184979+01	f	t	2009-02-10 15:40:42.184979+01	2	1	f	\N
 \.
 
 
@@ -1894,7 +1895,7 @@ COPY data_store_services (id, key, label, kind, data_store_id) FROM stdin;
 --
 
 COPY data_stores (id, dbin_id, code, download_url, registration_timestamp, remote_url, session_token, modification_timestamp) FROM stdin;
-1	1	STANDARD		2009-02-10 15:40:42.184979+01			2009-09-24 08:48:34.488603+02
+1	1	DSS1		2009-02-10 15:40:42.184979+01			2009-09-24 08:48:34.488603+02
 \.
 
 
@@ -2004,6 +2005,7 @@ COPY experiments (id, code, exty_id, mate_id_study_object, pers_id_registerer, r
 --
 
 COPY external_data (data_id, location, ffty_id, loty_id, cvte_id_stor_fmt, is_complete, cvte_id_store) FROM stdin;
+1	abc	1	1	4	T	\N
 \.
 
 
diff --git a/integration-tests/test_yeastx.py b/integration-tests/test_yeastx.py
index ef6aa36b4973aecb3a78bb9351bf2f099447093a..eda6de4fce8d1f8dfeef048c16af8a44f26e5ff5 100755
--- a/integration-tests/test_yeastx.py
+++ b/integration-tests/test_yeastx.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+import os
 import os.path
 
 import settings
@@ -25,17 +26,18 @@ class TestCase(systemtest.testcase.TestCase):
         for name in os.listdir(self.getExpectedErrorLogsFolder(openbisController.testName)):
             if name.endswith('.txt'):
                 self.dropInvalidData(openbisController, name[0:-4])
+        os.mkdir("%s/%s/1/abc" % (openbisController.installPath, openbisController.storeDirectory()))
         self.dropInvalidData(openbisController, 'ignore-no-index', expectingEmptyData=True)
         self.dropInvalidData(openbisController, 'ignore-empty-dir', expectingEmptyData=True)
-        openbisController.assertNumberOfDataSets(2, openbisController.getDataSets())
-        self.dropDataSucessfully(openbisController, 'any-file-upload', 4, 6)
-        self.dropDataSucessfully(openbisController, 'different-sample-mapping', 3, 9)
-        self.dropDataSucessfully(openbisController, 'real-data-small', 4, 13)
-        self.dropDataSucessfully(openbisController, 'sample-code-with-experiment', 1, 14)
-        self.dropDataSucessfully(openbisController, 'upload-mzxml-to-db', 1, 15)
-        self.dropDataSucessfully(openbisController, 'TEST&TEST_PROJECT&EXP_TEST.20090925182754736-36.eicML', 1, 16, 'incoming-eicml')
-        self.dropDataSucessfully(openbisController, 'TEST&TEST_PROJECT&EXP_TEST.20090925182754736-36.fiaML', 1, 17, 'incoming-fiaml')
-        self.dropDataSucessfully(openbisController, 'TEST&TEST_PROJECT&EXP_TEST.anyText123', 1, 18, 'incoming-quantml')
+        openbisController.assertNumberOfDataSets(3, openbisController.getDataSets())
+        self.dropDataSucessfully(openbisController, 'any-file-upload', 4, 7)
+        self.dropDataSucessfully(openbisController, 'different-sample-mapping', 3, 10)
+        self.dropDataSucessfully(openbisController, 'real-data-small', 4, 14)
+        self.dropDataSucessfully(openbisController, 'sample-code-with-experiment', 1, 15)
+        self.dropDataSucessfully(openbisController, 'upload-mzxml-to-db', 1, 16)
+        self.dropDataSucessfully(openbisController, 'TEST&TEST_PROJECT&EXP_TEST.20090925182754736-36.eicML', 1, 17, 'incoming-eicml')
+        self.dropDataSucessfully(openbisController, 'TEST&TEST_PROJECT&EXP_TEST.20090925182754736-36.fiaML', 1, 18, 'incoming-fiaml')
+        self.dropDataSucessfully(openbisController, 'TEST&TEST_PROJECT&EXP_TEST.anyText123', 1, 19, 'incoming-quantml')
         self.assertNumberOfFiles(openbisController, 'eicml', 6)
         self.assertNumberOfFiles(openbisController, 'fiaml', 2)
         self.assertNumberOfRowsInMetabolDev(openbisController, 'eic_ms_runs', 2)