Follows on from !20735 (merged) and !20939 (merged)
To fix TrigUpgradeTests CI
TrigUpgradeTests
cc @wleight
cc @markowen, @nakahama