59 files changed, 2 insertions, 2 deletions
diff --git a/html-test/README b/html-test/README
index d261888c..b5fff14b 100644
--- a/html-test/README
+++ b/html-test/README
@@ -3,7 +3,7 @@ is, it compares output files against a set of reference files.
 
 To add a new test: 
 
- 1) Create a module in the "tests" directory.
+ 1) Create a module in the "html-test/src" directory.
 
  2) Run "cabal test". You should now have output/<modulename>.html. The test
     passes since there is no reference file to compare with.
diff --git a/html-test/run.lhs b/html-test/run.lhs
index c8671a76..c543e020 100755
--- a/html-test/run.lhs
+++ b/html-test/run.lhs
@@ -25,7 +25,7 @@ import System.Process (ProcessHandle, runProcess, waitForProcess)
 
 packageRoot, dataDir, haddockPath, baseDir, testDir, outDir :: FilePath
 baseDir = takeDirectory __FILE__
-testDir       = baseDir </> "tests"
+testDir       = baseDir </> "src"
 refDir        = baseDir </> "ref"
 outDir        = baseDir </> "output"
 packageRoot   = baseDir </> ".."
diff --git a/html-test/tests/A.hs b/html-test/src/A.hs
index 606b0865..606b0865 100644
--- a/html-test/tests/A.hs
+++ b/html-test/src/A.hs
diff --git a/html-test/tests/AdvanceTypes.hs b/html-test/src/AdvanceTypes.hs
index 939fdf07..939fdf07 100644
--- a/html-test/tests/AdvanceTypes.hs
+++ b/html-test/src/AdvanceTypes.hs
diff --git a/html-test/tests/B.hs b/html-test/src/B.hs
index 5fd69acd..5fd69acd 100644
--- a/html-test/tests/B.hs
+++ b/html-test/src/B.hs
diff --git a/html-test/tests/Bug1.hs b/html-test/src/Bug1.hs
index af1ed4d3..af1ed4d3 100644
--- a/html-test/tests/Bug1.hs
+++ b/html-test/src/Bug1.hs
diff --git a/html-test/tests/Bug2.hs b/html-test/src/Bug2.hs
index 9121922e..9121922e 100644
--- a/html-test/tests/Bug2.hs
+++ b/html-test/src/Bug2.hs
diff --git a/html-test/tests/Bug3.hs b/html-test/src/Bug3.hs
index 67e57892..67e57892 100644
--- a/html-test/tests/Bug3.hs
+++ b/html-test/src/Bug3.hs
diff --git a/html-test/tests/Bug4.hs b/html-test/src/Bug4.hs
index 425a77aa..425a77aa 100644
--- a/html-test/tests/Bug4.hs
+++ b/html-test/src/Bug4.hs
diff --git a/html-test/tests/Bug6.hs b/html-test/src/Bug6.hs
index 17411f31..17411f31 100644
--- a/html-test/tests/Bug6.hs
+++ b/html-test/src/Bug6.hs
diff --git a/html-test/tests/Bug7.hs b/html-test/src/Bug7.hs
index 8cf57914..8cf57914 100644
--- a/html-test/tests/Bug7.hs
+++ b/html-test/src/Bug7.hs
diff --git a/html-test/tests/Bug8.hs b/html-test/src/Bug8.hs
index 18df63c8..18df63c8 100644
--- a/html-test/tests/Bug8.hs
+++ b/html-test/src/Bug8.hs
diff --git a/html-test/tests/BugDeprecated.hs b/html-test/src/BugDeprecated.hs
index 0f7ac2eb..0f7ac2eb 100644
--- a/html-test/tests/BugDeprecated.hs
+++ b/html-test/src/BugDeprecated.hs
diff --git a/html-test/tests/BugExportHeadings.hs b/html-test/src/BugExportHeadings.hs
index a5493a08..a5493a08 100644
--- a/html-test/tests/BugExportHeadings.hs
+++ b/html-test/src/BugExportHeadings.hs
diff --git a/html-test/tests/Bugs.hs b/html-test/src/Bugs.hs
index 8e1f0079..8e1f0079 100644
--- a/html-test/tests/Bugs.hs
+++ b/html-test/src/Bugs.hs
diff --git a/html-test/tests/CrossPackageDocs.hs b/html-test/src/CrossPackageDocs.hs
index 4d529f79..4d529f79 100644
--- a/html-test/tests/CrossPackageDocs.hs
+++ b/html-test/src/CrossPackageDocs.hs
diff --git a/html-test/tests/DeprecatedClass.hs b/html-test/src/DeprecatedClass.hs
index 018904ab..018904ab 100644
--- a/html-test/tests/DeprecatedClass.hs
+++ b/html-test/src/DeprecatedClass.hs
diff --git a/html-test/tests/DeprecatedData.hs b/html-test/src/DeprecatedData.hs
index c40ba122..c40ba122 100644
--- a/html-test/tests/DeprecatedData.hs
+++ b/html-test/src/DeprecatedData.hs
diff --git a/html-test/tests/DeprecatedFunction.hs b/html-test/src/DeprecatedFunction.hs
index 8d626435..8d626435 100644
--- a/html-test/tests/DeprecatedFunction.hs
+++ b/html-test/src/DeprecatedFunction.hs
diff --git a/html-test/tests/DeprecatedFunction2.hs b/html-test/src/DeprecatedFunction2.hs
index bdbbf95c..bdbbf95c 100644
--- a/html-test/tests/DeprecatedFunction2.hs
+++ b/html-test/src/DeprecatedFunction2.hs
diff --git a/html-test/tests/DeprecatedFunction3.hs b/html-test/src/DeprecatedFunction3.hs
index ca719bda..ca719bda 100644
--- a/html-test/tests/DeprecatedFunction3.hs
+++ b/html-test/src/DeprecatedFunction3.hs
diff --git a/html-test/tests/DeprecatedModule.hs b/html-test/src/DeprecatedModule.hs
index 369dba4f..369dba4f 100644
--- a/html-test/tests/DeprecatedModule.hs
+++ b/html-test/src/DeprecatedModule.hs
diff --git a/html-test/tests/DeprecatedModule2.hs b/html-test/src/DeprecatedModule2.hs
index 94185297..94185297 100644
--- a/html-test/tests/DeprecatedModule2.hs
+++ b/html-test/src/DeprecatedModule2.hs
diff --git a/html-test/tests/DeprecatedNewtype.hs b/html-test/src/DeprecatedNewtype.hs
index 254f1f55..254f1f55 100644
--- a/html-test/tests/DeprecatedNewtype.hs
+++ b/html-test/src/DeprecatedNewtype.hs
diff --git a/html-test/tests/DeprecatedReExport.hs b/html-test/src/DeprecatedReExport.hs
index f851e2ff..f851e2ff 100644
--- a/html-test/tests/DeprecatedReExport.hs
+++ b/html-test/src/DeprecatedReExport.hs
diff --git a/html-test/tests/DeprecatedRecord.hs b/html-test/src/DeprecatedRecord.hs
index d44499e7..d44499e7 100644
--- a/html-test/tests/DeprecatedRecord.hs
+++ b/html-test/src/DeprecatedRecord.hs
diff --git a/html-test/tests/DeprecatedTypeFamily.hs b/html-test/src/DeprecatedTypeFamily.hs
index 70473bb8..70473bb8 100644
--- a/html-test/tests/DeprecatedTypeFamily.hs
+++ b/html-test/src/DeprecatedTypeFamily.hs
diff --git a/html-test/tests/DeprecatedTypeSynonym.hs b/html-test/src/DeprecatedTypeSynonym.hs
index 34df47da..34df47da 100644
--- a/html-test/tests/DeprecatedTypeSynonym.hs
+++ b/html-test/src/DeprecatedTypeSynonym.hs
diff --git a/html-test/tests/DeprecationMessageParseError.hs b/html-test/src/DeprecationMessageParseError.hs
index 2f8fb492..2f8fb492 100644
--- a/html-test/tests/DeprecationMessageParseError.hs
+++ b/html-test/src/DeprecationMessageParseError.hs
diff --git a/html-test/tests/Examples.hs b/html-test/src/Examples.hs
index c8c450f1..c8c450f1 100644
--- a/html-test/tests/Examples.hs
+++ b/html-test/src/Examples.hs
diff --git a/html-test/tests/FunArgs.hs b/html-test/src/FunArgs.hs
index b34d84b7..b34d84b7 100644
--- a/html-test/tests/FunArgs.hs
+++ b/html-test/src/FunArgs.hs
diff --git a/html-test/tests/GADTRecords.hs b/html-test/src/GADTRecords.hs
index c77810ad..c77810ad 100644
--- a/html-test/tests/GADTRecords.hs
+++ b/html-test/src/GADTRecords.hs
diff --git a/html-test/tests/Hash.hs b/html-test/src/Hash.hs
index 343b69e9..343b69e9 100644
--- a/html-test/tests/Hash.hs
+++ b/html-test/src/Hash.hs
diff --git a/html-test/tests/Hidden.hs b/html-test/src/Hidden.hs
index 896da648..896da648 100644
--- a/html-test/tests/Hidden.hs
+++ b/html-test/src/Hidden.hs
diff --git a/html-test/tests/HiddenInstances.hs b/html-test/src/HiddenInstances.hs
index 99a6c2fd..99a6c2fd 100644
--- a/html-test/tests/HiddenInstances.hs
+++ b/html-test/src/HiddenInstances.hs
diff --git a/html-test/tests/HiddenInstancesA.hs b/html-test/src/HiddenInstancesA.hs
index f1775208..f1775208 100644
--- a/html-test/tests/HiddenInstancesA.hs
+++ b/html-test/src/HiddenInstancesA.hs
diff --git a/html-test/tests/HiddenInstancesB.hs b/html-test/src/HiddenInstancesB.hs
index eabf0637..eabf0637 100644
--- a/html-test/tests/HiddenInstancesB.hs
+++ b/html-test/src/HiddenInstancesB.hs
diff --git a/html-test/tests/Hyperlinks.hs b/html-test/src/Hyperlinks.hs
index 34e64448..34e64448 100644
--- a/html-test/tests/Hyperlinks.hs
+++ b/html-test/src/Hyperlinks.hs
diff --git a/html-test/tests/IgnoreExports.hs b/html-test/src/IgnoreExports.hs
index 0321ad02..0321ad02 100644
--- a/html-test/tests/IgnoreExports.hs
+++ b/html-test/src/IgnoreExports.hs
diff --git a/html-test/tests/ModuleWithWarning.hs b/html-test/src/ModuleWithWarning.hs
index e64d9d7e..e64d9d7e 100644
--- a/html-test/tests/ModuleWithWarning.hs
+++ b/html-test/src/ModuleWithWarning.hs
diff --git a/html-test/tests/NamedDoc.hs b/html-test/src/NamedDoc.hs
index 7c04ba72..7c04ba72 100644
--- a/html-test/tests/NamedDoc.hs
+++ b/html-test/src/NamedDoc.hs
diff --git a/html-test/tests/NoLayout.hs b/html-test/src/NoLayout.hs
index 19b38b1d..19b38b1d 100644
--- a/html-test/tests/NoLayout.hs
+++ b/html-test/src/NoLayout.hs
diff --git a/html-test/tests/NonGreedy.hs b/html-test/src/NonGreedy.hs
index f51b55f5..f51b55f5 100644
--- a/html-test/tests/NonGreedy.hs
+++ b/html-test/src/NonGreedy.hs
diff --git a/html-test/tests/Properties.hs b/html-test/src/Properties.hs
index 05930ece..05930ece 100644
--- a/html-test/tests/Properties.hs
+++ b/html-test/src/Properties.hs
diff --git a/html-test/tests/PruneWithWarning.hs b/html-test/src/PruneWithWarning.hs
index bfa55ea2..bfa55ea2 100644
--- a/html-test/tests/PruneWithWarning.hs
+++ b/html-test/src/PruneWithWarning.hs
diff --git a/html-test/tests/QuasiExpr.hs b/html-test/src/QuasiExpr.hs
index 970759ba..970759ba 100644
--- a/html-test/tests/QuasiExpr.hs
+++ b/html-test/src/QuasiExpr.hs
diff --git a/html-test/tests/QuasiQuote.hs b/html-test/src/QuasiQuote.hs
index 06762cf9..06762cf9 100644
--- a/html-test/tests/QuasiQuote.hs
+++ b/html-test/src/QuasiQuote.hs
diff --git a/html-test/tests/SpuriousSuperclassConstraints.hs b/html-test/src/SpuriousSuperclassConstraints.hs
index d9e43e1c..d9e43e1c 100644
--- a/html-test/tests/SpuriousSuperclassConstraints.hs
+++ b/html-test/src/SpuriousSuperclassConstraints.hs
diff --git a/html-test/tests/TH.hs b/html-test/src/TH.hs
index f8178bcb..f8178bcb 100644
--- a/html-test/tests/TH.hs
+++ b/html-test/src/TH.hs
diff --git a/html-test/tests/TH2.hs b/html-test/src/TH2.hs
index ea85e547..ea85e547 100644
--- a/html-test/tests/TH2.hs
+++ b/html-test/src/TH2.hs
diff --git a/html-test/tests/Test.hs b/html-test/src/Test.hs
index d352f029..d352f029 100644
--- a/html-test/tests/Test.hs
+++ b/html-test/src/Test.hs
diff --git a/html-test/tests/Ticket112.hs b/html-test/src/Ticket112.hs
index c9cd5117..c9cd5117 100644
--- a/html-test/tests/Ticket112.hs
+++ b/html-test/src/Ticket112.hs
diff --git a/html-test/tests/Ticket61.hs b/html-test/src/Ticket61.hs
index 26ca287f..26ca287f 100644
--- a/html-test/tests/Ticket61.hs
+++ b/html-test/src/Ticket61.hs
diff --git a/html-test/tests/Ticket61_Hidden.hs b/html-test/src/Ticket61_Hidden.hs
index 583c10cd..583c10cd 100644
--- a/html-test/tests/Ticket61_Hidden.hs
+++ b/html-test/src/Ticket61_Hidden.hs
diff --git a/html-test/tests/Ticket75.hs b/html-test/src/Ticket75.hs
index 94a2f115..94a2f115 100644
--- a/html-test/tests/Ticket75.hs
+++ b/html-test/src/Ticket75.hs
diff --git a/html-test/tests/TypeFamilies.hs b/html-test/src/TypeFamilies.hs
index 561f95fd..561f95fd 100644
--- a/html-test/tests/TypeFamilies.hs
+++ b/html-test/src/TypeFamilies.hs
diff --git a/html-test/tests/TypeOperators.hs b/html-test/src/TypeOperators.hs
index edbb9344..edbb9344 100644
--- a/html-test/tests/TypeOperators.hs
+++ b/html-test/src/TypeOperators.hs
diff --git a/html-test/tests/Unicode.hs.disabled b/html-test/src/Unicode.hs.disabled
index d5bbf445..d5bbf445 100644
--- a/html-test/tests/Unicode.hs.disabled
+++ b/html-test/src/Unicode.hs.disabled
diff --git a/html-test/tests/Visible.hs b/html-test/src/Visible.hs
index cad71931..cad71931 100644
--- a/html-test/tests/Visible.hs
+++ b/html-test/src/Visible.hs