Merge pull request #2674 from alex/reduce-duplication

Attempt to reduce the duplication in declaring our test deps