Merge pull request #8672 from haskell/issue-8401-cabal-tests-help