diff --git a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataStoreTest.java b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataStoreTest.java
index f1fbe4386583b50f5066ef533a864088cc515619..7fa622f69f679166054da08a017a751d7ba73839 100644
--- a/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataStoreTest.java
+++ b/server-application-server/sourceTest/java/ch/ethz/sis/openbis/systemtest/asapi/v3/SearchDataStoreTest.java
@@ -35,7 +35,7 @@ public class SearchDataStoreTest extends AbstractTest
     @Test
     public void testSearchWithEmptyCriteria()
     {
-        testSearch(TEST_USER, new DataStoreSearchCriteria(), "AFS", "STANDARD");
+        testSearch(TEST_USER, new DataStoreSearchCriteria(), "STANDARD");
     }
 
     @Test
diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
index 4b295e8652c9cff52609042a42a6ff5c774eaea6..9a71dfdb826575eb1d1fcc386da7ccc8bbfee71a 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/CommonServerTest.java
@@ -3549,10 +3549,8 @@ public class CommonServerTest extends SystemTestCase
         if (user.isInstanceUserOrSpaceUserOrEnabledProjectUser())
         {
             List<DataStore> stores = commonServer.listDataStores(session.getSessionToken());
-            stores.sort(Comparator.comparing(DataStore::getCode));
-            assertEquals(stores.size(), 2);
-            assertEquals(stores.get(0).getCode(), "AFS");
-            assertEquals(stores.get(1).getCode(), "STANDARD");
+            assertEquals(stores.size(), 1);
+            assertEquals(stores.get(0).getCode(), "STANDARD");
         } else
         {
             try