diff --git a/build.xml b/build.xml
index 3f17b51122..dd9c39e6cf 100644
--- a/build.xml
+++ b/build.xml
@@ -844,9 +844,10 @@ Authors:
              <include name="schema/config/SurrogatePairLengthTest.class"/>
              <include name="schema/config/UseGrammarPoolOnly_True_Test.class"/>
              <include name="schema/config/UnparsedEntityCheckingTest.class"/>
-            -->             
-             <include name="jaxp/JAXPSpecTest.class"/>
-             <include name="dom/ids/Test.class"/>
+             -->             
+              <include name="dom/registry/Test.class"/>
+              <include name="jaxp/JAXPSpecTest.class"/>
+              <include name="dom/ids/Test.class"/>
            </fileset>
          </batchtest>
 
@@ -953,12 +954,6 @@ Authors:
           classpathref="test.classpath"
           failOnError="yes">
     </java>
-    <echo message="Running dom.registry.Test..." />
-    <java fork="yes"
-          classname="dom.registry.Test"
-          classpathref="test.classpath"
-          failOnError="yes">
-    </java>
     <echo message="Running dom.dom3.Test..." />
     <java fork="yes"
           classname="dom.dom3.Test"
diff --git a/tests/dom/registry/Test.java b/tests/dom/registry/Test.java
index 090372938a..f59f3983d8 100644
--- a/tests/dom/registry/Test.java
+++ b/tests/dom/registry/Test.java
@@ -23,13 +23,12 @@
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.bootstrap.DOMImplementationRegistry;
 
-import dom.util.Assertion;
+import junit.framework.TestCase;
 
-public class Test {
+public class Test extends TestCase {
 
-    public static void main(String argv[])
-    {                                  
-        
+    public void testRegistry()
+    {
         System.out.println("Running dom.registry.Test...");
         // set DOMImplementationSource
         System.setProperty(DOMImplementationRegistry.PROPERTY,
@@ -39,30 +38,30 @@ public static void main(String argv[])
         DOMImplementationRegistry registry = null;
         try {
             registry = DOMImplementationRegistry.newInstance();
-            Assertion.verify(registry != null);
+            assertNotNull("registry should not be null", registry);
         } catch (Exception e) {
-            e.printStackTrace();
+            fail("Unexpected exception: " + e.getMessage());
         }
 
         try {
             DOMImplementation i = registry.getDOMImplementation("XML");
 
-            Assertion.verify(i ==
+            assertSame(i,
                              CoreDOMImplementationImpl.getDOMImplementation());
 
         } catch (Exception e) {
-            e.printStackTrace();
+            fail("Unexpected exception: " + e.getMessage());
         }
 
         try {
             DOMImplementation i =
                 registry.getDOMImplementation("XML MutationEvents");
 
-            Assertion.verify(i ==
+            assertSame(i,
                              DOMImplementationImpl.getDOMImplementation());
 
         } catch (Exception e) {
-            e.printStackTrace();
+            fail("Unexpected exception: " + e.getMessage());
         }
     }
 }