Provide smoother upgrade path for Test.Hspec.HUnit (see #209)