Add test triples to fix win32 failures. Revert workaround from r161292.