diff --git a/base/sourceTest/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java b/base/sourceTest/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java
index 7f9580d48dbd27c8ee41f3cd1bc1f538eed5ab5a..09924d068626810882684401f665187a3286fa09 100644
--- a/base/sourceTest/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java
+++ b/base/sourceTest/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java
@@ -16,12 +16,11 @@
 
 package ch.systemsx.cisd.base.tests;
 
-import static org.testng.AssertJUnit.assertTrue;
-
 import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.io.FileUtils;
+import org.testng.AssertJUnit;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeMethod;
 
@@ -33,7 +32,7 @@ import org.testng.annotations.BeforeMethod;
  * 
  * @author Christian Ribeaud
  */
-public abstract class AbstractFileSystemTestCase
+public abstract class AbstractFileSystemTestCase extends AssertJUnit
 {
     protected static final String UNIT_TEST_WORKING_DIRECTORY = "unit-test-wd";
 
diff --git a/base/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java b/base/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
index 48436b43be13b0bff16417b03ca184ffa32f3361..1df26ca3e4d003db179cdfd7d42ab60f6d99dd74 100644
--- a/base/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
+++ b/base/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
@@ -16,12 +16,6 @@
 
 package ch.systemsx.cisd.base.unix;
 
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertFalse;
-import static org.testng.AssertJUnit.assertNotNull;
-import static org.testng.AssertJUnit.assertNull;
-import static org.testng.AssertJUnit.assertTrue;
-
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;