These tests were fixed in master by HHH-10693 Closed , but was not backported to 5.1 branch at that time.