diff --git a/README.md b/README.md
index abd2bdac..99087b14 100644
--- a/README.md
+++ b/README.md
@@ -53,10 +53,10 @@ The docs get put in `dist/doc/html/`.
 ## Building the testsuite
 
 The `snap-server` has a fairly comprehensive test suite. To build and run it,
-`cd` into the `test/` directory and run
+run
 
-    $ cabal configure            # for the stock backend, or..
-    $ cabal configure -fopenssl  # for the SSL backend
+    $ cabal configure --enable-tests            # for the stock backend, or..
+    $ cabal configure -fopenssl --enable-tests  # for the SSL backend
     
     $ cabal build
 
diff --git a/runTestsAndCoverage.sh b/runTestsAndCoverage.sh
index d3b791dd..874a2576 100755
--- a/runTestsAndCoverage.sh
+++ b/runTestsAndCoverage.sh
@@ -8,7 +8,8 @@ export LANG=C
 rm -Rf testsuite.tix
 
 # TODO How do we find the executable without knowing the version number in dist-newstyle?
-./dist-newstyle/build/snap-server-1.0.0.0/build/testsuite/testsuite -j4 -a1000 $*
+TESTSUITE=`find . -type f -perm 775 -name 'testsuite'`
+$TESTSUITE -j4 -a1000 $*
 
 DIR="./dist-newstyle/hpc"
 
diff --git a/snap-server.cabal b/snap-server.cabal
index c1fbc179..6e9a4efd 100644
--- a/snap-server.cabal
+++ b/snap-server.cabal
@@ -495,6 +495,9 @@ Executable snap-test-server
       System.SendFile,
       System.SendFile.FreeBSD
 
+  if !impl(ghc >= 8.0)
+    build-depends: semigroups >= 0.16 && < 0.19
+
   build-depends:
     attoparsec,
     base,
@@ -516,7 +519,8 @@ Executable snap-test-server
     time,
     transformers,
     unix-compat,
-    vector
+    vector,
+    filepath
 
   ghc-options: -Wall -fwarn-tabs -funbox-strict-fields
                -fno-warn-unused-do-bind -threaded -rtsopts