1 files changed, 17 insertions, 21 deletions
diff --git a/src/testcases/org/apache/poi/hssf/model/AllModelTests.java b/src/testcases/org/apache/poi/hssf/model/AllModelTests.java
index a243226867..0d140ab7d3 100644
--- a/src/testcases/org/apache/poi/hssf/model/AllModelTests.java
+++ b/src/testcases/org/apache/poi/hssf/model/AllModelTests.java
@@ -17,30 +17,26 @@
 
 package org.apache.poi.hssf.model;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 
 /**
  * Collects all tests for <tt>org.apache.poi.hssf.model</tt>.
- * 
- * @author Josh Micich
  */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    TestDrawingManager.class,
+    TestDrawingManager2.class,
+    TestFormulaParser.class,
+    TestFormulaParserEval.class,
+    TestFormulaParserIf.class,
+    TestLinkTable.class,
+    TestOperandClassTransformer.class,
+    TestRowBlocksReader.class,
+    TestRVA.class,
+    TestSheet.class,
+    TestSheetAdditional.class,
+    TestWorkbook.class
+})
 public final class AllModelTests {
-	
-	public static Test suite() {
-		TestSuite result = new TestSuite(AllModelTests.class.getName());
-		result.addTestSuite(TestDrawingManager.class);
-		result.addTestSuite(TestDrawingManager2.class);
-		result.addTestSuite(TestFormulaParser.class);
-		result.addTestSuite(TestFormulaParserEval.class);
-		result.addTestSuite(TestFormulaParserIf.class);
-		result.addTestSuite(TestLinkTable.class);
-		result.addTestSuite(TestOperandClassTransformer.class);
-		result.addTestSuite(TestRowBlocksReader.class);
-		result.addTestSuite(TestRVA.class);
-		result.addTestSuite(TestSheet.class);
-		result.addTestSuite(TestSheetAdditional.class);
-		result.addTestSuite(TestWorkbook.class);
-		return result;
-	}
 }