diff --git a/base/sourceTest/java/ch/systemsx/cisd/base/AllTests.java b/base/sourceTest/java/ch/systemsx/cisd/base/AllTests.java
index 1e3fa2600fbd4aa8d376f1dd13387702c3c8821e..c08b609c77a4746831d1a6f06894c32513bb28da 100644
--- a/base/sourceTest/java/ch/systemsx/cisd/base/AllTests.java
+++ b/base/sourceTest/java/ch/systemsx/cisd/base/AllTests.java
@@ -21,7 +21,7 @@ import ch.systemsx.cisd.base.convert.NativeTaggedArrayTests;
 import ch.systemsx.cisd.base.exceptions.IOExceptionUncheckedTests;
 import ch.systemsx.cisd.base.io.ByteBufferRandomAccessFileTests;
 import ch.systemsx.cisd.base.io.RandomAccessFileImplTests;
-import ch.systemsx.cisd.base.mdarray.MDArraytest;
+import ch.systemsx.cisd.base.mdarray.MDArrayTests;
 import ch.systemsx.cisd.base.unix.Unix;
 import ch.systemsx.cisd.base.unix.UnixTests;
 
@@ -45,7 +45,7 @@ public class AllTests
         System.out.println();
         RandomAccessFileImplTests.main(args);
         System.out.println();
-        MDArraytest.main(args);
+        MDArrayTests.main(args);
         System.out.println();
         if (Unix.isOperational())
         {
diff --git a/base/sourceTest/java/ch/systemsx/cisd/base/mdarray/MDArraytest.java b/base/sourceTest/java/ch/systemsx/cisd/base/mdarray/MDArrayTests.java
similarity index 96%
rename from base/sourceTest/java/ch/systemsx/cisd/base/mdarray/MDArraytest.java
rename to base/sourceTest/java/ch/systemsx/cisd/base/mdarray/MDArrayTests.java
index 82325310990dad0e06450a8615b4319587e762de..2a136de59ff64b08939b8cff79966f33373ab934 100644
--- a/base/sourceTest/java/ch/systemsx/cisd/base/mdarray/MDArraytest.java
+++ b/base/sourceTest/java/ch/systemsx/cisd/base/mdarray/MDArrayTests.java
@@ -32,7 +32,7 @@ import ch.systemsx.cisd.base.BuildAndEnvironmentInfo;
  * 
  * @author Bernd Rinn
  */
-public class MDArraytest
+public class MDArrayTests
 {
 
     static class TestMDArray extends MDAbstractArray<Void>
@@ -181,10 +181,10 @@ public class MDArraytest
     public static void main(String[] args) throws Throwable
     {
         System.out.println(BuildAndEnvironmentInfo.INSTANCE);
-        System.out.println("Test class: " + MDArraytest.class.getSimpleName());
+        System.out.println("Test class: " + MDArrayTests.class.getSimpleName());
         System.out.println();
-        final MDArraytest test = new MDArraytest();
-        for (Method m : MDArraytest.class.getMethods())
+        final MDArrayTests test = new MDArrayTests();
+        for (Method m : MDArrayTests.class.getMethods())
         {
             final Test testAnnotation = m.getAnnotation(Test.class);
             if (testAnnotation == null)