diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSet.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSet.java
index 562cec6fc1b9e18fb73e3b61e98bae940c4e96e9..9a67ee9a21b5ae97c1d0f7879dbb29ed64abed69 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSet.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/DataSet.java
@@ -22,6 +22,7 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.EnumSet;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.TreeMap;
 
@@ -94,7 +95,7 @@ public final class DataSet implements Serializable, IIdHolder
 
         private List<DataSet> containerDataSets = Collections.emptyList();
         
-        private HashMap<String, String> properties = new HashMap<String, String>();
+        private HashMap<String, String> properties = new LinkedHashMap<String, String>();
 
         private List<Metaproject> metaprojects = new ArrayList<Metaproject>();
 
diff --git a/screening/sourceTest/java/OpenBISScreeningMLTest.java b/screening/sourceTest/java/OpenBISScreeningMLTest.java
index a45b7535b0e28e7748e650d1efecc9e7c035bd37..4f75c20f10efed403a1d1cb4967cec27f046a504 100644
--- a/screening/sourceTest/java/OpenBISScreeningMLTest.java
+++ b/screening/sourceTest/java/OpenBISScreeningMLTest.java
@@ -1244,7 +1244,7 @@ public class OpenBISScreeningMLTest extends AbstractFileSystemTestCase
 
     private Map<String, String> createProperties(String dataSetCode)
     {
-        Map<String, String> properties = new HashMap<String, String>();
+        Map<String, String> properties = new LinkedHashMap<String, String>();
         properties.put(dataSetCode + "-key1", dataSetCode + "-value1");
         properties.put(dataSetCode + "-key2", dataSetCode + "-value2");
         return properties;