diff --git a/status/explicit-failures-markup.xml b/status/explicit-failures-markup.xml
index 0158bbddc6..aefefa27be 100644
--- a/status/explicit-failures-markup.xml
+++ b/status/explicit-failures-markup.xml
@@ -356,28 +356,26 @@
 
     <!-- concept_check -->
     <library name="concept_check">
-        <mark-expected-failures>
-            <test name="class_concept_fail_expected">
-                <mark-failure>
-                    <toolset name="cw-8.3*"/>
-                    <note author="B. Dawes" refid="3"/>
-                </mark-failure>
-            </test>
-            <test name="class_concept_fail_expected">
-                <mark-failure>
-                    <toolset name="borland-5*"/>
-                    <toolset name="msvc-6.5*"/>
-                    <toolset name="msvc-7.0"/>
-                    <note author="Jeremy Siek"/>
-                </mark-failure>
-            </test>
-            <test name="stl_concept_covering">
-                <mark-failure>
-                    <toolset name="*"/>
-                    <note author="Jeremy Siek" refid="1"/>
-                </mark-failure>
-            </test>
-        </mark-expected-failures>
+        <test name="class_concept_fail_expected">
+            <mark-failure>
+                <toolset name="cw-8.3*"/>
+                <note author="B. Dawes" refid="3"/>
+            </mark-failure>
+        </test>
+        <test name="class_concept_fail_expected">
+            <mark-failure>
+                <toolset name="borland-5*"/>
+                <toolset name="msvc-6.5*"/>
+                <toolset name="msvc-7.0"/>
+                <note author="Jeremy Siek"/>
+            </mark-failure>
+        </test>
+        <test name="stl_concept_covering">
+            <mark-failure>
+                <toolset name="*"/>
+                <note author="Jeremy Siek" refid="1"/>
+            </mark-failure>
+        </test>
     </library>
 
     <!-- config -->
@@ -1412,12 +1410,6 @@
           <toolset name="iw-7_1-vc6-stlp-4_5_3"/>
           <note refid="3" author="Doug Gregor"/>
         </mark-expected-failures>
-        <mark-expected-failures>
-          <test name="csr_graph_test"/>
-          <toolset name="gcc-2.95.3-linux"/>
-          <toolset name="gcc-2.95.3-stlport-4.5.3-linux"/>
-          <toolset name="gcc-2.95.3-stlport-4.6.2-linux"/>
-        </mark-expected-failures>
         <mark-expected-failures>
             <test name="bundled_properties"/>
             <toolset name="qcc-3.3*"/>
diff --git a/status/explicit-failures.xsd b/status/explicit-failures.xsd
index 89639aa801..6c77750720 100644
--- a/status/explicit-failures.xsd
+++ b/status/explicit-failures.xsd
@@ -61,9 +61,9 @@
     <xs:element name="mark-expected-failures">
         <xs:complexType>
             <xs:sequence>
-                <xs:element ref="test" minOccurs="0" maxOccurs="unbounded"/>
-                <xs:element ref="toolset" minOccurs="0" maxOccurs="unbounded"/>
-                <xs:element ref="note" minOccurs="0"/>
+                <xs:element ref="test" maxOccurs="unbounded"/>
+                <xs:element ref="toolset" maxOccurs="unbounded"/>
+                <xs:element ref="note"/>
             </xs:sequence>
             <xs:attribute name="reason" type="xs:string"/>
         </xs:complexType>