diff --git a/cts/schemas/test-3/ref/nvpair-no-value.ref-1 b/cts/schemas/test-3/ref/nvpair-no-value.ref-1
index 9ccbe2391b..5820a8429d 100644
--- a/cts/schemas/test-3/ref/nvpair-no-value.ref-1
+++ b/cts/schemas/test-3/ref/nvpair-no-value.ref-1
@@ -1,37 +1,33 @@
 <cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="8" num_updates="0" admin_epoch="0" original="1">
   <configuration original="1">
     <!-- The essential elements of this test are:
          * There is one nvset element of each type: cluster_property_set,
            instance_attributes, meta_attributes, utilization.
          * Each nvset contains one nvpair with a value and one nvpair with no
            value.
 
          In this situation, all nvpair elements with no value should be dropped.
       -->
     <crm_config original="1">
       <cluster_property_set id="cib-bootstrap-options" original="1">
-        <nvpair id="cib-bootstrap-options-option1" name="option1" original="1"/>
         <nvpair id="cib-bootstrap-options-option2" name="option2" value="value2" original="1"/>
       </cluster_property_set>
     </crm_config>
     <nodes original="1"/>
     <resources original="1">
       <primitive class="ocf" id="rsc1" provider="pacemaker" type="Dummy" original="1">
         <instance_attributes id="rsc1-instance_attributes" original="1">
           <nvpair id="rsc1-instance_attributes-option2" name="option2" value="value2" original="1"/>
-          <nvpair id="rsc1-instance_attributes-option1" name="option1" original="1"/>
         </instance_attributes>
         <meta_attributes id="rsc1-meta_attributes" original="1">
-          <nvpair id="rsc1-meta_attributes-option1" name="option1" original="1"/>
           <nvpair id="rsc1-meta_attributes-option2" name="option2" value="value2" original="1"/>
         </meta_attributes>
         <utilization id="rsc1-utilization" original="1">
-          <nvpair id="rsc1-utilization-option1" name="option1" original="1"/>
           <nvpair id="rsc1-utilization-option2" name="option2" value="value2" original="1"/>
         </utilization>
       </primitive>
     </resources>
     <constraints original="1"/>
   </configuration>
   <status original="1"/>
 </cib>
diff --git a/cts/schemas/test-3/ref/nvpair-no-value.ref-99 b/cts/schemas/test-3/ref/nvpair-no-value.ref-99
index 6c13dae3ab..a8e8d240b9 100644
--- a/cts/schemas/test-3/ref/nvpair-no-value.ref-99
+++ b/cts/schemas/test-3/ref/nvpair-no-value.ref-99
@@ -1,37 +1,33 @@
 <cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="8" num_updates="0" admin_epoch="0">
   <configuration>
     <!-- The essential elements of this test are:
          * There is one nvset element of each type: cluster_property_set,
            instance_attributes, meta_attributes, utilization.
          * Each nvset contains one nvpair with a value and one nvpair with no
            value.
 
          In this situation, all nvpair elements with no value should be dropped.
       -->
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
-        <nvpair id="cib-bootstrap-options-option1" name="option1"/>
         <nvpair id="cib-bootstrap-options-option2" name="option2" value="value2"/>
       </cluster_property_set>
     </crm_config>
     <nodes/>
     <resources>
       <primitive class="ocf" id="rsc1" provider="pacemaker" type="Dummy">
         <instance_attributes id="rsc1-instance_attributes">
           <nvpair id="rsc1-instance_attributes-option2" name="option2" value="value2"/>
-          <nvpair id="rsc1-instance_attributes-option1" name="option1"/>
         </instance_attributes>
         <meta_attributes id="rsc1-meta_attributes">
-          <nvpair id="rsc1-meta_attributes-option1" name="option1"/>
           <nvpair id="rsc1-meta_attributes-option2" name="option2" value="value2"/>
         </meta_attributes>
         <utilization id="rsc1-utilization">
-          <nvpair id="rsc1-utilization-option1" name="option1"/>
           <nvpair id="rsc1-utilization-option2" name="option2" value="value2"/>
         </utilization>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
   <status/>
 </cib>
diff --git a/xml/nvset-4.0.rng b/xml/nvset-4.0.rng
index 64f8fcdce3..0a12a10a4f 100644
--- a/xml/nvset-4.0.rng
+++ b/xml/nvset-4.0.rng
@@ -1,63 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- just as nvset-2.9.rng, but allows for instantiated @name restrictions -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
     <ref name="element-nvset"/>
   </start>
 
   <!-- nvpair/@name:
        * generic string by default, parent grammar may want to prohibit
          enumerated names -->
   <define name="element-nvset.name">
     <attribute name="name">
       <text/>
     </attribute>
   </define>
 
   <!-- nvpair/@name:
        * defer element-nvset.name grammar item
        nvpair/@value:
        generic string by default, parent grammar may want to restrict
        enumerated pairs (i.e. related to @name) at once -->
   <define name="element-nvset.name-value">
     <ref name="element-nvset.name"/>
-    <optional>
-      <attribute name="value"><text/></attribute>
-    </optional>
+    <attribute name="value"><text/></attribute>
   </define>
 
   <!-- Allow easy redefinition in parent grammars -->
   <define name="element-nvset.rule">
     <externalRef href="rule-4.0.rng"/>
   </define>
 
   <define name="element-nvset">
    <choice>
    <attribute name="id-ref"><data type="IDREF"/></attribute>
    <group>
     <attribute name="id"><data type="ID"/></attribute>
     <interleave>
       <optional>
         <ref name="element-nvset.rule"/>
       </optional>
       <zeroOrMore>
         <element name="nvpair">
           <choice>
             <attribute name="id-ref"><data type="IDREF"/></attribute>
             <group>
               <attribute name="id"><data type="ID"/></attribute>
               <ref name="element-nvset.name-value"/>
             </group>
           </choice>
         </element>
       </zeroOrMore>
       <optional>
         <externalRef href="score.rng"/>
       </optional>
     </interleave>
    </group>
    </choice>
   </define>
 
 </grammar>
diff --git a/xml/upgrade-3.10-1.xsl b/xml/upgrade-3.10-1.xsl
index d5993e7d3c..22ef953146 100644
--- a/xml/upgrade-3.10-1.xsl
+++ b/xml/upgrade-3.10-1.xsl
@@ -1,109 +1,117 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
  Use comments liberally as future maintainers may be unfamiliar with XSLT.
  -->
 
 <!--
  upgrade-3.10-1.xsl
 
  Guarantees after this transformation:
  * The validate-with attribute of the cib element is set to "pacemaker-4.0".
  * All nvset elements are sorted by score within their respective parent
    elements (remaining in document order in the case of a tie) and placed below
    all non-nvset siblings. Exception: a cluster_property_set with id
    "cib-bootstrap-options" always sorts first relative to its siblings.
+ * Each nvpair has a value attribute. If an nvpair did not have a value
+   attribute prior to this transformation, it is dropped.
 
  nvset elements include the following:
  * cluster_property_set
  * instance_attributes
  * meta_attributes
  * utilization
 
  Any template that matches an element (for example, "primitive") that may
  contain an nvset should be placed in a later stylesheet. If such a template is
  placed in this stylesheet, its nvsets will not be sorted. We could avoid this
  with some refactoring, but it's cleaner this way.
  -->
 
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
 <xsl:import href="upgrade-3.10-common.xsl"/>
 
 <!--
  Copy everything unaltered by default, except sort nvset elements by score.
 
  This doesn't affect behavior. nvset elements of a given type within a given
  parent element are processed in order of their score attributes, with a
  nonexistent score treated as 0. In the event of a tie, elements are processed
  in document order. The sort here preserves document order in the event of a
  tie.
 
  The order of nvset elements relative to non-nvset elements does not matter. So
  this template puts existing nvset elements after existing non-nvset elements.
 
  This facilitates later transformations, allowing us to more easily drop nvpairs
  with unsupported values without changing behavior.
  -->
 <xsl:template match="/|@*|node()">
     <xsl:copy>
         <xsl:variable name="nvsets"
                       select="cluster_property_set
                               |instance_attributes
                               |meta_attributes
                               |utilization"/>
 
         <!-- XPath 1.0 set difference idiom -->
         <xsl:variable name="non_nvsets"
                       select="@*|node()[count(.|$nvsets) != count($nvsets)]"/>
 
         <xsl:apply-templates select="$non_nvsets"/>
         <xsl:apply-templates select="$nvsets">
             <!--
              Order cluster_property_set with id "cib-bootstrap-options" before
              siblings
              -->
             <xsl:sort select="self::cluster_property_set
                               and (@id = 'cib-bootstrap-options')"
                       order="descending"/>
 
             <!--
              Sort remaining elements by score.
 
              First, score="INFINITY" (including "+INFINITY").
              -->
             <xsl:sort select="@score[. = 'INFINITY'] or @score[. = '+INFINITY']"
                       order="descending"/>
 
             <!-- Then finite positive scores -->
             <xsl:sort select="@score[. &gt; 0]" data-type="number"
                       order="descending"/>
 
             <!-- Then score 0 (including implicit) -->
             <xsl:sort select="number(not(@score) or @score[. = 0])"
                       data-type="number" order="descending"/>
 
             <!-- Then finite negative scores -->
             <xsl:sort select="@score[. &lt; 0]" data-type="number"
                       order="descending"/>
 
             <!-- Then score="-INFINITY" -->
             <xsl:sort select="@score[. = '-INFINITY']" order="descending"/>
         </xsl:apply-templates>
     </xsl:copy>
 </xsl:template>
 
 <!--
  Bump cib/@validate-with, or set it if not already set. Pacemaker does this, but
  doing it in the transformation is helpful for testing.
  -->
 <xsl:template match="cib">
     <xsl:copy>
         <xsl:apply-templates select="@*"/>
         <xsl:attribute name="validate-with">pacemaker-4.0</xsl:attribute>
         <xsl:apply-templates select="node()"/>
     </xsl:copy>
 </xsl:template>
 
+
+<!-- Name/value pairs -->
+
+<!-- Drop any nvpair that does not have a value attribute -->
+<xsl:template match="nvpair[not(@value)]"/>
+
 </xsl:stylesheet>