Test cleanup recommended in http://reviews.llvm.org/D3556