diff --git a/haddock.cabal b/haddock.cabal
index 06a85364077403933c6707bd98bf8fdd3a8ac776..2c102bc0db6e6fb1429f00135f8bd90020816bb2 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -29,9 +29,8 @@ extra-source-files:
   haddock.spec
   haskell.vim
   src/haddock.sh
--- The test files shouldn't have to go here, but the source files for
--- the test-suite stanzas don't get picked up by `cabal sdist`.
-  tests/html-test/run.lhs
+  html-test/src/*.hs
+  html-test/ref/*.html
 
 data-dir:   resources
 data-files: html/frames.html
@@ -199,6 +198,10 @@ test-suite spec
     , test/nanospec
     , src
 
+  other-modules:
+      Test.Hspec
+      Haddock.ParseSpec
+
   build-depends:
       base
     , ghc