I know how eager you all are to start replacing mox with mock, so I created a spreadsheet to help us avoid tripping over each other in our enthusiasm to get it done: https://ethercalc.openstack.org/heat-mox-removal Please add links to your patches in there as you create them. This will help us to ensure that we only convert each file once :) It's also a useful resource for seeing what needs reviews. Alternatively, so is this Gerrit query: https://review.openstack.org/#/q/status:open+project:openstack/heat+branch:master+intopic:%22%255Emox%255B-_%255Dremoval%22 Happy mocking. cheers, Zane.