Fix testing builds after Bug 1010064