[1.7.x] Fixed #22487: Don't flush out data from before normal TestCases