1 files changed, 18 insertions, 22 deletions
diff --git a/src/testcases/org/apache/poi/poifs/filesystem/AllPOIFSFileSystemTests.java b/src/testcases/org/apache/poi/poifs/filesystem/AllPOIFSFileSystemTests.java
index bc46e17c9a..364aa1a6e2 100644
--- a/src/testcases/org/apache/poi/poifs/filesystem/AllPOIFSFileSystemTests.java
+++ b/src/testcases/org/apache/poi/poifs/filesystem/AllPOIFSFileSystemTests.java
@@ -17,31 +17,27 @@
 
 package org.apache.poi.poifs.filesystem;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Tests for org.apache.poi.poifs.filesystem<br/>
- *
- * @author Josh Micich
  */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+      TestDirectoryNode.class
+    , TestDocument.class
+    , TestDocumentDescriptor.class
+    , TestDocumentInputStream.class
+    , TestDocumentNode.class
+    , TestDocumentOutputStream.class
+    , TestEmptyDocument.class
+    , TestOffice2007XMLException.class
+    , TestPOIFSDocumentPath.class
+    , TestPOIFSFileSystem.class
+    , TestNPOIFSFileSystem.class
+    , TestPropertySorter.class
+    , TestOle10Native.class
+})
 public final class AllPOIFSFileSystemTests {
-
-    public static Test suite() {
-        TestSuite result = new TestSuite("Tests for org.apache.poi.poifs.filesystem");
-        result.addTestSuite(TestDirectoryNode.class);
-        result.addTestSuite(TestDocument.class);
-        result.addTestSuite(TestDocumentDescriptor.class);
-        result.addTestSuite(TestDocumentInputStream.class);
-        result.addTestSuite(TestDocumentNode.class);
-        result.addTestSuite(TestDocumentOutputStream.class);
-        result.addTestSuite(TestEmptyDocument.class);
-        result.addTestSuite(TestOffice2007XMLException.class);
-        result.addTestSuite(TestPOIFSDocumentPath.class);
-        result.addTestSuite(TestPOIFSFileSystem.class);
-        result.addTestSuite(TestNPOIFSFileSystem.class);
-        result.addTestSuite(TestPropertySorter.class);
-        result.addTestSuite(TestOle10Native.class);
-        return result;
-    }
 }