diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/reflection/ClassUtilsTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/reflection/ClassUtilsTest.java
index 1d780ef2503df44eed2072ce52f5a41125bae9e0..53210f408716645d40053d73b83621abd6d9d270 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/reflection/ClassUtilsTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/reflection/ClassUtilsTest.java
@@ -34,9 +34,9 @@ import java.util.Properties;
 import org.testng.annotations.Test;
 import org.testng.remote.SuiteSlave;
 
-import ch.systemsx.cisd.common.TimingParametersTest;
 import ch.systemsx.cisd.common.reflection.ClassUtils;
 import ch.systemsx.cisd.common.time.TimingParameters;
+import ch.systemsx.cisd.common.time.TimingParametersTest;
 
 /**
  * Test cases for the {@link ClassUtils} class.
@@ -238,7 +238,7 @@ public final class ClassUtilsTest
     public final void testListClasses()
     {
         // With 'file' protocol
-        List<Class<?>> classes = ClassUtils.listClasses("ch.systemsx.cisd.common", null);
+        List<Class<?>> classes = ClassUtils.listClasses("ch.systemsx.cisd.common.time", null);
         assertTrue(classes.size() > 0);
         assertTrue(classes.contains(TimingParameters.class));
         assertTrue(classes.contains(TimingParametersTest.class));
diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/TimingParametersTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/time/TimingParametersTest.java
similarity index 98%
rename from common/sourceTest/java/ch/systemsx/cisd/common/TimingParametersTest.java
rename to common/sourceTest/java/ch/systemsx/cisd/common/time/TimingParametersTest.java
index 09656058ab7438ccc14caa2c1f42db49cf2a9024..30e5c299f86915d7d3f964643c29df8795699364 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/TimingParametersTest.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/time/TimingParametersTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.common;
+package ch.systemsx.cisd.common.time;
 
 import java.util.Properties;