MFC r286620,r286638:

r286620 (by bapt):

Disable broken test until we have time ti actually fix the test

r286638 (by bapt):

Reenable the test.

Sorry I was testing on the wrong branch.