diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/impl/RpcServiceInterfaceTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/api/RpcServiceInterfaceTest.java
similarity index 98%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/impl/RpcServiceInterfaceTest.java
rename to common/sourceTest/java/ch/systemsx/cisd/common/api/RpcServiceInterfaceTest.java
index 55f8dfd146e1576bcbac00f3a8f4a5ab8f5dfbc0..309d40926a12a32a079c687f88e9ea2738d73eb2 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/impl/RpcServiceInterfaceTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/api/RpcServiceInterfaceTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.dss.component.impl;
+package ch.systemsx.cisd.common.api;
 
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/impl/RpcServiceInterfaceVersionTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/api/RpcServiceInterfaceVersionTest.java
similarity index 97%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/impl/RpcServiceInterfaceVersionTest.java
rename to common/sourceTest/java/ch/systemsx/cisd/common/api/RpcServiceInterfaceVersionTest.java
index e3b6a015d6c7077ca981e31dd03c0d0a097a5c93..0b5e1842d9e2e8a4c4c6bf45a57ed31a0e899d77 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/impl/RpcServiceInterfaceVersionTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/api/RpcServiceInterfaceVersionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis.dss.component.impl;
+package ch.systemsx.cisd.common.api;
 
 import org.testng.AssertJUnit;
 import org.testng.annotations.Test;