Getting singleton tests in the right place
Merge pull request #4123 from danmcp/master

Merged by openshift-bot