Reformulate conditional from previous commit to prevent weird errors in third-party test projects