Covers all test subdirs and is cleaner than isolating invididual tests.
Separate commit:
Remove obsolete individual test case conditionals
Not necessary after preceding commit 90775e4b.
This reverts commit 0ee3cb9ff15c8c736ec4d4ead8f00f74d5043d26.