diff --git a/build.xml b/build.xml
index b48d8853d..128a9e2ba 100644
--- a/build.xml
+++ b/build.xml
@@ -837,18 +837,18 @@ Authors:
              <include name="schema/config/RootSimpleTypeDefinitionTest.class"/>
              <include name="schema/config/RootTypeDefinitionTest.class"/>
              <include name="schema/config/UseGrammarPoolOnly_False_Test.class"/>
-          <!-- These tests are failing. Fix them.
              <include name="schema/config/IgnoreXSIType_C_AC_Test.class"/>
              <include name="schema/config/IgnoreXSIType_C_CA_Test.class"/>
              <include name="schema/config/IgnoreXSIType_C_C_Test.class"/>
-             <include name="schema/config/SurrogatePairLengthTest.class"/>
              <include name="schema/config/UseGrammarPoolOnly_True_Test.class"/>
+             <include name="schema/Test.class"/>
+             <!-- These tests still need fixes:
              <include name="schema/config/UnparsedEntityCheckingTest.class"/>
-            -->             
-              <include name="schema/Test.class"/>
-              <include name="jaxp/JAXPSpecTest.class"/>
-              <include name="dom/ids/Test.class"/>
-           </fileset>
+             <include name="schema/config/SurrogatePairLengthTest.class"/>
+             -->
+             <include name="jaxp/JAXPSpecTest.class"/>
+             <include name="dom/ids/Test.class"/>
+            </fileset>
          </batchtest>
 
          
diff --git a/tests/schema/config/IgnoreXSIType_C_AC_Test.java b/tests/schema/config/IgnoreXSIType_C_AC_Test.java
index b2d9f4409..8b0919df0 100644
--- a/tests/schema/config/IgnoreXSIType_C_AC_Test.java
+++ b/tests/schema/config/IgnoreXSIType_C_AC_Test.java
@@ -144,7 +144,7 @@ private void checkTrueResult() {
         
         child = super.getChild(2);
         assertValidity(ItemPSVI.VALIDITY_NOTKNOWN, child.getValidity());
-        assertValidationAttempted(ItemPSVI.VALIDATION_NONE, child
+        assertValidationAttempted(ItemPSVI.VALIDATION_PARTIAL, child
                 .getValidationAttempted());
         assertElementNull(child.getElementDeclaration());
         assertAnyType(child.getTypeDefinition());
diff --git a/tests/schema/config/IgnoreXSIType_C_CA_Test.java b/tests/schema/config/IgnoreXSIType_C_CA_Test.java
index 58425c9af..476c337c0 100644
--- a/tests/schema/config/IgnoreXSIType_C_CA_Test.java
+++ b/tests/schema/config/IgnoreXSIType_C_CA_Test.java
@@ -136,7 +136,7 @@ private void checkTrueResult() {
         
         PSVIElementNSImpl child = super.getChild(1);
         assertValidity(ItemPSVI.VALIDITY_NOTKNOWN, child.getValidity());
-        assertValidationAttempted(ItemPSVI.VALIDATION_NONE, child
+        assertValidationAttempted(ItemPSVI.VALIDATION_PARTIAL, child
                 .getValidationAttempted());
         assertElementNull(child.getElementDeclaration());
         assertAnyType(child.getTypeDefinition());
diff --git a/tests/schema/config/IgnoreXSIType_C_C_Test.java b/tests/schema/config/IgnoreXSIType_C_C_Test.java
index 27e3c50a9..f25f8a7f9 100644
--- a/tests/schema/config/IgnoreXSIType_C_C_Test.java
+++ b/tests/schema/config/IgnoreXSIType_C_C_Test.java
@@ -129,14 +129,14 @@ public void testSetTrueFragment() {
     
     private void checkTrueResult() {
         assertValidity(ItemPSVI.VALIDITY_NOTKNOWN, fRootNode.getValidity());
-        assertValidationAttempted(ItemPSVI.VALIDATION_NONE, fRootNode
+        assertValidationAttempted(ItemPSVI.VALIDATION_PARTIAL, fRootNode
                 .getValidationAttempted());
         assertElementNull(fRootNode.getElementDeclaration());
         assertAnyType(fRootNode.getTypeDefinition());
         
         PSVIElementNSImpl child = super.getChild(1);
         assertValidity(ItemPSVI.VALIDITY_NOTKNOWN, child.getValidity());
-        assertValidationAttempted(ItemPSVI.VALIDATION_NONE, child
+        assertValidationAttempted(ItemPSVI.VALIDATION_PARTIAL, child
                 .getValidationAttempted());
         assertElementNull(child.getElementDeclaration());
         assertAnyType(child.getTypeDefinition());
diff --git a/tests/schema/config/UnparsedEntityCheckingTest.java b/tests/schema/config/UnparsedEntityCheckingTest.java
index 3c7798fc6..146c5092b 100644
--- a/tests/schema/config/UnparsedEntityCheckingTest.java
+++ b/tests/schema/config/UnparsedEntityCheckingTest.java
@@ -55,7 +55,6 @@ public void testDefaultValid() {
         }
         
         checkDefault();
-        throw new RuntimeException();
     }
     
     public void testSetFalseValid() {
diff --git a/tests/schema/config/UseGrammarPoolOnly_True_Test.java b/tests/schema/config/UseGrammarPoolOnly_True_Test.java
index 35fc054d5..7345f6b31 100644
--- a/tests/schema/config/UseGrammarPoolOnly_True_Test.java
+++ b/tests/schema/config/UseGrammarPoolOnly_True_Test.java
@@ -60,7 +60,7 @@ public void testUsingOnlyGrammarPool() {
         }
         
         assertValidity(ItemPSVI.VALIDITY_NOTKNOWN, fRootNode.getValidity());
-        assertValidationAttempted(ItemPSVI.VALIDATION_NONE, fRootNode
+        assertValidationAttempted(ItemPSVI.VALIDATION_PARTIAL, fRootNode
                 .getValidationAttempted());
         assertElementNull(fRootNode.getElementDeclaration());
         assertAnyType(fRootNode.getTypeDefinition());