Attempt to clean up tests for non-X86 platforms.