Hi, Instance shelving is broken in stable/havana, the instance that will be unshelved is not the one that has been shelved. A bug was filled here https://bugs.launchpad.net/nova/+bug/1257594 and a patch was merged in Icehouse. I'd like to write a Tempest test to prevent this bug from happening again but in order to do this, I need the patch to be backported in stable/havana. A backport was proposed here : https://review.openstack.org/81214 It needs one more +2. Maybe you could help :) Thanks a lot ! Jordan