Followup to bug 872701 to fix tests on a CLOSED TREE
Automatic merge