diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifierTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifierTest.java
index 37fe619ef8900d22cbff8da0ee4ff1b36edd8c0e..a55730a06e33d17718ecb8680931d29d4fd8691d 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifierTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/SampleOwnerIdentifierTest.java
@@ -79,7 +79,7 @@ public class SampleOwnerIdentifierTest
     @Test
     public void testIsAndGetSpaceLevel()
     {
-        assertIsAndGetSpaceLevel(ownerProjectP1, false, null);
+        assertIsAndGetSpaceLevel(ownerProjectP1, false, spaceA);
         assertIsAndGetSpaceLevel(ownerSpaceA, true, spaceA);
         assertIsAndGetSpaceLevel(noOwner, false, null);
     }
@@ -87,7 +87,13 @@ public class SampleOwnerIdentifierTest
     private void assertIsAndGetSpaceLevel(SampleOwnerIdentifier identifier, boolean expected, SpaceIdentifier space)
     {
         assertEquals(identifier.isSpaceLevel(), expected);
-        assertSame(identifier.getSpaceLevel(), space);
+        if (space == null)
+        {
+            assertEquals(identifier.getSpaceLevel(), null);
+        } else
+        {
+            assertSame(identifier.getSpaceLevel().getSpaceCode(), space.getSpaceCode());
+        }
     }
     
     @Test