(bug5197) Make S2 test suite work.
Merge pull request #505 from anall/feature/bug5197

(bug5197) Make S2 test suite work.