Need to match specific minor version. Upstream changes too much each time.
Take care of remaining test failures.