diff --git a/src/testcases/org/apache/poi/hpsf/basic/AllPOIHPSFBasicTests.java b/src/testcases/org/apache/poi/hpsf/basic/AllPOIHPSFBasicTests.java
index f71193644c..b573c28d90 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/AllPOIHPSFBasicTests.java
+++ b/src/testcases/org/apache/poi/hpsf/basic/AllPOIHPSFBasicTests.java
@@ -17,24 +17,23 @@
 
 package org.apache.poi.hpsf.basic;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
 /**
  * Test suite for org.apache.poi.hpsf.basic
  * 
  * @author Josh Micich
  */
-public final class AllPOIHPSFBasicTests {
-    public static Test suite() {
-        TestSuite result = new TestSuite("Tests for org.apache.poi.hpsf.basic");
-        result.addTestSuite(TestBasic.class);
-        result.addTestSuite(TestClassID.class);
-        result.addTestSuite(TestEmptyProperties.class);
-        result.addTestSuite(TestHPSFBugs.class);
-        result.addTestSuite(TestMetaDataIPI.class);
-        result.addTestSuite(TestUnicode.class);
-        result.addTestSuite(TestWrite.class);
-        result.addTestSuite(TestWriteWellKnown.class);
-        return result;
-    }
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+    TestBasic.class,
+    TestClassID.class,
+    TestEmptyProperties.class,
+    TestHPSFBugs.class,
+    TestMetaDataIPI.class,
+    TestUnicode.class,
+    TestWrite.class,
+    TestWriteWellKnown.class    
+})
+public class AllPOIHPSFBasicTests {
 }