diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
index 134ca1302d1c55d7faa3bb127db9cb752cdc2b07..5a8eac1d2d1a2cad9c873521106b3446e7a1e856 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
@@ -184,6 +184,12 @@ public abstract class AbstractServer<T> extends AbstractServiceWithLogger<T> imp
         this.dataSetTypeSlaveServerPlugin = dataSetTypeSlaveServerPlugin;
     }
 
+    // For unit tests - in production Spring will inject this object.
+    public void setDisplaySettingsProvider(DisplaySettingsProvider displaySettingsProvider)
+    {
+        this.displaySettingsProvider = displaySettingsProvider;
+    }
+
     protected IPropertiesBatchManager getPropertiesBatchManager()
     {
         if (propertiesBatchManager == null)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
index 7f46a000149ccaf27df080adcdfba025ca73bdaf..e06ddf2d1ecfe05d728653b6ab0fff63f228629b 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
@@ -128,6 +128,7 @@ public final class CommonServerTest extends AbstractServerTestCase
         server.setSampleTypeSlaveServerPlugin(sampleTypeSlaveServerPlugin);
         server.setDataSetTypeSlaveServerPlugin(dataSetTypeSlaveServerPlugin);
         server.setBaseIndexURL(SESSION_TOKEN, BASE_INDEX_URL);
+        server.setDisplaySettingsProvider(new DisplaySettingsProvider());
         return server;
     }