diff --git a/testsuite/tests/Makefile b/testsuite/tests/Makefile
index 9234bcc68ee062b7c3ccc2f3a0e0e374e9bba9ae..3b2ce49a3dc469216d62a95dc653a329cc84dce7 100644
--- a/testsuite/tests/Makefile
+++ b/testsuite/tests/Makefile
@@ -12,7 +12,9 @@ $(error base library does not seem to be installed)
 endif
 
 # Now find the "tests" directories of those libraries, where they exist
-LIBRARY_TEST_PATHS := $(wildcard $(patsubst %, $(TOP)/../libraries/%/tests, $(LIBRARIES)))
+LIBRARY_TEST_PATHS := $(wildcard $(patsubst %, $(TOP)/../libraries/%/tests, $(LIBRARIES))) \
+      $(wildcard $(patsubst %, $(TOP)/../libraries/%/tests-ghc, $(LIBRARIES)))
+
 
 # Add tests from packages
 RUNTEST_OPTS += $(patsubst %, --rootdir=%, $(LIBRARY_TEST_PATHS))