[release-21.0] Change upgrade test to still use the older version of tests (#16937)

[release-21.0] Change upgrade test to still use the older version of tests (#16937) #36778