Bug 941484 - [System2] Fix bootstrap test ordering