Is the use of decorators solely for nosetests? Are you proposing to place all Infrastructure tests in the same module? I like the way we have things now, where tests are separated into their own modules and you can then specify which tests to run via --tests argument. The **Zen of Python** says, "Explicit if better than Implicit" :)