test cleanup regarding to issue #2522
Merge pull request #2580 from gurbuzali/test-cleanup/3.3

test cleanup regarding to issue #2522