diff --git a/crm/pengine/regression.sh b/crm/pengine/regression.sh
index 7c698eae9b..748264d7c7 100755
--- a/crm/pengine/regression.sh
+++ b/crm/pengine/regression.sh
@@ -1,258 +1,259 @@
 #!/bin/bash
 
  # Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
  # 
  # This program is free software; you can redistribute it and/or
  # modify it under the terms of the GNU General Public
  # License as published by the Free Software Foundation; either
  # version 2.1 of the License, or (at your option) any later version.
  # 
  # This software is distributed in the hope that it will be useful,
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  # General Public License for more details.
  # 
  # You should have received a copy of the GNU General Public
  # License along with this library; if not, write to the Free Software
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  #
 if [ -x /usr/bin/valgrind ]; then
     export G_SLICE=always-malloc
     VALGRIND_CMD="valgrind -q --show-reachable=yes --leak-check=full --trace-children=no --time-stamp=yes --num-callers=20 --suppressions=./ptest.supp"
 fi
 
 . regression.core.sh
 create_mode="true"
 echo Generating test outputs for these tests...
 echo Done.
 echo ""
 
 echo Performing the following tests...
 create_mode="false"
 
 echo ""
 do_test simple1 "Offline     "
 do_test simple2 "Start       "
 do_test simple3 "Start 2     "
 do_test simple4 "Start Failed"
 do_test simple6 "Stop Start  "
 do_test simple7 "Shutdown    "
 #do_test simple8 "Stonith	"
 #do_test simple9 "Lower version"
 #do_test simple10 "Higher version"
 do_test simple11 "Priority (ne)"
 do_test simple12 "Priority (eq)"
 do_test simple8 "Stickiness"
 
 echo ""
 do_test params-0 "Params: No change"
 do_test params-1 "Params: Changed"
 do_test params-2 "Params: Resource definition"
 do_test params-4 "Params: Reload"
 do_test novell-251689 "Resource definition change + target_role=stopped"
 
 echo ""
 do_test orphan-0 "Orphan ignore"
 do_test orphan-1 "Orphan stop"
 
 echo ""
 do_test target-0 "Target Role : baseline"
 do_test target-1 "Target Role : test"
 
 echo ""
 do_test date-1 "Dates" -d "2005-020"
 do_test date-2 "Date Spec - Pass" -d "2005-020T12:30"
 do_test date-3 "Date Spec - Fail" -d "2005-020T11:30"
 do_test probe-0 "Probe (anon clone)"
 do_test probe-1 "Pending Probe"
 do_test standby "Standby"
 do_test comments "Comments"
 
 echo ""
 do_test rsc_dep1 "Must not     "
 do_test rsc_dep3 "Must         "
 do_test rsc_dep5 "Must not 3   "
 do_test rsc_dep7 "Must 3       "
 do_test rsc_dep10 "Must (but cant)"
 do_test rsc_dep2  "Must (running) "
 do_test rsc_dep8  "Must (running : alt) "
 do_test rsc_dep4  "Must (running + move)"
 
 echo ""
 do_test order1 "Order start 1     "
 do_test order2 "Order start 2     "
 do_test order3 "Order stop	  "
 do_test order4 "Order (multiple)  "
 do_test order5 "Order (move)  "
 do_test order6 "Order (move w/ restart)  "
 do_test order7 "Order (manditory)  "
 
 echo ""
 do_test coloc-loop "Colocation - loop"
 do_test coloc-many-one "Colocation - many-to-one"
 do_test coloc-list "Colocation - many-to-one with list"
+do_test coloc-group "Colocation - groups"
 
 #echo ""
 #do_test agent1 "version: lt (empty)"
 #do_test agent2 "version: eq	"
 #do_test agent3 "version: gt	"
 
 echo ""
 do_test attrs1 "string: eq (and)     "
 do_test attrs2 "string: lt / gt (and)"
 do_test attrs3 "string: ne (or)      "
 do_test attrs4 "string: exists       "
 do_test attrs5 "string: not_exists   "
 do_test attrs6 "is_dc: true          "
 do_test attrs7 "is_dc: false         "
 do_test attrs8 "score_attribute      "
 
 echo ""
 do_test mon-rsc-1 "Schedule Monitor - start"
 do_test mon-rsc-2 "Schedule Monitor - move "
 do_test mon-rsc-3 "Schedule Monitor - pending start     "
 do_test mon-rsc-4 "Schedule Monitor - move/pending start"
 
 echo ""
 do_test rec-rsc-0 "Resource Recover - no start     "
 do_test rec-rsc-1 "Resource Recover - start        "
 do_test rec-rsc-2 "Resource Recover - monitor      "
 do_test rec-rsc-3 "Resource Recover - stop - ignore"
 do_test rec-rsc-4 "Resource Recover - stop - block "
 do_test rec-rsc-5 "Resource Recover - stop - fence "
 do_test rec-rsc-6 "Resource Recover - multiple - restart"
 do_test rec-rsc-7 "Resource Recover - multiple - stop   "
 do_test rec-rsc-8 "Resource Recover - multiple - block  "
 do_test rec-rsc-9 "Resource Recover - group/group"
 
 echo ""
 do_test quorum-1 "No quorum - ignore"
 do_test quorum-2 "No quorum - freeze"
 do_test quorum-3 "No quorum - stop  "
 do_test quorum-4 "No quorum - start anyway"
 do_test quorum-5 "No quorum - start anyway (group)"
 do_test quorum-6 "No quorum - start anyway (clone)"
 
 echo ""
 do_test rec-node-1 "Node Recover - Startup   - no fence"
 do_test rec-node-2 "Node Recover - Startup   - fence   "
 do_test rec-node-3 "Node Recover - HA down   - no fence"
 do_test rec-node-4 "Node Recover - HA down   - fence   "
 do_test rec-node-5 "Node Recover - CRM down  - no fence"
 do_test rec-node-6 "Node Recover - CRM down  - fence   "
 do_test rec-node-7 "Node Recover - no quorum - ignore  "
 do_test rec-node-8 "Node Recover - no quorum - freeze  "
 do_test rec-node-9 "Node Recover - no quorum - stop    "
 do_test rec-node-10 "Node Recover - no quorum - stop w/fence"
 do_test rec-node-11 "Node Recover - CRM down w/ group - fence   "
 do_test rec-node-12 "Node Recover - nothing active - fence   "
 do_test rec-node-13 "Node Recover - failed resource + shutdown - fence   "
 do_test rec-node-15 "Node Recover - unknown lrm section"
 do_test rec-node-14 "Serialize all stonith's"
 
 echo ""
 do_test multi1 "Multiple Active (stop/start)"
 
 echo ""
 do_test migrate-1 "Migrate (migrate)"
 do_test migrate-2 "Migrate (stable)"
 do_test migrate-3 "Migrate (failed migrate_to)"
 do_test migrate-4 "Migrate (failed migrate_from)"
 do_test novell-252693 "Migration in a stopping stack"
 do_test novell-252693-2 "Migration in a starting stack"
 do_test novell-252693-3 "Non-Migration in a starting and stopping stack"
 
 #echo ""
 #do_test complex1 "Complex	"
 
 echo ""
 do_test group1 "Group		"
 do_test group2 "Group + Native	"
 do_test group3 "Group + Group	"
 do_test group4 "Group + Native (nothing)"
 do_test group5 "Group + Native (move)   "
 do_test group6 "Group + Group (move)    "
 do_test group7 "Group colocation"
 do_test group13 "Group colocation (cant run)"
 do_test group8 "Group anti-colocation"
 do_test group9 "Group recovery"
 do_test group10 "Group partial recovery"
 do_test group11 "Group target_role"
 do_test group14 "Group stop (graph terminated)"
 do_test group15 "-ve group colocation"
 do_test bug-1573 "Partial stop of a group with two children"
 
 echo ""
 do_test inc0 "Incarnation start" 
 do_test inc1 "Incarnation start order" 
 do_test inc2 "Incarnation silent restart, stop, move"
 do_test inc3 "Inter-incarnation ordering, silent restart, stop, move"
 do_test inc4 "Inter-incarnation ordering, silent restart, stop, move (ordered)"
 do_test inc5 "Inter-incarnation ordering, silent restart, stop, move (restart 1)"
 do_test inc6 "Inter-incarnation ordering, silent restart, stop, move (restart 2)"
 do_test inc7 "Clone colocation"
 do_test inc8 "Clone anti-colocation"
 do_test inc9 "Non-unique clone"
 do_test inc10 "Non-unique clone (stop)"
 do_test inc11 "Primitive colocation with clones" 
 do_test inc12 "Clone shutdown" 
 
 echo ""
 do_test master-0 "Stopped -> Slave"
 do_test master-1 "Stopped -> Promote"
 do_test master-2 "Stopped -> Promote : notify"
 do_test master-3 "Stopped -> Promote : master location"
 do_test master-4 "Started -> Promote : master location"
 do_test master-5 "Promoted -> Promoted"
 do_test master-6 "Promoted -> Promoted (2)"
 do_test master-7 "Promoted -> Fenced"
 do_test master-8 "Promoted -> Fenced -> Moved"
 do_test master-9 "Stopped + Promotable + No quorum"
 do_test master-10 "Stopped -> Promotable : notify with monitor"
 do_test master-11 "Stopped -> Promote : colocation"
 do_test novell-239082 "Demote/Promote ordering"
 do_test novell-239087 "Stable master placement"
 do_test master-12 "Promotion based solely on rsc_location constraints"
 
 echo ""
 do_test managed-0 "Managed (reference)"
 do_test managed-1 "Not managed - down "
 do_test managed-2 "Not managed - up   "
 
 echo ""
 do_test interleave-0 "Interleave (reference)"
 do_test interleave-1 "coloc - not interleaved"
 do_test interleave-2 "coloc - interleaved   "
 do_test interleave-3 "coloc - interleaved (2)"
 
 echo ""
 do_test notify-0 "Notify reference"
 do_test notify-1 "Notify simple"
 do_test notify-2 "Notify simple, confirm"
 do_test notify-3 "Notify move, confirm"
 do_test novell-239079 "Notification priority"
 #do_test notify-2 "Notify - 764"
 
 echo ""
 do_test 594 "OSDL #594"
 do_test 662 "OSDL #662"
 do_test 696 "OSDL #696"
 do_test 726 "OSDL #726"
 do_test 735 "OSDL #735"
 do_test 764 "OSDL #764"
 do_test 797 "OSDL #797"
 do_test 829 "OSDL #829"
 do_test 994 "OSDL #994"
 do_test 1360 "OSDL #1360 - Clone stickiness"
 do_test 1484 "OSDL #1484 - on_fail=stop"
 do_test 1494 "OSDL #1494 - Clone stability"
 do_test unrunnable-1 "Unrunnable"
 do_test stonith-0 "Stonith loop - 1"
 do_test stonith-1 "Stonith loop - 2"
 do_test bug-1572-1 "Recovery of groups depending on master/slave"
 do_test bug-1572-2 "Recovery of groups depending on master/slave when the master is never re-promoted"
 do_test bug-1685 "Depends-on-master ordering"
 
 echo ""
 
 test_results
diff --git a/crm/pengine/testcases/coloc-group.dot b/crm/pengine/testcases/coloc-group.dot
new file mode 100644
index 0000000000..f3562e2088
--- /dev/null
+++ b/crm/pengine/testcases/coloc-group.dot
@@ -0,0 +1,42 @@
+digraph "g" {
+"group1_running_0" [ style=bold color="green" fontcolor="orange"  ]
+"group1_start_0" -> "group1_running_0" [ style = bold]
+"group1_start_0" -> "rsc2_start_0 node2" [ style = bold]
+"group1_start_0" [ style=bold color="green" fontcolor="orange"  ]
+"probe_complete node1" -> "probe_complete" [ style = bold]
+"probe_complete node1" [ style=bold color="green" fontcolor="black"  ]
+"probe_complete node2" -> "probe_complete" [ style = bold]
+"probe_complete node2" [ style=bold color="green" fontcolor="black"  ]
+"probe_complete node3" -> "probe_complete" [ style = bold]
+"probe_complete node3" [ style=bold color="green" fontcolor="black"  ]
+"probe_complete" -> "group1_start_0" [ style = bold]
+"probe_complete" -> "rsc1_start_0 node2" [ style = bold]
+"probe_complete" [ style=bold color="green" fontcolor="orange"  ]
+"rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold]
+"rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black"  ]
+"rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
+"rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black"  ]
+"rsc1_monitor_0 node3" -> "probe_complete node3" [ style = bold]
+"rsc1_monitor_0 node3" [ style=bold color="green" fontcolor="black"  ]
+"rsc1_start_0 node2" [ style=bold color="green" fontcolor="black"  ]
+"rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold]
+"rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black"  ]
+"rsc2_start_0 node2" -> "group1_running_0" [ style = bold]
+"rsc2_start_0 node2" -> "rsc3_start_0 <none>" [ style = dashed]
+"rsc2_start_0 node2" [ style=bold color="green" fontcolor="black"  ]
+"rsc3_monitor_0 node1" -> "probe_complete node1" [ style = bold]
+"rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black"  ]
+"rsc3_monitor_0 node3" -> "probe_complete node3" [ style = bold]
+"rsc3_monitor_0 node3" [ style=bold color="green" fontcolor="black"  ]
+"rsc3_start_0 <none>" -> "group1_running_0" [ style = dashed]
+"rsc3_start_0 <none>" -> "rsc4_start_0 <none>" [ style = dashed]
+"rsc3_start_0 <none>" [ style=dashed color="red" fontcolor="black"  ]
+"rsc4_monitor_0 node1" -> "probe_complete node1" [ style = bold]
+"rsc4_monitor_0 node1" [ style=bold color="green" fontcolor="black"  ]
+"rsc4_monitor_0 node2" -> "probe_complete node2" [ style = bold]
+"rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black"  ]
+"rsc4_monitor_0 node3" -> "probe_complete node3" [ style = bold]
+"rsc4_monitor_0 node3" [ style=bold color="green" fontcolor="black"  ]
+"rsc4_start_0 <none>" -> "group1_running_0" [ style = dashed]
+"rsc4_start_0 <none>" [ style=dashed color="red" fontcolor="black"  ]
+}
diff --git a/crm/pengine/testcases/coloc-group.exp b/crm/pengine/testcases/coloc-group.exp
new file mode 100644
index 0000000000..276d16aa02
--- /dev/null
+++ b/crm/pengine/testcases/coloc-group.exp
@@ -0,0 +1,209 @@
+ <transition_graph cluster-delay="60s" transition_id="0">
+   <synapse id="0">
+     <action_set>
+       <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1">
+         <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
+         <attributes crm_feature_set="2.0" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
+       </rsc_op>
+     </action_set>
+     <inputs/>
+   </synapse>
+   <synapse id="1">
+     <action_set>
+       <rsc_op id="7" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2">
+         <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
+         <attributes crm_feature_set="2.0" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
+       </rsc_op>
+     </action_set>
+     <inputs/>
+   </synapse>
+   <synapse id="2">
+     <action_set>
+       <rsc_op id="11" operation="monitor" operation_key="rsc1_monitor_0" on_node="node3" on_node_uuid="node3">
+         <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
+         <attributes crm_feature_set="2.0" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
+       </rsc_op>
+     </action_set>
+     <inputs/>
+   </synapse>
+   <synapse id="3">
+     <action_set>
+       <rsc_op id="15" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="node2">
+         <primitive id="rsc1" long-id="rsc1" class="heartbeat" type="apache"/>
+         <attributes crm_feature_set="2.0" CRM_meta_timeout="20000"/>
+       </rsc_op>
+     </action_set>
+     <inputs>
+       <trigger>
+         <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
+       </trigger>
+     </inputs>
+   </synapse>
+   <synapse id="4">
+     <action_set>
+       <pseudo_event id="17" operation="start" operation_key="group1_start_0">
+         <attributes crm_feature_set="2.0" CRM_meta_timeout="20000"/>
+       </pseudo_event>
+     </action_set>
+     <inputs>
+       <trigger>
+         <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete"/>
+       </trigger>
+     </inputs>
+   </synapse>
+   <synapse id="5">
+     <action_set>
+       <pseudo_event id="18" operation="running" operation_key="group1_running_0">
+         <attributes crm_feature_set="2.0" CRM_meta_timeout="20000"/>
+       </pseudo_event>
+     </action_set>
+     <inputs>
+       <trigger>
+         <rsc_op id="16" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="node2"/>
+       </trigger>
+       <trigger>
+         <pseudo_event id="17" operation="start" operation_key="group1_start_0"/>
+       </trigger>
+     </inputs>
+   </synapse>
+   <synapse id="6">
+     <action_set>
+       <rsc_op id="8" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2">
+         <primitive id="rsc2" long-id="group1:rsc2" class="heartbeat" type="apache"/>
+         <attributes crm_feature_set="2.0" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
+       </rsc_op>
+     </action_set>
+     <inputs/>
+   </synapse>
+   <synapse id="7">
+     <action_set>
+       <rsc_op id="16" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="node2">
+         <primitive id="rsc2" long-id="group1:rsc2" class="heartbeat" type="apache"/>
+         <attributes crm_feature_set="2.0" CRM_meta_timeout="20000"/>
+       </rsc_op>
+     </action_set>
+     <inputs>
+       <trigger>
+         <pseudo_event id="17" operation="start" operation_key="group1_start_0"/>
+       </trigger>
+     </inputs>
+   </synapse>
+   <synapse id="8">
+     <action_set>
+       <rsc_op id="4" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1">
+         <primitive id="rsc3" long-id="group1:rsc3" class="heartbeat" type="apache"/>
+         <attributes crm_feature_set="2.0" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
+       </rsc_op>
+     </action_set>
+     <inputs/>
+   </synapse>
+   <synapse id="9">
+     <action_set>
+       <rsc_op id="12" operation="monitor" operation_key="rsc3_monitor_0" on_node="node3" on_node_uuid="node3">
+         <primitive id="rsc3" long-id="group1:rsc3" class="heartbeat" type="apache"/>
+         <attributes crm_feature_set="2.0" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
+       </rsc_op>
+     </action_set>
+     <inputs/>
+   </synapse>
+   <synapse id="10">
+     <action_set>
+       <rsc_op id="5" operation="monitor" operation_key="rsc4_monitor_0" on_node="node1" on_node_uuid="node1">
+         <primitive id="rsc4" long-id="group1:rsc4" class="heartbeat" type="apache"/>
+         <attributes crm_feature_set="2.0" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
+       </rsc_op>
+     </action_set>
+     <inputs/>
+   </synapse>
+   <synapse id="11">
+     <action_set>
+       <rsc_op id="9" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="node2">
+         <primitive id="rsc4" long-id="group1:rsc4" class="heartbeat" type="apache"/>
+         <attributes crm_feature_set="2.0" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
+       </rsc_op>
+     </action_set>
+     <inputs/>
+   </synapse>
+   <synapse id="12">
+     <action_set>
+       <rsc_op id="13" operation="monitor" operation_key="rsc4_monitor_0" on_node="node3" on_node_uuid="node3">
+         <primitive id="rsc4" long-id="group1:rsc4" class="heartbeat" type="apache"/>
+         <attributes crm_feature_set="2.0" CRM_meta_timeout="20000" CRM_meta_op_target_rc="7"/>
+       </rsc_op>
+     </action_set>
+     <inputs/>
+   </synapse>
+   <synapse id="13">
+     <action_set>
+       <pseudo_event id="1" operation="probe_complete" operation_key="probe_complete">
+         <attributes crm_feature_set="2.0"/>
+       </pseudo_event>
+     </action_set>
+     <inputs>
+       <trigger>
+         <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3"/>
+       </trigger>
+     </inputs>
+   </synapse>
+   <synapse id="14" priority="1000000">
+     <action_set>
+       <rsc_op id="2" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+         <attributes crm_feature_set="2.0" CRM_meta_op_no_wait="true"/>
+       </rsc_op>
+     </action_set>
+     <inputs>
+       <trigger>
+         <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="node1"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="4" operation="monitor" operation_key="rsc3_monitor_0" on_node="node1" on_node_uuid="node1"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="5" operation="monitor" operation_key="rsc4_monitor_0" on_node="node1" on_node_uuid="node1"/>
+       </trigger>
+     </inputs>
+   </synapse>
+   <synapse id="15" priority="1000000">
+     <action_set>
+       <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+         <attributes crm_feature_set="2.0" CRM_meta_op_no_wait="true"/>
+       </rsc_op>
+     </action_set>
+     <inputs>
+       <trigger>
+         <rsc_op id="7" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="8" operation="monitor" operation_key="rsc2_monitor_0" on_node="node2" on_node_uuid="node2"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="9" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="node2"/>
+       </trigger>
+     </inputs>
+   </synapse>
+   <synapse id="16" priority="1000000">
+     <action_set>
+       <rsc_op id="10" operation="probe_complete" operation_key="probe_complete" on_node="node3" on_node_uuid="node3">
+         <attributes crm_feature_set="2.0" CRM_meta_op_no_wait="true"/>
+       </rsc_op>
+     </action_set>
+     <inputs>
+       <trigger>
+         <rsc_op id="11" operation="monitor" operation_key="rsc1_monitor_0" on_node="node3" on_node_uuid="node3"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="12" operation="monitor" operation_key="rsc3_monitor_0" on_node="node3" on_node_uuid="node3"/>
+       </trigger>
+       <trigger>
+         <rsc_op id="13" operation="monitor" operation_key="rsc4_monitor_0" on_node="node3" on_node_uuid="node3"/>
+       </trigger>
+     </inputs>
+   </synapse>
+ </transition_graph>
+
diff --git a/crm/pengine/testcases/coloc-group.xml b/crm/pengine/testcases/coloc-group.xml
new file mode 100644
index 0000000000..3fa13bcf6b
--- /dev/null
+++ b/crm/pengine/testcases/coloc-group.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!DOCTYPE cib SYSTEM "crm-1.0.dtd">
+<!-- shutdown -->
+<cib num_updates="1" epoch="1" admin_epoch="0">
+  <configuration>
+    <crm_config><cluster_property_set id="cib-bootstrap-options"><attributes>
+      <nvpair id="no_quorum_policy" name="no_quorum_policy" value="ignore"/>
+      <nvpair id="symmetric_cluster" name="symmetric_cluster" value="true"/>
+      <nvpair id="default_resource_failcount" name="default-resource-failure-stickiness" value="-INFINITY"/>
+    </attributes></cluster_property_set></crm_config>
+    <nodes>
+      <node id="node1" uname="node1" type="member"/>
+      <node id="node2" uname="node2" type="member"/>
+      <node id="node3" uname="node3" type="member"/>
+    </nodes>
+    <resources>
+      <primitive id="rsc1" class="heartbeat" type="apache"/>
+      <group id="group1"> 
+	<primitive id="rsc2" class="heartbeat" type="apache"/>
+	<primitive id="rsc3" class="heartbeat" type="apache"/>
+	<primitive id="rsc4" class="heartbeat" type="apache"/>
+      </group>
+    </resources>
+    <constraints>
+      <rsc_colocation id="colo-g-1" from="group1" to="rsc1" score="INFINITY"/>
+    </constraints>
+  </configuration>
+  <status>
+    <node_state id="node1" ha="active" uname="node1" crmd="online" join="member" expected="member" in_ccm="true">
+       <transient_attributes id="node1">
+         <instance_attributes id="status-node1">
+           <attributes>
+             <nvpair id="status-node1-fail-count-rsc2" name="fail-count-rsc2" value="1"/>
+           </attributes>
+         </instance_attributes>
+       </transient_attributes>
+       <lrm id="node1">
+         <lrm_resources>
+           <lrm_resource id="rsc2" type="apache" class="heartbeat" provider="heartbeat">
+             <lrm_rsc_op id="rsc2_monitor_0" operation="monitor" transition_key="18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" transition_magic="0:7;18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" call_id="2" crm_feature_set="2.0" rc_code="7" op_status="0" interval="0" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+           </lrm_resource>
+         </lrm_resources>
+       </lrm>
+    </node_state>
+    <node_state id="node2" ha="active" uname="node2" crmd="online" join="member" expected="member" in_ccm="true">
+       <transient_attributes id="node2">
+         <instance_attributes id="status-node2">
+           <attributes>
+             <nvpair id="status-node2-fail-count-rsc3" name="fail-count-rsc3" value="1"/>
+           </attributes>
+         </instance_attributes>
+       </transient_attributes>
+       <lrm id="node2">
+         <lrm_resources>
+           <lrm_resource id="rsc3" type="apache" class="heartbeat" provider="heartbeat">
+             <lrm_rsc_op id="rsc3_monitor_0" operation="monitor" transition_key="18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" transition_magic="0:7;18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" call_id="2" crm_feature_set="2.0" rc_code="7" op_status="0" interval="0" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+           </lrm_resource>
+         </lrm_resources>
+       </lrm>
+    </node_state>
+    <node_state id="node3" ha="active" uname="node3" crmd="online" join="member" expected="member" in_ccm="true">
+       <transient_attributes id="node3">
+         <instance_attributes id="status-node3">
+           <attributes>
+             <nvpair id="status-node3-fail-count-rsc4" name="fail-count-rsc2" value="1"/>
+           </attributes>
+         </instance_attributes>
+       </transient_attributes>
+       <lrm id="node3">
+         <lrm_resources>
+           <lrm_resource id="rsc2" type="apache" class="heartbeat" provider="heartbeat">
+             <lrm_rsc_op id="rsc2_monitor_0" operation="monitor" transition_key="18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" transition_magic="0:7;18:0:3cfbe2a6-650a-440f-b02d-efd4d0021da4" call_id="2" crm_feature_set="2.0" rc_code="7" op_status="0" interval="0" op_digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+           </lrm_resource>
+         </lrm_resources>
+       </lrm>
+    </node_state>
+  </status>
+</cib>