diff --git a/cts/cli/regression.tools.exp b/cts/cli/regression.tools.exp
index 0e69d0d..98c8f23 100644
--- a/cts/cli/regression.tools.exp
+++ b/cts/cli/regression.tools.exp
@@ -3529,7 +3529,7 @@ Colocations:
       </locations>
     </resource>
     <colocations>
-      <colocation peer="prim3" id="colocation-prim2-prim3-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim2-prim3-INFINITY" rsc="prim2" with-rsc="prim3" score="INFINITY"/>
       <locations/>
     </colocations>
   </constraints>
@@ -3546,7 +3546,7 @@ Colocations:
       </locations>
     </resource>
     <colocations>
-      <colocation peer="prim3" id="colocation-prim2-prim3-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim2-prim3-INFINITY" rsc="prim2" with-rsc="prim3" score="INFINITY"/>
       <locations/>
     </colocations>
   </constraints>
@@ -3584,7 +3584,7 @@ Colocations:
 <pacemaker-result api-version="X" request="crm_resource -a -r prim3 --output-as=xml">
   <constraints>
     <colocations>
-      <colocation peer="prim2" id="colocation-prim2-prim3-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim2-prim3-INFINITY" rsc="prim2" with-rsc="prim3" score="INFINITY"/>
       <locations>
         <location host="cluster01" id="prim2-on-cluster1" score="INFINITY"/>
       </locations>
@@ -3593,7 +3593,7 @@ Colocations:
       <locations/>
     </resource>
     <colocations>
-      <colocation peer="prim4" id="colocation-prim3-prim4-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim3-prim4-INFINITY" rsc="prim3" with-rsc="prim4" score="INFINITY"/>
       <locations>
         <location host="cluster02" id="prim4-on-cluster2" score="INFINITY"/>
       </locations>
@@ -3607,7 +3607,7 @@ Colocations:
 <pacemaker-result api-version="X" request="crm_resource -A -r prim3 --output-as=xml">
   <constraints>
     <colocations>
-      <colocation peer="prim2" id="colocation-prim2-prim3-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim2-prim3-INFINITY" rsc="prim2" with-rsc="prim3" score="INFINITY"/>
       <locations>
         <location host="cluster01" id="prim2-on-cluster1" score="INFINITY"/>
       </locations>
@@ -3616,7 +3616,7 @@ Colocations:
       <locations/>
     </resource>
     <colocations>
-      <colocation peer="prim4" id="colocation-prim3-prim4-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim3-prim4-INFINITY" rsc="prim3" with-rsc="prim4" score="INFINITY"/>
       <locations>
         <location host="cluster02" id="prim4-on-cluster2" score="INFINITY"/>
       </locations>
@@ -3658,9 +3658,9 @@ Colocations:
 <pacemaker-result api-version="X" request="crm_resource -a -r prim4 --output-as=xml">
   <constraints>
     <colocations>
-      <colocation peer="prim10" id="colocation-prim10-prim4-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim10-prim4-INFINITY" rsc="prim10" with-rsc="prim4" score="INFINITY"/>
       <locations/>
-      <colocation peer="prim3" id="colocation-prim3-prim4-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim3-prim4-INFINITY" rsc="prim3" with-rsc="prim4" score="INFINITY"/>
       <locations/>
     </colocations>
     <resource id="prim4">
@@ -3669,7 +3669,7 @@ Colocations:
       </locations>
     </resource>
     <colocations>
-      <colocation peer="prim5" id="colocation-prim4-prim5-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim4-prim5-INFINITY" rsc="prim4" with-rsc="prim5" score="INFINITY"/>
       <locations/>
     </colocations>
   </constraints>
@@ -3681,9 +3681,9 @@ Colocations:
 <pacemaker-result api-version="X" request="crm_resource -A -r prim4 --output-as=xml">
   <constraints>
     <colocations>
-      <colocation peer="prim10" id="colocation-prim10-prim4-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim10-prim4-INFINITY" rsc="prim10" with-rsc="prim4" score="INFINITY"/>
       <locations/>
-      <colocation peer="prim3" id="colocation-prim3-prim4-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim3-prim4-INFINITY" rsc="prim3" with-rsc="prim4" score="INFINITY"/>
       <locations/>
     </colocations>
     <resource id="prim4">
@@ -3692,7 +3692,7 @@ Colocations:
       </locations>
     </resource>
     <colocations>
-      <colocation peer="prim5" id="colocation-prim4-prim5-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim4-prim5-INFINITY" rsc="prim4" with-rsc="prim5" score="INFINITY"/>
       <locations/>
     </colocations>
   </constraints>
@@ -3722,7 +3722,7 @@ prim5:
 <pacemaker-result api-version="X" request="crm_resource -a -r prim5 --output-as=xml">
   <constraints>
     <colocations>
-      <colocation peer="prim4" id="colocation-prim4-prim5-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim4-prim5-INFINITY" rsc="prim4" with-rsc="prim5" score="INFINITY"/>
       <locations>
         <location host="cluster02" id="prim4-on-cluster2" score="INFINITY"/>
       </locations>
@@ -3739,7 +3739,7 @@ prim5:
 <pacemaker-result api-version="X" request="crm_resource -A -r prim5 --output-as=xml">
   <constraints>
     <colocations>
-      <colocation peer="prim4" id="colocation-prim4-prim5-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim4-prim5-INFINITY" rsc="prim4" with-rsc="prim5" score="INFINITY"/>
       <locations>
         <location host="cluster02" id="prim4-on-cluster2" score="INFINITY"/>
       </locations>
@@ -3813,7 +3813,7 @@ Colocations:
       <locations/>
     </resource>
     <colocations>
-      <colocation peer="group" id="colocation-prim7-group-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim7-group-INFINITY" rsc="prim7" with-rsc="group" score="INFINITY"/>
       <locations/>
     </colocations>
   </constraints>
@@ -3828,7 +3828,7 @@ Colocations:
       <locations/>
     </resource>
     <colocations>
-      <colocation peer="group" id="colocation-prim7-group-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim7-group-INFINITY" rsc="prim7" with-rsc="group" score="INFINITY"/>
       <locations/>
     </colocations>
   </constraints>
@@ -3859,7 +3859,7 @@ Colocations:
       <locations/>
     </resource>
     <colocations>
-      <colocation peer="gr2" id="colocation-prim8-gr2-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim8-gr2-INFINITY" rsc="prim8" with-rsc="gr2" score="INFINITY"/>
       <locations/>
     </colocations>
   </constraints>
@@ -3874,7 +3874,7 @@ Colocations:
       <locations/>
     </resource>
     <colocations>
-      <colocation peer="gr2" id="colocation-prim8-gr2-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim8-gr2-INFINITY" rsc="prim8" with-rsc="gr2" score="INFINITY"/>
       <locations/>
     </colocations>
   </constraints>
@@ -3905,7 +3905,7 @@ Colocations:
       <locations/>
     </resource>
     <colocations>
-      <colocation peer="clone" id="colocation-prim9-clone-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim9-clone-INFINITY" rsc="prim9" with-rsc="clone" score="INFINITY"/>
       <locations/>
     </colocations>
   </constraints>
@@ -3920,7 +3920,7 @@ Colocations:
       <locations/>
     </resource>
     <colocations>
-      <colocation peer="clone" id="colocation-prim9-clone-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim9-clone-INFINITY" rsc="prim9" with-rsc="clone" score="INFINITY"/>
       <locations/>
     </colocations>
   </constraints>
@@ -3953,7 +3953,7 @@ Colocations:
       <locations/>
     </resource>
     <colocations>
-      <colocation peer="prim4" id="colocation-prim10-prim4-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim10-prim4-INFINITY" rsc="prim10" with-rsc="prim4" score="INFINITY"/>
       <locations>
         <location host="cluster02" id="prim4-on-cluster2" score="INFINITY"/>
       </locations>
@@ -3970,7 +3970,7 @@ Colocations:
       <locations/>
     </resource>
     <colocations>
-      <colocation peer="prim4" id="colocation-prim10-prim4-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim10-prim4-INFINITY" rsc="prim10" with-rsc="prim4" score="INFINITY"/>
       <locations>
         <location host="cluster02" id="prim4-on-cluster2" score="INFINITY"/>
       </locations>
@@ -4006,14 +4006,14 @@ Colocations:
 <pacemaker-result api-version="X" request="crm_resource -a -r prim11 --output-as=xml">
   <constraints>
     <colocations>
-      <colocation peer="prim13" id="colocation-prim13-prim11-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim13-prim11-INFINITY" rsc="prim13" with-rsc="prim11" score="INFINITY"/>
       <locations/>
     </colocations>
     <resource id="prim11">
       <locations/>
     </resource>
     <colocations>
-      <colocation peer="prim12" id="colocation-prim11-prim12-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim11-prim12-INFINITY" rsc="prim11" with-rsc="prim12" score="INFINITY"/>
       <locations/>
     </colocations>
   </constraints>
@@ -4025,14 +4025,14 @@ Colocations:
 <pacemaker-result api-version="X" request="crm_resource -A -r prim11 --output-as=xml">
   <constraints>
     <colocations>
-      <colocation peer="prim13" id="colocation-prim13-prim11-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim13-prim11-INFINITY" rsc="prim13" with-rsc="prim11" score="INFINITY"/>
       <locations/>
     </colocations>
     <resource id="prim11">
       <locations/>
     </resource>
     <colocations>
-      <colocation peer="prim12" id="colocation-prim11-prim12-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim11-prim12-INFINITY" rsc="prim11" with-rsc="prim12" score="INFINITY"/>
       <locations/>
     </colocations>
   </constraints>
@@ -4066,14 +4066,14 @@ Colocations:
 <pacemaker-result api-version="X" request="crm_resource -a -r prim12 --output-as=xml">
   <constraints>
     <colocations>
-      <colocation peer="prim11" id="colocation-prim11-prim12-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim11-prim12-INFINITY" rsc="prim11" with-rsc="prim12" score="INFINITY"/>
       <locations/>
     </colocations>
     <resource id="prim12">
       <locations/>
     </resource>
     <colocations>
-      <colocation peer="prim13" id="colocation-prim12-prim13-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim12-prim13-INFINITY" rsc="prim12" with-rsc="prim13" score="INFINITY"/>
       <locations/>
     </colocations>
   </constraints>
@@ -4085,14 +4085,14 @@ Colocations:
 <pacemaker-result api-version="X" request="crm_resource -A -r prim12 --output-as=xml">
   <constraints>
     <colocations>
-      <colocation peer="prim11" id="colocation-prim11-prim12-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim11-prim12-INFINITY" rsc="prim11" with-rsc="prim12" score="INFINITY"/>
       <locations/>
     </colocations>
     <resource id="prim12">
       <locations/>
     </resource>
     <colocations>
-      <colocation peer="prim13" id="colocation-prim12-prim13-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim12-prim13-INFINITY" rsc="prim12" with-rsc="prim13" score="INFINITY"/>
       <locations/>
     </colocations>
   </constraints>
@@ -4126,14 +4126,14 @@ Colocations:
 <pacemaker-result api-version="X" request="crm_resource -a -r prim13 --output-as=xml">
   <constraints>
     <colocations>
-      <colocation peer="prim12" id="colocation-prim12-prim13-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim12-prim13-INFINITY" rsc="prim12" with-rsc="prim13" score="INFINITY"/>
       <locations/>
     </colocations>
     <resource id="prim13">
       <locations/>
     </resource>
     <colocations>
-      <colocation peer="prim11" id="colocation-prim13-prim11-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim13-prim11-INFINITY" rsc="prim13" with-rsc="prim11" score="INFINITY"/>
       <locations/>
     </colocations>
   </constraints>
@@ -4145,14 +4145,14 @@ Colocations:
 <pacemaker-result api-version="X" request="crm_resource -A -r prim13 --output-as=xml">
   <constraints>
     <colocations>
-      <colocation peer="prim12" id="colocation-prim12-prim13-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim12-prim13-INFINITY" rsc="prim12" with-rsc="prim13" score="INFINITY"/>
       <locations/>
     </colocations>
     <resource id="prim13">
       <locations/>
     </resource>
     <colocations>
-      <colocation peer="prim11" id="colocation-prim13-prim11-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim13-prim11-INFINITY" rsc="prim13" with-rsc="prim11" score="INFINITY"/>
       <locations/>
     </colocations>
   </constraints>
@@ -4180,7 +4180,7 @@ group:
 <pacemaker-result api-version="X" request="crm_resource -a -r group --output-as=xml">
   <constraints>
     <colocations>
-      <colocation peer="prim7" id="colocation-prim7-group-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim7-group-INFINITY" rsc="prim7" with-rsc="group" score="INFINITY"/>
       <locations/>
     </colocations>
     <resource id="group">
@@ -4195,7 +4195,7 @@ group:
 <pacemaker-result api-version="X" request="crm_resource -A -r group --output-as=xml">
   <constraints>
     <colocations>
-      <colocation peer="prim7" id="colocation-prim7-group-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim7-group-INFINITY" rsc="prim7" with-rsc="group" score="INFINITY"/>
       <locations/>
     </colocations>
     <resource id="group">
@@ -4226,7 +4226,7 @@ clone:
 <pacemaker-result api-version="X" request="crm_resource -a -r clone --output-as=xml">
   <constraints>
     <colocations>
-      <colocation peer="prim9" id="colocation-prim9-clone-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim9-clone-INFINITY" rsc="prim9" with-rsc="clone" score="INFINITY"/>
       <locations/>
     </colocations>
     <resource id="clone">
@@ -4241,7 +4241,7 @@ clone:
 <pacemaker-result api-version="X" request="crm_resource -A -r clone --output-as=xml">
   <constraints>
     <colocations>
-      <colocation peer="prim9" id="colocation-prim9-clone-INFINITY" score="INFINITY"/>
+      <rsc_colocation id="colocation-prim9-clone-INFINITY" rsc="prim9" with-rsc="clone" score="INFINITY"/>
       <locations/>
     </colocations>
     <resource id="clone">
diff --git a/lib/pacemaker/pcmk_output.c b/lib/pacemaker/pcmk_output.c
index 8ff3e9d..78171d7 100644
--- a/lib/pacemaker/pcmk_output.c
+++ b/lib/pacemaker/pcmk_output.c
@@ -66,6 +66,35 @@ colocations_header(pe_resource_t *rsc, rsc_colocation_t *cons,
     return retval;
 }
 
+static void
+colocations_xml_node(pcmk__output_t *out, pe_resource_t *rsc,
+                     rsc_colocation_t *cons) {
+    char *score = NULL;
+    xmlNodePtr node = NULL;
+
+    score = score2char(cons->score);
+    node = pcmk__output_create_xml_node(out, XML_CONS_TAG_RSC_DEPEND,
+                                        "id", cons->id,
+                                        "rsc", cons->rsc_lh->id,
+                                        "with-rsc", cons->rsc_rh->id,
+                                        "score", score,
+                                        NULL);
+
+    if (cons->node_attribute) {
+        xmlSetProp(node, (pcmkXmlStr) "node-attribute", (pcmkXmlStr) cons->node_attribute);
+    }
+
+    if (cons->role_lh != RSC_ROLE_UNKNOWN) {
+        xmlSetProp(node, (pcmkXmlStr) "rsc-role", (pcmkXmlStr) role2text(cons->role_lh));
+    }
+
+    if (cons->role_rh != RSC_ROLE_UNKNOWN) {
+        xmlSetProp(node, (pcmkXmlStr) "with-rsc-role", (pcmkXmlStr) role2text(cons->role_rh));
+    }
+
+    free(score);
+}
+
 PCMK__OUTPUT_ARGS("colocations-list", "pe_resource_t *", "gboolean", "gboolean")
 static int colocations_list(pcmk__output_t *out, va_list args) {
     pe_resource_t *rsc = va_arg(args, pe_resource_t *);
@@ -160,7 +189,6 @@ static int colocations_list_xml(pcmk__output_t *out, va_list args) {
     for (lpc = list; lpc != NULL; lpc = lpc->next) {
         rsc_colocation_t *cons = (rsc_colocation_t *) lpc->data;
         pe_resource_t *peer = cons->rsc_rh;
-        char *score = NULL;
 
         if (dependents) {
             peer = cons->rsc_lh;
@@ -195,24 +223,7 @@ static int colocations_list_xml(pcmk__output_t *out, va_list args) {
             printed_header = true;
         }
 
-        score = score2char(cons->score);
-        if (cons->role_rh > RSC_ROLE_STARTED) {
-            pcmk__output_create_xml_node(out, "colocation",
-                                         "peer", peer->id,
-                                         "id", cons->id,
-                                         "score", score,
-                                         "dependents", dependents ? "needs" : "with",
-                                         "role", role2text(cons->role_rh),
-                                         NULL);
-        } else {
-            pcmk__output_create_xml_node(out, "colocation",
-                                         "peer", peer->id,
-                                         "id", cons->id,
-                                         "score", score,
-                                         NULL);
-        }
-
-        free(score);
+        colocations_xml_node(out, peer, cons);
         out->message(out, "locations-list", peer);
 
         if (!dependents && recursive) {