6424 files changed, 2541 insertions, 2541 deletions

diff --git a/testsuite/tests/ghc-regress/KNOWN_FAILURES b/testsuite/tests/KNOWN_FAILURES
index cb9b5e0f9b..cb9b5e0f9b 100644
--- a/testsuite/tests/ghc-regress/KNOWN_FAILURES
+++ b/testsuite/tests/KNOWN_FAILURES
diff --git a/testsuite/tests/Makefile b/testsuite/tests/Makefile
new file mode 100644
index 0000000000..58d07bc88d
--- /dev/null
+++ b/testsuite/tests/Makefile
@@ -0,0 +1,18 @@
+TOP=..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+# The libraries that we actually know about. We don't want to test
+# extralibs that are in our tree but which we haven't built.
+LIBRARIES := $(shell '$(GHC_PKG)' list --simple-output --names-only)
+
+ifeq "$(findstring base,$(LIBRARIES))" ""
+$(error base library does not seem to be installed)
+endif
+
+# XXX Do this better?
+# Now find the "tests" directories of those libraries, where they exist
+LIBRARY_TEST_PATHS := $(wildcard $(patsubst %, $(TOP)/../libraries/%/tests, $(LIBRARIES)))
+
+# Add tests from packages
+RUNTEST_OPTS += $(patsubst %, --rootdir=%, $(LIBRARY_TEST_PATHS))
diff --git a/testsuite/tests/ghc-regress/NOTES b/testsuite/tests/NOTES
index a376f1db04..a376f1db04 100644
--- a/testsuite/tests/ghc-regress/NOTES
+++ b/testsuite/tests/NOTES
diff --git a/testsuite/tests/annotations/Makefile b/testsuite/tests/annotations/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/annotations/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/array/Makefile b/testsuite/tests/annotations/should_compile/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/array/Makefile
+++ b/testsuite/tests/annotations/should_compile/Makefile
diff --git a/testsuite/tests/ghc-regress/annotations/should_compile/all.T b/testsuite/tests/annotations/should_compile/all.T
index e13c24e72b..e13c24e72b 100644
--- a/testsuite/tests/ghc-regress/annotations/should_compile/all.T
+++ b/testsuite/tests/annotations/should_compile/all.T
diff --git a/testsuite/tests/ghc-regress/annotations/should_compile/ann01.hs b/testsuite/tests/annotations/should_compile/ann01.hs
index 134930787f..134930787f 100644
--- a/testsuite/tests/ghc-regress/annotations/should_compile/ann01.hs
+++ b/testsuite/tests/annotations/should_compile/ann01.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_compile/ann01.stderr b/testsuite/tests/annotations/should_compile/ann01.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/annotations/should_compile/ann01.stderr
+++ b/testsuite/tests/annotations/should_compile/ann01.stderr
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/Annfail04_Help.hs b/testsuite/tests/annotations/should_fail/Annfail04_Help.hs
index 55cbe99884..55cbe99884 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/Annfail04_Help.hs
+++ b/testsuite/tests/annotations/should_fail/Annfail04_Help.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/Annfail05_Help.hs b/testsuite/tests/annotations/should_fail/Annfail05_Help.hs
index 1300c091ca..1300c091ca 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/Annfail05_Help.hs
+++ b/testsuite/tests/annotations/should_fail/Annfail05_Help.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/Annfail06_Help.hs b/testsuite/tests/annotations/should_fail/Annfail06_Help.hs
index 224181f261..224181f261 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/Annfail06_Help.hs
+++ b/testsuite/tests/annotations/should_fail/Annfail06_Help.hs
diff --git a/testsuite/tests/ghc-regress/arrows/Makefile b/testsuite/tests/annotations/should_fail/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/arrows/Makefile
+++ b/testsuite/tests/annotations/should_fail/Makefile
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/all.T b/testsuite/tests/annotations/should_fail/all.T
index 21eaa765c3..21eaa765c3 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/all.T
+++ b/testsuite/tests/annotations/should_fail/all.T
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail01.hs b/testsuite/tests/annotations/should_fail/annfail01.hs
index c5a8c29e5b..c5a8c29e5b 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail01.hs
+++ b/testsuite/tests/annotations/should_fail/annfail01.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail01.stderr b/testsuite/tests/annotations/should_fail/annfail01.stderr
index 70553f983f..70553f983f 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail01.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail01.stderr
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail02.hs b/testsuite/tests/annotations/should_fail/annfail02.hs
index 50154e752c..50154e752c 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail02.hs
+++ b/testsuite/tests/annotations/should_fail/annfail02.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail02.stderr b/testsuite/tests/annotations/should_fail/annfail02.stderr
index 83d54f9840..83d54f9840 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail02.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail02.stderr
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail03.hs b/testsuite/tests/annotations/should_fail/annfail03.hs
index c3e2a82323..c3e2a82323 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail03.hs
+++ b/testsuite/tests/annotations/should_fail/annfail03.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail03.stderr b/testsuite/tests/annotations/should_fail/annfail03.stderr
index a7be7feb93..a7be7feb93 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail03.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail03.stderr
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail04.hs b/testsuite/tests/annotations/should_fail/annfail04.hs
index 352850e07d..352850e07d 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail04.hs
+++ b/testsuite/tests/annotations/should_fail/annfail04.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail04.stderr b/testsuite/tests/annotations/should_fail/annfail04.stderr
index dcbe0e7945..dcbe0e7945 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail04.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail04.stderr
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail05.hs b/testsuite/tests/annotations/should_fail/annfail05.hs
index 8657fd4ab6..8657fd4ab6 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail05.hs
+++ b/testsuite/tests/annotations/should_fail/annfail05.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail05.stderr b/testsuite/tests/annotations/should_fail/annfail05.stderr
index 4e861c6b97..4e861c6b97 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail05.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail05.stderr
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail06.hs b/testsuite/tests/annotations/should_fail/annfail06.hs
index 51c922098a..51c922098a 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail06.hs
+++ b/testsuite/tests/annotations/should_fail/annfail06.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail06.stderr b/testsuite/tests/annotations/should_fail/annfail06.stderr
index c5082c386e..c5082c386e 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail06.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail06.stderr
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail07.hs b/testsuite/tests/annotations/should_fail/annfail07.hs
index 732a66a3e4..732a66a3e4 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail07.hs
+++ b/testsuite/tests/annotations/should_fail/annfail07.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail07.stderr b/testsuite/tests/annotations/should_fail/annfail07.stderr
index 01f4b62c45..01f4b62c45 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail07.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail07.stderr
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail08.hs b/testsuite/tests/annotations/should_fail/annfail08.hs
index c2b3a1ae19..c2b3a1ae19 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail08.hs
+++ b/testsuite/tests/annotations/should_fail/annfail08.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail08.stderr b/testsuite/tests/annotations/should_fail/annfail08.stderr
index e8b14d1f8a..e8b14d1f8a 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail08.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail08.stderr
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail09.hs b/testsuite/tests/annotations/should_fail/annfail09.hs
index 871dd11895..871dd11895 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail09.hs
+++ b/testsuite/tests/annotations/should_fail/annfail09.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail09.stderr b/testsuite/tests/annotations/should_fail/annfail09.stderr
index 5eae63a012..5eae63a012 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail09.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail09.stderr
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail10.hs b/testsuite/tests/annotations/should_fail/annfail10.hs
index d03b6a73fb..d03b6a73fb 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail10.hs
+++ b/testsuite/tests/annotations/should_fail/annfail10.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail10.stderr b/testsuite/tests/annotations/should_fail/annfail10.stderr
index eac3002efa..eac3002efa 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail10.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail10.stderr
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail11.hs b/testsuite/tests/annotations/should_fail/annfail11.hs
index 2eebcb6b63..2eebcb6b63 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail11.hs
+++ b/testsuite/tests/annotations/should_fail/annfail11.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail11.stderr b/testsuite/tests/annotations/should_fail/annfail11.stderr
index 18769f7466..18769f7466 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail11.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail11.stderr
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail12.hs b/testsuite/tests/annotations/should_fail/annfail12.hs
index 7fe23073d1..7fe23073d1 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail12.hs
+++ b/testsuite/tests/annotations/should_fail/annfail12.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail12.stderr b/testsuite/tests/annotations/should_fail/annfail12.stderr
index 6b08c0a814..6b08c0a814 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail12.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail12.stderr
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail13.hs b/testsuite/tests/annotations/should_fail/annfail13.hs
index 0de17ce5c0..0de17ce5c0 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail13.hs
+++ b/testsuite/tests/annotations/should_fail/annfail13.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/annfail13.stderr b/testsuite/tests/annotations/should_fail/annfail13.stderr
index fb30c66f73..fb30c66f73 100644
--- a/testsuite/tests/ghc-regress/annotations/should_fail/annfail13.stderr
+++ b/testsuite/tests/annotations/should_fail/annfail13.stderr
diff --git a/testsuite/tests/ghc-regress/annotations/should_run/Annrun01_Help.hs b/testsuite/tests/annotations/should_run/Annrun01_Help.hs
index c27f85fef6..c27f85fef6 100644
--- a/testsuite/tests/ghc-regress/annotations/should_run/Annrun01_Help.hs
+++ b/testsuite/tests/annotations/should_run/Annrun01_Help.hs
diff --git a/testsuite/tests/annotations/should_run/Makefile b/testsuite/tests/annotations/should_run/Makefile
new file mode 100644
index 0000000000..71e065f76b
--- /dev/null
+++ b/testsuite/tests/annotations/should_run/Makefile
@@ -0,0 +1,12 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+CONFIG_HS=Config.hs
+
+config : 
+	rm -f $(CONFIG_HS)
+	@echo "Creating $(CONFIG_HS) ... "
+	echo "module Config where" >>$(CONFIG_HS)
+	echo "cTop          :: String" >> $(CONFIG_HS)
+	echo 'cTop          = "$(subst \,\\,$(shell '$(TEST_HC)' --print-libdir))"' >> $(CONFIG_HS)
diff --git a/testsuite/tests/ghc-regress/annotations/should_run/all.T b/testsuite/tests/annotations/should_run/all.T
index 22256b2f85..22256b2f85 100644
--- a/testsuite/tests/ghc-regress/annotations/should_run/all.T
+++ b/testsuite/tests/annotations/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/annotations/should_run/annrun01.hs b/testsuite/tests/annotations/should_run/annrun01.hs
index e626dadebc..e626dadebc 100644
--- a/testsuite/tests/ghc-regress/annotations/should_run/annrun01.hs
+++ b/testsuite/tests/annotations/should_run/annrun01.hs
diff --git a/testsuite/tests/ghc-regress/annotations/should_run/annrun01.stdout b/testsuite/tests/annotations/should_run/annrun01.stdout
index b57394b563..b57394b563 100644
--- a/testsuite/tests/ghc-regress/annotations/should_run/annrun01.stdout
+++ b/testsuite/tests/annotations/should_run/annrun01.stdout
diff --git a/testsuite/tests/ghc-regress/arityanal/Main.hs b/testsuite/tests/arityanal/Main.hs
index 25419fbc65..25419fbc65 100644
--- a/testsuite/tests/ghc-regress/arityanal/Main.hs
+++ b/testsuite/tests/arityanal/Main.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/Main.stderr b/testsuite/tests/arityanal/Main.stderr
index 5a816d67a6..5a816d67a6 100644
--- a/testsuite/tests/ghc-regress/arityanal/Main.stderr
+++ b/testsuite/tests/arityanal/Main.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/Makefile b/testsuite/tests/arityanal/Makefile
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/arityanal/Makefile
+++ b/testsuite/tests/arityanal/Makefile
diff --git a/testsuite/tests/ghc-regress/arityanal/f0.hs b/testsuite/tests/arityanal/f0.hs
index f2b7794b99..f2b7794b99 100644
--- a/testsuite/tests/ghc-regress/arityanal/f0.hs
+++ b/testsuite/tests/arityanal/f0.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/f0.stderr b/testsuite/tests/arityanal/f0.stderr
index 29ce90589b..29ce90589b 100644
--- a/testsuite/tests/ghc-regress/arityanal/f0.stderr
+++ b/testsuite/tests/arityanal/f0.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/f1.hs b/testsuite/tests/arityanal/f1.hs
index 5de291945e..5de291945e 100644
--- a/testsuite/tests/ghc-regress/arityanal/f1.hs
+++ b/testsuite/tests/arityanal/f1.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/f1.stderr b/testsuite/tests/arityanal/f1.stderr
index afafd7d71b..afafd7d71b 100644
--- a/testsuite/tests/ghc-regress/arityanal/f1.stderr
+++ b/testsuite/tests/arityanal/f1.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/f10.hs b/testsuite/tests/arityanal/f10.hs
index bee91d7820..bee91d7820 100644
--- a/testsuite/tests/ghc-regress/arityanal/f10.hs
+++ b/testsuite/tests/arityanal/f10.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/f10.stderr b/testsuite/tests/arityanal/f10.stderr
index cd3a95fbe4..cd3a95fbe4 100644
--- a/testsuite/tests/ghc-regress/arityanal/f10.stderr
+++ b/testsuite/tests/arityanal/f10.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/f11.hs b/testsuite/tests/arityanal/f11.hs
index f94d3adec0..f94d3adec0 100644
--- a/testsuite/tests/ghc-regress/arityanal/f11.hs
+++ b/testsuite/tests/arityanal/f11.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/f11.stderr b/testsuite/tests/arityanal/f11.stderr
index fc78dad48d..fc78dad48d 100644
--- a/testsuite/tests/ghc-regress/arityanal/f11.stderr
+++ b/testsuite/tests/arityanal/f11.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/f12.hs b/testsuite/tests/arityanal/f12.hs
index 35e82edc9f..35e82edc9f 100644
--- a/testsuite/tests/ghc-regress/arityanal/f12.hs
+++ b/testsuite/tests/arityanal/f12.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/f12.stderr b/testsuite/tests/arityanal/f12.stderr
index 9cd69ed7e2..9cd69ed7e2 100644
--- a/testsuite/tests/ghc-regress/arityanal/f12.stderr
+++ b/testsuite/tests/arityanal/f12.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/f13.hs b/testsuite/tests/arityanal/f13.hs
index 1b7a779c37..1b7a779c37 100644
--- a/testsuite/tests/ghc-regress/arityanal/f13.hs
+++ b/testsuite/tests/arityanal/f13.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/f13.stderr b/testsuite/tests/arityanal/f13.stderr
index 37718205b0..37718205b0 100644
--- a/testsuite/tests/ghc-regress/arityanal/f13.stderr
+++ b/testsuite/tests/arityanal/f13.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/f14.hs b/testsuite/tests/arityanal/f14.hs
index a908b6622b..a908b6622b 100644
--- a/testsuite/tests/ghc-regress/arityanal/f14.hs
+++ b/testsuite/tests/arityanal/f14.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/f14.stderr b/testsuite/tests/arityanal/f14.stderr
index 8a3e8382ba..8a3e8382ba 100644
--- a/testsuite/tests/ghc-regress/arityanal/f14.stderr
+++ b/testsuite/tests/arityanal/f14.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/f15.hs b/testsuite/tests/arityanal/f15.hs
index 7e1d5dfa16..7e1d5dfa16 100644
--- a/testsuite/tests/ghc-regress/arityanal/f15.hs
+++ b/testsuite/tests/arityanal/f15.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/f15.stderr b/testsuite/tests/arityanal/f15.stderr
index a68ecb25e4..a68ecb25e4 100644
--- a/testsuite/tests/ghc-regress/arityanal/f15.stderr
+++ b/testsuite/tests/arityanal/f15.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/f2.hs b/testsuite/tests/arityanal/f2.hs
index bdc06e45f2..bdc06e45f2 100644
--- a/testsuite/tests/ghc-regress/arityanal/f2.hs
+++ b/testsuite/tests/arityanal/f2.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/f2.stderr b/testsuite/tests/arityanal/f2.stderr
index d3fe22cc80..d3fe22cc80 100644
--- a/testsuite/tests/ghc-regress/arityanal/f2.stderr
+++ b/testsuite/tests/arityanal/f2.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/f3.hs b/testsuite/tests/arityanal/f3.hs
index f8210e6f0f..f8210e6f0f 100644
--- a/testsuite/tests/ghc-regress/arityanal/f3.hs
+++ b/testsuite/tests/arityanal/f3.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/f3.stderr b/testsuite/tests/arityanal/f3.stderr
index 863713ebe4..863713ebe4 100644
--- a/testsuite/tests/ghc-regress/arityanal/f3.stderr
+++ b/testsuite/tests/arityanal/f3.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/f4.hs b/testsuite/tests/arityanal/f4.hs
index 29c3e8d4ab..29c3e8d4ab 100644
--- a/testsuite/tests/ghc-regress/arityanal/f4.hs
+++ b/testsuite/tests/arityanal/f4.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/f4.stderr b/testsuite/tests/arityanal/f4.stderr
index 48b617f3ae..48b617f3ae 100644
--- a/testsuite/tests/ghc-regress/arityanal/f4.stderr
+++ b/testsuite/tests/arityanal/f4.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/f5.hs b/testsuite/tests/arityanal/f5.hs
index 96c8450270..96c8450270 100644
--- a/testsuite/tests/ghc-regress/arityanal/f5.hs
+++ b/testsuite/tests/arityanal/f5.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/f5.stderr b/testsuite/tests/arityanal/f5.stderr
index 757cd3d35e..757cd3d35e 100644
--- a/testsuite/tests/ghc-regress/arityanal/f5.stderr
+++ b/testsuite/tests/arityanal/f5.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/f6.hs b/testsuite/tests/arityanal/f6.hs
index ba1e453c3f..ba1e453c3f 100644
--- a/testsuite/tests/ghc-regress/arityanal/f6.hs
+++ b/testsuite/tests/arityanal/f6.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/f6.stderr b/testsuite/tests/arityanal/f6.stderr
index 68c03c44a3..68c03c44a3 100644
--- a/testsuite/tests/ghc-regress/arityanal/f6.stderr
+++ b/testsuite/tests/arityanal/f6.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/f7.hs b/testsuite/tests/arityanal/f7.hs
index 44241c5ae1..44241c5ae1 100644
--- a/testsuite/tests/ghc-regress/arityanal/f7.hs
+++ b/testsuite/tests/arityanal/f7.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/f7.stderr b/testsuite/tests/arityanal/f7.stderr
index 7cef2a7c36..7cef2a7c36 100644
--- a/testsuite/tests/ghc-regress/arityanal/f7.stderr
+++ b/testsuite/tests/arityanal/f7.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/f8.hs b/testsuite/tests/arityanal/f8.hs
index 1c960556b5..1c960556b5 100644
--- a/testsuite/tests/ghc-regress/arityanal/f8.hs
+++ b/testsuite/tests/arityanal/f8.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/f8.stderr b/testsuite/tests/arityanal/f8.stderr
index e297ceb722..e297ceb722 100644
--- a/testsuite/tests/ghc-regress/arityanal/f8.stderr
+++ b/testsuite/tests/arityanal/f8.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/f9.hs b/testsuite/tests/arityanal/f9.hs
index e991cfd478..e991cfd478 100644
--- a/testsuite/tests/ghc-regress/arityanal/f9.hs
+++ b/testsuite/tests/arityanal/f9.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/f9.stderr b/testsuite/tests/arityanal/f9.stderr
index 267b96b858..267b96b858 100644
--- a/testsuite/tests/ghc-regress/arityanal/f9.stderr
+++ b/testsuite/tests/arityanal/f9.stderr
diff --git a/testsuite/tests/ghc-regress/arityanal/prim.hs b/testsuite/tests/arityanal/prim.hs
index 5b91ad24f2..5b91ad24f2 100644
--- a/testsuite/tests/ghc-regress/arityanal/prim.hs
+++ b/testsuite/tests/arityanal/prim.hs
diff --git a/testsuite/tests/ghc-regress/arityanal/prim.stderr b/testsuite/tests/arityanal/prim.stderr
index b5f76d493e..b5f76d493e 100644
--- a/testsuite/tests/ghc-regress/arityanal/prim.stderr
+++ b/testsuite/tests/arityanal/prim.stderr
diff --git a/testsuite/tests/array/Makefile b/testsuite/tests/array/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/array/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/boxy/Makefile b/testsuite/tests/array/should_run/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/boxy/Makefile
+++ b/testsuite/tests/array/should_run/Makefile
diff --git a/testsuite/tests/ghc-regress/array/should_run/all.T b/testsuite/tests/array/should_run/all.T
index 8b1ab2dd4d..8b1ab2dd4d 100644
--- a/testsuite/tests/ghc-regress/array/should_run/all.T
+++ b/testsuite/tests/array/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr001.hs b/testsuite/tests/array/should_run/arr001.hs
index 325ce1bc09..325ce1bc09 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr001.hs
+++ b/testsuite/tests/array/should_run/arr001.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr001.stdout b/testsuite/tests/array/should_run/arr001.stdout
index 5d4420352e..5d4420352e 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr001.stdout
+++ b/testsuite/tests/array/should_run/arr001.stdout
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr002.hs b/testsuite/tests/array/should_run/arr002.hs
index a26a60281c..a26a60281c 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr002.hs
+++ b/testsuite/tests/array/should_run/arr002.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr002.stdout b/testsuite/tests/array/should_run/arr002.stdout
index ca55f16bbc..ca55f16bbc 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr002.stdout
+++ b/testsuite/tests/array/should_run/arr002.stdout
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr003.hs b/testsuite/tests/array/should_run/arr003.hs
index 8f156ab6d9..8f156ab6d9 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr003.hs
+++ b/testsuite/tests/array/should_run/arr003.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr003.stderr b/testsuite/tests/array/should_run/arr003.stderr
index 8f3945286b..8f3945286b 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr003.stderr
+++ b/testsuite/tests/array/should_run/arr003.stderr
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr003.stderr-hugs b/testsuite/tests/array/should_run/arr003.stderr-hugs
index 0f838fa8cd..0f838fa8cd 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr003.stderr-hugs
+++ b/testsuite/tests/array/should_run/arr003.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr004.hs b/testsuite/tests/array/should_run/arr004.hs
index 0d7e5b445f..0d7e5b445f 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr004.hs
+++ b/testsuite/tests/array/should_run/arr004.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr004.stderr b/testsuite/tests/array/should_run/arr004.stderr
index b69cbf5b62..b69cbf5b62 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr004.stderr
+++ b/testsuite/tests/array/should_run/arr004.stderr
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr004.stderr-hugs b/testsuite/tests/array/should_run/arr004.stderr-hugs
index 2d1decd612..2d1decd612 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr004.stderr-hugs
+++ b/testsuite/tests/array/should_run/arr004.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr005.hs b/testsuite/tests/array/should_run/arr005.hs
index 274f8bb1c1..274f8bb1c1 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr005.hs
+++ b/testsuite/tests/array/should_run/arr005.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr005.stdout b/testsuite/tests/array/should_run/arr005.stdout
index 5048dd0479..5048dd0479 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr005.stdout
+++ b/testsuite/tests/array/should_run/arr005.stdout
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr006.hs b/testsuite/tests/array/should_run/arr006.hs
index 52d21c6f3d..52d21c6f3d 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr006.hs
+++ b/testsuite/tests/array/should_run/arr006.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr006.stdout b/testsuite/tests/array/should_run/arr006.stdout
index 289deeec07..289deeec07 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr006.stdout
+++ b/testsuite/tests/array/should_run/arr006.stdout
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr007.hs b/testsuite/tests/array/should_run/arr007.hs
index d4461d8d5e..d4461d8d5e 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr007.hs
+++ b/testsuite/tests/array/should_run/arr007.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr007.stderr b/testsuite/tests/array/should_run/arr007.stderr
index feaa5d8363..feaa5d8363 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr007.stderr
+++ b/testsuite/tests/array/should_run/arr007.stderr
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr007.stderr-hugs b/testsuite/tests/array/should_run/arr007.stderr-hugs
index aa4c83b32e..aa4c83b32e 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr007.stderr-hugs
+++ b/testsuite/tests/array/should_run/arr007.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr008.hs b/testsuite/tests/array/should_run/arr008.hs
index 14152c5a9d..14152c5a9d 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr008.hs
+++ b/testsuite/tests/array/should_run/arr008.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr008.stderr b/testsuite/tests/array/should_run/arr008.stderr
index f926f7288c..f926f7288c 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr008.stderr
+++ b/testsuite/tests/array/should_run/arr008.stderr
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr008.stderr-hugs b/testsuite/tests/array/should_run/arr008.stderr-hugs
index 4de58dad3b..4de58dad3b 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr008.stderr-hugs
+++ b/testsuite/tests/array/should_run/arr008.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr008.stdout b/testsuite/tests/array/should_run/arr008.stdout
index 825444d25b..825444d25b 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr008.stdout
+++ b/testsuite/tests/array/should_run/arr008.stdout
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr008.stdout-hugs b/testsuite/tests/array/should_run/arr008.stdout-hugs
index bbad9774f5..bbad9774f5 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr008.stdout-hugs
+++ b/testsuite/tests/array/should_run/arr008.stdout-hugs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr009.hs b/testsuite/tests/array/should_run/arr009.hs
index 290147d0a0..290147d0a0 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr009.hs
+++ b/testsuite/tests/array/should_run/arr009.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr009.stdout b/testsuite/tests/array/should_run/arr009.stdout
index 5816fd7906..5816fd7906 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr009.stdout
+++ b/testsuite/tests/array/should_run/arr009.stdout
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr010.hs b/testsuite/tests/array/should_run/arr010.hs
index d5b7f38c1c..d5b7f38c1c 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr010.hs
+++ b/testsuite/tests/array/should_run/arr010.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr010.stdout b/testsuite/tests/array/should_run/arr010.stdout
index cc8297ea19..cc8297ea19 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr010.stdout
+++ b/testsuite/tests/array/should_run/arr010.stdout
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr011.hs b/testsuite/tests/array/should_run/arr011.hs
index 1516b0e866..1516b0e866 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr011.hs
+++ b/testsuite/tests/array/should_run/arr011.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr011.stdout b/testsuite/tests/array/should_run/arr011.stdout
index 9491d9c780..9491d9c780 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr011.stdout
+++ b/testsuite/tests/array/should_run/arr011.stdout
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr012.hs b/testsuite/tests/array/should_run/arr012.hs
index 231d625812..231d625812 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr012.hs
+++ b/testsuite/tests/array/should_run/arr012.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr012.stdout b/testsuite/tests/array/should_run/arr012.stdout
index b8c8fda13a..b8c8fda13a 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr012.stdout
+++ b/testsuite/tests/array/should_run/arr012.stdout
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr013.hs b/testsuite/tests/array/should_run/arr013.hs
index f9e63aa5ba..f9e63aa5ba 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr013.hs
+++ b/testsuite/tests/array/should_run/arr013.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr013.stdout b/testsuite/tests/array/should_run/arr013.stdout
index 4d9bf4f505..4d9bf4f505 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr013.stdout
+++ b/testsuite/tests/array/should_run/arr013.stdout
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr014.hs b/testsuite/tests/array/should_run/arr014.hs
index 59541c09ff..59541c09ff 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr014.hs
+++ b/testsuite/tests/array/should_run/arr014.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr014.stdout b/testsuite/tests/array/should_run/arr014.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr014.stdout
+++ b/testsuite/tests/array/should_run/arr014.stdout
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr015.hs b/testsuite/tests/array/should_run/arr015.hs
index 4a6e8c431a..4a6e8c431a 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr015.hs
+++ b/testsuite/tests/array/should_run/arr015.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr015.stdout b/testsuite/tests/array/should_run/arr015.stdout
index be8c55085c..be8c55085c 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr015.stdout
+++ b/testsuite/tests/array/should_run/arr015.stdout
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr016.hs b/testsuite/tests/array/should_run/arr016.hs
index 055e6602be..055e6602be 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr016.hs
+++ b/testsuite/tests/array/should_run/arr016.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr016.stdout b/testsuite/tests/array/should_run/arr016.stdout
index 1e7413dfb1..1e7413dfb1 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr016.stdout
+++ b/testsuite/tests/array/should_run/arr016.stdout
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr017.hs b/testsuite/tests/array/should_run/arr017.hs
index 18314b8e28..18314b8e28 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr017.hs
+++ b/testsuite/tests/array/should_run/arr017.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr017.stdout b/testsuite/tests/array/should_run/arr017.stdout
index 12e7cb0720..12e7cb0720 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr017.stdout
+++ b/testsuite/tests/array/should_run/arr017.stdout
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr018.hs b/testsuite/tests/array/should_run/arr018.hs
index 27896aae39..27896aae39 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr018.hs
+++ b/testsuite/tests/array/should_run/arr018.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr018.stdout b/testsuite/tests/array/should_run/arr018.stdout
index 08ca4fc84f..08ca4fc84f 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr018.stdout
+++ b/testsuite/tests/array/should_run/arr018.stdout
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr019.hs b/testsuite/tests/array/should_run/arr019.hs
index 9992dd2315..9992dd2315 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr019.hs
+++ b/testsuite/tests/array/should_run/arr019.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/arr019.stdout b/testsuite/tests/array/should_run/arr019.stdout
index f99db4ec8d..f99db4ec8d 100644
--- a/testsuite/tests/ghc-regress/array/should_run/arr019.stdout
+++ b/testsuite/tests/array/should_run/arr019.stdout
diff --git a/testsuite/tests/arrows/Makefile b/testsuite/tests/arrows/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/arrows/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/codeGen/Makefile b/testsuite/tests/arrows/should_compile/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/codeGen/Makefile
+++ b/testsuite/tests/arrows/should_compile/Makefile
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/T3964.hs b/testsuite/tests/arrows/should_compile/T3964.hs
index 713c7e2303..713c7e2303 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/T3964.hs
+++ b/testsuite/tests/arrows/should_compile/T3964.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/T5283.hs b/testsuite/tests/arrows/should_compile/T5283.hs
index 9216d3cd67..9216d3cd67 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/T5283.hs
+++ b/testsuite/tests/arrows/should_compile/T5283.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/all.T b/testsuite/tests/arrows/should_compile/all.T
index 3351b9f4ba..3351b9f4ba 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/all.T
+++ b/testsuite/tests/arrows/should_compile/all.T
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply1.hs b/testsuite/tests/arrows/should_compile/arrowapply1.hs
index abad47de26..abad47de26 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply1.hs
+++ b/testsuite/tests/arrows/should_compile/arrowapply1.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply2.hs b/testsuite/tests/arrows/should_compile/arrowapply2.hs
index 16cf2f3039..16cf2f3039 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply2.hs
+++ b/testsuite/tests/arrows/should_compile/arrowapply2.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply3.hs b/testsuite/tests/arrows/should_compile/arrowapply3.hs
index 3a9b49da92..3a9b49da92 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply3.hs
+++ b/testsuite/tests/arrows/should_compile/arrowapply3.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply4.hs b/testsuite/tests/arrows/should_compile/arrowapply4.hs
index af0dac4cee..af0dac4cee 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply4.hs
+++ b/testsuite/tests/arrows/should_compile/arrowapply4.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply5.hs b/testsuite/tests/arrows/should_compile/arrowapply5.hs
index 46d1dc587f..46d1dc587f 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowapply5.hs
+++ b/testsuite/tests/arrows/should_compile/arrowapply5.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowcase1.hs b/testsuite/tests/arrows/should_compile/arrowcase1.hs
index 6d39b0be73..6d39b0be73 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowcase1.hs
+++ b/testsuite/tests/arrows/should_compile/arrowcase1.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo1.hs b/testsuite/tests/arrows/should_compile/arrowdo1.hs
index b70eedd460..b70eedd460 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo1.hs
+++ b/testsuite/tests/arrows/should_compile/arrowdo1.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo2.hs b/testsuite/tests/arrows/should_compile/arrowdo2.hs
index 3562dc23b9..3562dc23b9 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo2.hs
+++ b/testsuite/tests/arrows/should_compile/arrowdo2.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo3.hs b/testsuite/tests/arrows/should_compile/arrowdo3.hs
index 3b6a8c8d35..3b6a8c8d35 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowdo3.hs
+++ b/testsuite/tests/arrows/should_compile/arrowdo3.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowform1.hs b/testsuite/tests/arrows/should_compile/arrowform1.hs
index a282d71ed7..a282d71ed7 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowform1.hs
+++ b/testsuite/tests/arrows/should_compile/arrowform1.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowif1.hs b/testsuite/tests/arrows/should_compile/arrowif1.hs
index 404b1f164c..404b1f164c 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowif1.hs
+++ b/testsuite/tests/arrows/should_compile/arrowif1.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowlet1.hs b/testsuite/tests/arrows/should_compile/arrowlet1.hs
index b08e030d1c..b08e030d1c 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowlet1.hs
+++ b/testsuite/tests/arrows/should_compile/arrowlet1.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowpat.hs b/testsuite/tests/arrows/should_compile/arrowpat.hs
index 56b1117e9a..56b1117e9a 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowpat.hs
+++ b/testsuite/tests/arrows/should_compile/arrowpat.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/arrowrec1.hs b/testsuite/tests/arrows/should_compile/arrowrec1.hs
index 57b6de783c..57b6de783c 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/arrowrec1.hs
+++ b/testsuite/tests/arrows/should_compile/arrowrec1.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/Makefile b/testsuite/tests/arrows/should_fail/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/concurrent/Makefile
+++ b/testsuite/tests/arrows/should_fail/Makefile
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/T2111.hs b/testsuite/tests/arrows/should_fail/T2111.hs
index eb242cdd6b..eb242cdd6b 100644
--- a/testsuite/tests/ghc-regress/arrows/should_fail/T2111.hs
+++ b/testsuite/tests/arrows/should_fail/T2111.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/T2111.stderr b/testsuite/tests/arrows/should_fail/T2111.stderr
index 9c6c17fb53..9c6c17fb53 100644
--- a/testsuite/tests/ghc-regress/arrows/should_fail/T2111.stderr
+++ b/testsuite/tests/arrows/should_fail/T2111.stderr
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/T2111.stderr-ghc-7.0 b/testsuite/tests/arrows/should_fail/T2111.stderr-ghc-7.0
index 79eb1daaee..79eb1daaee 100644
--- a/testsuite/tests/ghc-regress/arrows/should_fail/T2111.stderr-ghc-7.0
+++ b/testsuite/tests/arrows/should_fail/T2111.stderr-ghc-7.0
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/all.T b/testsuite/tests/arrows/should_fail/all.T
index 4da90faba3..4da90faba3 100644
--- a/testsuite/tests/ghc-regress/arrows/should_fail/all.T
+++ b/testsuite/tests/arrows/should_fail/all.T
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.hs b/testsuite/tests/arrows/should_fail/arrowfail001.hs
index e106c214aa..e106c214aa 100644
--- a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.hs
+++ b/testsuite/tests/arrows/should_fail/arrowfail001.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.stderr b/testsuite/tests/arrows/should_fail/arrowfail001.stderr
index 91ec965715..91ec965715 100644
--- a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail001.stderr
+++ b/testsuite/tests/arrows/should_fail/arrowfail001.stderr
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail002.hs b/testsuite/tests/arrows/should_fail/arrowfail002.hs
index 96cc930565..96cc930565 100644
--- a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail002.hs
+++ b/testsuite/tests/arrows/should_fail/arrowfail002.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail002.stderr b/testsuite/tests/arrows/should_fail/arrowfail002.stderr
index c653acc339..c653acc339 100644
--- a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail002.stderr
+++ b/testsuite/tests/arrows/should_fail/arrowfail002.stderr
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail003.hs b/testsuite/tests/arrows/should_fail/arrowfail003.hs
index 2f8cfeeaed..2f8cfeeaed 100644
--- a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail003.hs
+++ b/testsuite/tests/arrows/should_fail/arrowfail003.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail003.stderr b/testsuite/tests/arrows/should_fail/arrowfail003.stderr
index 39a6b48139..39a6b48139 100644
--- a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail003.stderr
+++ b/testsuite/tests/arrows/should_fail/arrowfail003.stderr
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail004.hs b/testsuite/tests/arrows/should_fail/arrowfail004.hs
index 3e0835a0e4..3e0835a0e4 100644
--- a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail004.hs
+++ b/testsuite/tests/arrows/should_fail/arrowfail004.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail004.stderr b/testsuite/tests/arrows/should_fail/arrowfail004.stderr
index 8a20c6bcbb..8a20c6bcbb 100644
--- a/testsuite/tests/ghc-regress/arrows/should_fail/arrowfail004.stderr
+++ b/testsuite/tests/arrows/should_fail/arrowfail004.stderr
diff --git a/testsuite/tests/ghc-regress/cpranal/Makefile b/testsuite/tests/arrows/should_run/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/cpranal/Makefile
+++ b/testsuite/tests/arrows/should_run/Makefile
diff --git a/testsuite/tests/ghc-regress/arrows/should_run/T3822.hs b/testsuite/tests/arrows/should_run/T3822.hs
index 93e6dc5797..93e6dc5797 100644
--- a/testsuite/tests/ghc-regress/arrows/should_run/T3822.hs
+++ b/testsuite/tests/arrows/should_run/T3822.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_run/T3822.stdout b/testsuite/tests/arrows/should_run/T3822.stdout
index 25e7f55667..25e7f55667 100644
--- a/testsuite/tests/ghc-regress/arrows/should_run/T3822.stdout
+++ b/testsuite/tests/arrows/should_run/T3822.stdout
diff --git a/testsuite/tests/ghc-regress/arrows/should_run/all.T b/testsuite/tests/arrows/should_run/all.T
index a9867dd395..a9867dd395 100644
--- a/testsuite/tests/ghc-regress/arrows/should_run/all.T
+++ b/testsuite/tests/arrows/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun001.hs b/testsuite/tests/arrows/should_run/arrowrun001.hs
index c686b32546..c686b32546 100644
--- a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun001.hs
+++ b/testsuite/tests/arrows/should_run/arrowrun001.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun001.stdout b/testsuite/tests/arrows/should_run/arrowrun001.stdout
index 349103a876..349103a876 100644
--- a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun001.stdout
+++ b/testsuite/tests/arrows/should_run/arrowrun001.stdout
diff --git a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun002.hs b/testsuite/tests/arrows/should_run/arrowrun002.hs
index 16f29806ac..16f29806ac 100644
--- a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun002.hs
+++ b/testsuite/tests/arrows/should_run/arrowrun002.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun002.stdout b/testsuite/tests/arrows/should_run/arrowrun002.stdout
index b13ce3b37a..b13ce3b37a 100644
--- a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun002.stdout
+++ b/testsuite/tests/arrows/should_run/arrowrun002.stdout
diff --git a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun003.hs b/testsuite/tests/arrows/should_run/arrowrun003.hs
index 5f4580ab87..5f4580ab87 100644
--- a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun003.hs
+++ b/testsuite/tests/arrows/should_run/arrowrun003.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun003.stdout b/testsuite/tests/arrows/should_run/arrowrun003.stdout
index 21a7156d60..21a7156d60 100644
--- a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun003.stdout
+++ b/testsuite/tests/arrows/should_run/arrowrun003.stdout
diff --git a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun004.hs b/testsuite/tests/arrows/should_run/arrowrun004.hs
index c0275065f2..c0275065f2 100644
--- a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun004.hs
+++ b/testsuite/tests/arrows/should_run/arrowrun004.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun004.stdout b/testsuite/tests/arrows/should_run/arrowrun004.stdout
index cbb71fdd82..cbb71fdd82 100644
--- a/testsuite/tests/ghc-regress/arrows/should_run/arrowrun004.stdout
+++ b/testsuite/tests/arrows/should_run/arrowrun004.stdout
diff --git a/testsuite/tests/ghc-regress/boxy/Base1.hs b/testsuite/tests/boxy/Base1.hs
index 88e7e80f17..88e7e80f17 100644
--- a/testsuite/tests/ghc-regress/boxy/Base1.hs
+++ b/testsuite/tests/boxy/Base1.hs
diff --git a/testsuite/tests/ghc-regress/boxy/Church1.hs b/testsuite/tests/boxy/Church1.hs
index fccaac7d8c..fccaac7d8c 100644
--- a/testsuite/tests/ghc-regress/boxy/Church1.hs
+++ b/testsuite/tests/boxy/Church1.hs
diff --git a/testsuite/tests/ghc-regress/boxy/Church2.hs b/testsuite/tests/boxy/Church2.hs
index c360bb3a8b..c360bb3a8b 100644
--- a/testsuite/tests/ghc-regress/boxy/Church2.hs
+++ b/testsuite/tests/boxy/Church2.hs
diff --git a/testsuite/tests/ghc-regress/boxy/Church2.stderr b/testsuite/tests/boxy/Church2.stderr
index ea7613733b..ea7613733b 100644
--- a/testsuite/tests/ghc-regress/boxy/Church2.stderr
+++ b/testsuite/tests/boxy/Church2.stderr
diff --git a/testsuite/tests/ghc-regress/boxy/Compose.hs b/testsuite/tests/boxy/Compose.hs
index 0caa84cbe1..0caa84cbe1 100644
--- a/testsuite/tests/ghc-regress/boxy/Compose.hs
+++ b/testsuite/tests/boxy/Compose.hs
diff --git a/testsuite/tests/boxy/Makefile b/testsuite/tests/boxy/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/boxy/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/boxy/PList1.hs b/testsuite/tests/boxy/PList1.hs
index 80fac96d9f..80fac96d9f 100644
--- a/testsuite/tests/ghc-regress/boxy/PList1.hs
+++ b/testsuite/tests/boxy/PList1.hs
diff --git a/testsuite/tests/ghc-regress/boxy/PList2.hs b/testsuite/tests/boxy/PList2.hs
index 581ce086a9..581ce086a9 100644
--- a/testsuite/tests/ghc-regress/boxy/PList2.hs
+++ b/testsuite/tests/boxy/PList2.hs
diff --git a/testsuite/tests/ghc-regress/boxy/SystemF.hs b/testsuite/tests/boxy/SystemF.hs
index 3f5b4b957a..3f5b4b957a 100644
--- a/testsuite/tests/ghc-regress/boxy/SystemF.hs
+++ b/testsuite/tests/boxy/SystemF.hs
diff --git a/testsuite/tests/ghc-regress/boxy/T2193.hs b/testsuite/tests/boxy/T2193.hs
index 904a13721c..904a13721c 100644
--- a/testsuite/tests/ghc-regress/boxy/T2193.hs
+++ b/testsuite/tests/boxy/T2193.hs
diff --git a/testsuite/tests/ghc-regress/boxy/T2193.stdout b/testsuite/tests/boxy/T2193.stdout
index b8626c4cff..b8626c4cff 100644
--- a/testsuite/tests/ghc-regress/boxy/T2193.stdout
+++ b/testsuite/tests/boxy/T2193.stdout
diff --git a/testsuite/tests/ghc-regress/boxy/all.T b/testsuite/tests/boxy/all.T
index 0294d01629..0294d01629 100644
--- a/testsuite/tests/ghc-regress/boxy/all.T
+++ b/testsuite/tests/boxy/all.T
diff --git a/testsuite/tests/ghc-regress/boxy/boxy.hs b/testsuite/tests/boxy/boxy.hs
index 4d2bd029b1..4d2bd029b1 100644
--- a/testsuite/tests/ghc-regress/boxy/boxy.hs
+++ b/testsuite/tests/boxy/boxy.hs
diff --git a/testsuite/tests/ghc-regress/cabal/1750.stderr b/testsuite/tests/cabal/1750.stderr
index 71bed0745b..71bed0745b 100644
--- a/testsuite/tests/ghc-regress/cabal/1750.stderr
+++ b/testsuite/tests/cabal/1750.stderr
diff --git a/testsuite/tests/ghc-regress/cabal/1750.stdout b/testsuite/tests/cabal/1750.stdout
index dac998e2ac..dac998e2ac 100644
--- a/testsuite/tests/ghc-regress/cabal/1750.stdout
+++ b/testsuite/tests/cabal/1750.stdout
diff --git a/testsuite/tests/ghc-regress/cabal/1750A.pkg b/testsuite/tests/cabal/1750A.pkg
index e32c97ff8b..e32c97ff8b 100644
--- a/testsuite/tests/ghc-regress/cabal/1750A.pkg
+++ b/testsuite/tests/cabal/1750A.pkg
diff --git a/testsuite/tests/ghc-regress/cabal/1750B.pkg b/testsuite/tests/cabal/1750B.pkg
index 5e9ff1f56d..5e9ff1f56d 100644
--- a/testsuite/tests/ghc-regress/cabal/1750B.pkg
+++ b/testsuite/tests/cabal/1750B.pkg
diff --git a/testsuite/tests/cabal/Makefile b/testsuite/tests/cabal/Makefile
new file mode 100644
index 0000000000..a036d820dd
--- /dev/null
+++ b/testsuite/tests/cabal/Makefile
@@ -0,0 +1,184 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+PKGCONF01=local01.package.conf
+LOCAL_GHC_PKG01 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF01)
+
+STRIP_PKGROOT=sed 's/^pkgroot: .*$$/pkgroot: /'
+
+# a bunch of tests for ghc-pkg
+ghcpkg01 :
+	@rm -rf $(PKGCONF01)
+	$(LOCAL_GHC_PKG01) init $(PKGCONF01)
+	$(LOCAL_GHC_PKG01) list
+	$(LOCAL_GHC_PKG01) register --force test.pkg 2>/dev/null
+	$(LOCAL_GHC_PKG01) describe testpkg         | $(STRIP_PKGROOT)
+	$(LOCAL_GHC_PKG01) describe testpkg-1.2.3.4 | $(STRIP_PKGROOT)
+	$(LOCAL_GHC_PKG01) field testpkg-1.2.3.4 import-dirs
+
+	@: # test2.pkg is a later version of testpkg-1.2.3.4
+	$(LOCAL_GHC_PKG01) register --force test2.pkg 2>/dev/null
+	$(LOCAL_GHC_PKG01) list
+	$(LOCAL_GHC_PKG01) describe testpkg-2.0 | $(STRIP_PKGROOT)
+	$(LOCAL_GHC_PKG01) describe testpkg-*   | $(STRIP_PKGROOT)
+	$(LOCAL_GHC_PKG01) field testpkg-* version
+
+	@: # test hiding/exposing
+	$(LOCAL_GHC_PKG01) hide testpkg-1.2.3.4
+	$(LOCAL_GHC_PKG01) field testpkg-1.2.3.4 exposed | grep False
+	$(LOCAL_GHC_PKG01) expose testpkg-2.0
+	$(LOCAL_GHC_PKG01) field testpkg-2.0 exposed | grep True
+	$(LOCAL_GHC_PKG01) hide testpkg-*
+	$(LOCAL_GHC_PKG01) field testpkg-* exposed
+
+	@: # test3.pkg  depends on testpkg-2.0
+	$(LOCAL_GHC_PKG01) register test3.pkg
+
+	@: # unregistering testpkg-2.0 should fail now, testpkg-3.0 depends on it
+	if $(LOCAL_GHC_PKG01) unregister testpkg-2.0; then false; else true; fi
+
+	$(LOCAL_GHC_PKG01) unregister testpkg-3.0
+
+	$(LOCAL_GHC_PKG01) unregister testpkg-2.0
+	$(LOCAL_GHC_PKG01) describe testpkg | $(STRIP_PKGROOT)
+	$(LOCAL_GHC_PKG01) unregister testpkg-*
+	$(LOCAL_GHC_PKG01) list
+
+	@: # registering test3.pkg should fail now, its dependency has gone
+	if $(LOCAL_GHC_PKG01) register test3.pkg; then false; else true; fi
+
+PKGCONF03=local03.package.conf
+LOCAL_GHC_PKG03 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF03)
+
+ghcpkg03 :
+	@rm -rf $(PKGCONF03)
+	$(LOCAL_GHC_PKG03) init $(PKGCONF03)
+	@: # update should hide conflicting packages
+	$(LOCAL_GHC_PKG03) register --force test.pkg
+	$(LOCAL_GHC_PKG03) register --force test2.pkg
+
+	@: # test4.pkg depends on testpkg-2.0, which conflicts with testpkg-1.2.3.4,
+	@: # ghc-pkg will happily register it now (it didn't in GHC 6.4)
+	$(LOCAL_GHC_PKG03) register test4.pkg
+	$(LOCAL_GHC_PKG03) update test4.pkg
+
+	@: # and another update of test.pkg will now hide dep-2.0
+	$(LOCAL_GHC_PKG03) update --force test.pkg
+
+PKGCONF04=local04.package.conf
+LOCAL_GHC_PKG04 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF04)
+
+# Test that importing a module exposed by two packages reports a conflict
+ghcpkg04 :
+	rm -rf $(PKGCONF04)
+	$(LOCAL_GHC_PKG04) init $(PKGCONF04)
+	$(LOCAL_GHC_PKG04) register --force test.pkg >/dev/null 2>&1 
+	$(LOCAL_GHC_PKG04) update --force test5.pkg >/dev/null 2>&1 
+	$(LOCAL_GHC_PKG04) expose testpkg-1.2.3.4  >/dev/null 2>&1
+	@: # testpkg-1.2.3.4 and newtestpkg-2.0 are both exposed now
+	'$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(PKGCONF04) -c ghcpkg04.hs || true
+
+# Test stacking of package.confs (also #2441)
+PKGCONF05a=local05a.package.conf
+PKGCONF05b=local05b.package.conf
+LOCAL_GHC_PKG05a = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF05a)
+LOCAL_GHC_PKG05b = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF05a) -f $(PKGCONF05b)
+
+ghcpkg05 :
+	rm -rf $(PKGCONF05a) $(PKGCONF05b)
+	$(LOCAL_GHC_PKG05a) init $(PKGCONF05a)
+	$(LOCAL_GHC_PKG05b) init $(PKGCONF05b)
+	$(LOCAL_GHC_PKG05a) register --force test2.pkg >/dev/null 2>&1 
+	$(LOCAL_GHC_PKG05b) register --force test3.pkg >/dev/null 2>&1 
+	$(LOCAL_GHC_PKG05b) check || true
+	$(LOCAL_GHC_PKG05b) list
+	$(LOCAL_GHC_PKG05b) expose testpkg-2.0
+	$(LOCAL_GHC_PKG05b) hide   testpkg-2.0
+	if $(LOCAL_GHC_PKG05b) unregister testpkg-2.0; then false; else true; fi
+	$(LOCAL_GHC_PKG05b) unregister testpkg-3.0
+	$(LOCAL_GHC_PKG05b) unregister testpkg-2.0
+
+# Test for #2330: reject duplicate dependencies
+PKGCONF06=local06.package.conf
+LOCAL_GHC_PKG06 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF06)
+
+ghcpkg06 :
+	rm -rf $(PKGCONF06)
+	$(LOCAL_GHC_PKG06) init $(PKGCONF06)
+	$(LOCAL_GHC_PKG06) register --force test.pkg >/dev/null 2>&1 
+	if $(LOCAL_GHC_PKG06) register testdup.pkg; then false else true; fi
+	$(LOCAL_GHC_PKG06) register --force testdup.pkg
+
+PKGCONF1750=local1750.package.conf
+LOCAL_GHC_PKG1750 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF1750)
+
+1750:
+	rm -rf $(PKGCONF1750) 1750.hs 1750.o 1750.hi 1750.out
+	$(LOCAL_GHC_PKG1750) init $(PKGCONF1750)
+	$(LOCAL_GHC_PKG1750) register --force 1750A.pkg >1750.out 2>&1
+	$(LOCAL_GHC_PKG1750) register --force 1750B.pkg >1750.out 2>&1
+	GHC_PACKAGE_PATH=$(PKGCONF1750) '$(GHC_PKG)' --no-user-package-conf list
+# GHC_PACKAGE_PATH trick is to make this work with 6.8.2 which doesn't have
+# the patch "Change the command-line semantics for query commands" to
+# ghc-pkg
+	echo "main = return ()" >1750.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(PKGCONF1750) -package 1750A 1750.hs || true
+
+PKGCONFSHADOW1=localshadow1.package.conf
+PKGCONFSHADOW2=localshadow2.package.conf
+LOCAL_GHC_PKGSHADOW1 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONFSHADOW1)
+LOCAL_GHC_PKGSHADOW2 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONFSHADOW2)
+LOCAL_GHC_PKGSHADOW3 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONFSHADOW1) -f $(PKGCONFSHADOW2)
+
+# Test package shadowing behaviour.
+#
+#     localshadow1.package.conf:  shadowdep-1-XXX <- shadow-1-XXX
+#     localshadow2.package.conf:                     shadow-1-YYY
+# 
+# shadow-1-XXX will be shadowed by shadow-1-YYY, thus invalidating
+# shadowdep-1-XXX.
+shadow:
+	rm -rf $(PKGCONFSHADOW1) $(PKGCONFSHADOW2) shadow.hs shadow.o shadow.hi shadow.out shadow.hs shadow.hi
+	$(LOCAL_GHC_PKGSHADOW1) init $(PKGCONFSHADOW1)
+	$(LOCAL_GHC_PKGSHADOW2) init $(PKGCONFSHADOW2)
+	$(LOCAL_GHC_PKGSHADOW1) register --force shadow1.pkg >shadow1.out 2>&1
+	$(LOCAL_GHC_PKGSHADOW1) register --force shadow2.pkg >shadow2.out 2>&1
+	$(LOCAL_GHC_PKGSHADOW2) register --force shadow3.pkg >shadow3.out 2>&1
+	$(LOCAL_GHC_PKGSHADOW3) list
+	echo "main = return ()" >shadow.hs
+# 
+# In this test, shadow-1-XXX is shadowed by shadow-1-YYY, which causes
+# shadowdep-1-XXX to be unavailable:
+#
+	@echo "should FAIL:"
+	'$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(PKGCONFSHADOW1) -package-conf $(PKGCONFSHADOW2) -package shadowdep -c shadow.hs -fno-code || true
+# 
+# Reversing the order of the package.conf files should fix the problem:
+#
+	@echo "should SUCCEED:"
+	'$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(PKGCONFSHADOW2) -package-conf $(PKGCONFSHADOW1) -package shadowdep -c shadow.hs -fno-code || true
+#
+# We can also fix the problem by using an explicit -package-id flag to
+# specify a package we really want to use:
+#
+	@echo "should SUCCEED:"
+	'$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(PKGCONFSHADOW1) -package-conf $(PKGCONFSHADOW2) -package-id shadowdep-1-XXX -c shadow.hs -fno-code
+
+
+# -----------------------------------------------------------------------------
+# Try piping the output of "ghc-pkg describe" into "ghc-pkg update" for
+# every package we know about.  This is for testing the pretty printing/parsing
+# of InstalledPackageInfo.
+
+PACKAGE_CONF_ghcpkg02 = package.conf.ghcpkg02
+GHC_PKG_ghcpkg02 = '$(GHC_PKG)' --no-user-package-conf --global-conf=$(PACKAGE_CONF_ghcpkg02)
+
+ghcpkg02:
+	rm -rf $(PACKAGE_CONF_ghcpkg02)
+	$(GHC_PKG_ghcpkg02) init $(PACKAGE_CONF_ghcpkg02)
+	set -e; \
+	for i in `$(GHC_PKG) list --global --simple-output -v0`; do \
+		echo Updating $$i; \
+		$(GHC_PKG) describe --global $$i | $(GHC_PKG_ghcpkg02) update --global --force -; \
+	done
diff --git a/testsuite/tests/ghc-regress/cabal/all.T b/testsuite/tests/cabal/all.T
index 2ec0fa8ff7..2ec0fa8ff7 100644
--- a/testsuite/tests/ghc-regress/cabal/all.T
+++ b/testsuite/tests/cabal/all.T
diff --git a/testsuite/tests/ghc-regress/cabal/cabal01/A.hs b/testsuite/tests/cabal/cabal01/A.hs
index c5227050f9..c5227050f9 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal01/A.hs
+++ b/testsuite/tests/cabal/cabal01/A.hs
diff --git a/testsuite/tests/ghc-regress/cabal/cabal01/B/A.hs b/testsuite/tests/cabal/cabal01/B/A.hs
index 3e1183b315..3e1183b315 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal01/B/A.hs
+++ b/testsuite/tests/cabal/cabal01/B/A.hs
diff --git a/testsuite/tests/ghc-regress/cabal/cabal01/B/MainB.hs b/testsuite/tests/cabal/cabal01/B/MainB.hs
index 823fb19c43..823fb19c43 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal01/B/MainB.hs
+++ b/testsuite/tests/cabal/cabal01/B/MainB.hs
diff --git a/testsuite/tests/ghc-regress/cabal/cabal01/MainA.hs b/testsuite/tests/cabal/cabal01/MainA.hs
index 823fb19c43..823fb19c43 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal01/MainA.hs
+++ b/testsuite/tests/cabal/cabal01/MainA.hs
diff --git a/testsuite/tests/cabal/cabal01/Makefile b/testsuite/tests/cabal/cabal01/Makefile
new file mode 100644
index 0000000000..5217d89cc1
--- /dev/null
+++ b/testsuite/tests/cabal/cabal01/Makefile
@@ -0,0 +1,41 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+clean:
+	rm -rf setup a.out dist/build/testA
+	rm -rf ,tmp dist ,tmp2
+	find . -name "*.o" |xargs rm -f
+	find . -name "*.hi" |xargs rm -f
+	rm -fr install-tmp
+	rm -fr install
+	rm -f .setup-config .installed-pkg-config
+	rm -rf local.db
+
+# We use the global package database as there's no easy way to tell
+# ghc-pkg (via Cabal) to use one in ., and the global one at least
+# won't affect the installed GHC and is more likely to work
+
+PREFIX := $(abspath install)
+$(eval $(call canonicalise,PREFIX))
+
+cabal01:
+	$(MAKE) clean
+	'$(TEST_HC)' --make -o setup Setup.lhs -v0
+
+	'$(GHC_PKG)' init local.db
+	./setup configure -v0 --prefix=$(PREFIX) --with-compiler='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --with-hc-pkg='$(GHC_PKG)' --package-db=local.db $(PROF)
+	./setup build -v0
+	./setup copy -v0
+	echo install1:
+	ls -1 install
+	rm -r install
+#	install w/ register!
+	./setup install -v0
+	echo install2:
+	ls -1 install
+	./setup sdist -v0
+	echo dist:
+	ls -1 dist
+	if [ "$(CLEANUP)" != "" ]; then $(MAKE) clean; fi
+
diff --git a/testsuite/tests/ghc-regress/cabal/cabal01/Setup.lhs b/testsuite/tests/cabal/cabal01/Setup.lhs
index b2dccbe310..b2dccbe310 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal01/Setup.lhs
+++ b/testsuite/tests/cabal/cabal01/Setup.lhs
diff --git a/testsuite/tests/ghc-regress/cabal/cabal01/all.T b/testsuite/tests/cabal/cabal01/all.T
index 299b0b8a06..299b0b8a06 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal01/all.T
+++ b/testsuite/tests/cabal/cabal01/all.T
diff --git a/testsuite/tests/ghc-regress/cabal/cabal01/c_src/hello.c b/testsuite/tests/cabal/cabal01/c_src/hello.c
index 2ae1c276eb..2ae1c276eb 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal01/c_src/hello.c
+++ b/testsuite/tests/cabal/cabal01/c_src/hello.c
diff --git a/testsuite/tests/ghc-regress/cabal/cabal01/cabal01.stdout b/testsuite/tests/cabal/cabal01/cabal01.stdout
index e828cbe68a..e828cbe68a 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal01/cabal01.stdout
+++ b/testsuite/tests/cabal/cabal01/cabal01.stdout
diff --git a/testsuite/tests/ghc-regress/cabal/cabal01/cabal01.stdout-i386-unknown-mingw32 b/testsuite/tests/cabal/cabal01/cabal01.stdout-i386-unknown-mingw32
index 647a2324b0..647a2324b0 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal01/cabal01.stdout-i386-unknown-mingw32
+++ b/testsuite/tests/cabal/cabal01/cabal01.stdout-i386-unknown-mingw32
diff --git a/testsuite/tests/ghc-regress/cabal/cabal01/hello.c b/testsuite/tests/cabal/cabal01/hello.c
index de051f6f6b..de051f6f6b 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal01/hello.c
+++ b/testsuite/tests/cabal/cabal01/hello.c
diff --git a/testsuite/tests/ghc-regress/cabal/cabal01/test.cabal b/testsuite/tests/cabal/cabal01/test.cabal
index f49d8742da..f49d8742da 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal01/test.cabal
+++ b/testsuite/tests/cabal/cabal01/test.cabal
diff --git a/testsuite/tests/cabal/cabal02/Makefile b/testsuite/tests/cabal/cabal02/Makefile
new file mode 100644
index 0000000000..c7348a3927
--- /dev/null
+++ b/testsuite/tests/cabal/cabal02/Makefile
@@ -0,0 +1,33 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+CABAL_SETUP = $(FPTOOLS_TOP_ABS)/libraries/Cabal/cabal-setup/cabal-setup
+
+CONFIG_ARGS = --with-compiler=$(TEST_HC) --ghc-options='$(TEST_HC_OPTS)' --with-hc-pkg=$(GHC_PKG)
+
+# We have 3 packages, P-1.0, P-2.0, and Q.  Q depends on P-1.0.
+# We have an executable R, that depends on P-2.0 and Q, so the resulting
+# executable will link to both P-1.0 and P-2.0.
+
+cabal02 : 
+	(cd P1 && $(CABAL_SETUP) configure $(CONFIG_ARGS))
+	(cd P1 && $(CABAL_SETUP) build)
+	(cd P1 && $(CABAL_SETUP) register --inplace --user)
+	(cd P2 && $(CABAL_SETUP) configure $(CONFIG_ARGS))
+	(cd P2 && $(CABAL_SETUP) build)
+	(cd P2 && $(CABAL_SETUP) register --inplace --user)
+	(cd Q  && $(CABAL_SETUP) configure $(CONFIG_ARGS))
+	(cd Q  && $(CABAL_SETUP) build)
+	(cd Q  && $(CABAL_SETUP) register --inplace --user)
+	(cd R  && $(CABAL_SETUP) configure $(CONFIG_ARGS))
+	(cd R  && $(CABAL_SETUP) build)
+	$(MAKE) clean
+
+clean ::
+	(cd P1 && $(CABAL_SETUP) unregister --user)
+	(cd P2 && $(CABAL_SETUP) unregister --user)
+	(cd Q  && $(CABAL_SETUP) unregister --user)
+	(cd P1 && $(CABAL_SETUP) clean)
+	(cd P2 && $(CABAL_SETUP) clean)
+	(cd Q  && $(CABAL_SETUP) clean)
diff --git a/testsuite/tests/ghc-regress/cabal/cabal02/P1/A.hs b/testsuite/tests/cabal/cabal02/P1/A.hs
index 411d1dd4ef..411d1dd4ef 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal02/P1/A.hs
+++ b/testsuite/tests/cabal/cabal02/P1/A.hs
diff --git a/testsuite/tests/ghc-regress/cabal/cabal02/P1/P1.cabal b/testsuite/tests/cabal/cabal02/P1/P1.cabal
index c4b2161cea..c4b2161cea 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal02/P1/P1.cabal
+++ b/testsuite/tests/cabal/cabal02/P1/P1.cabal
diff --git a/testsuite/tests/ghc-regress/cabal/cabal02/P2/A.hs b/testsuite/tests/cabal/cabal02/P2/A.hs
index 3db5ca96ef..3db5ca96ef 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal02/P2/A.hs
+++ b/testsuite/tests/cabal/cabal02/P2/A.hs
diff --git a/testsuite/tests/ghc-regress/cabal/cabal02/P2/P2.cabal b/testsuite/tests/cabal/cabal02/P2/P2.cabal
index 3991b20839..3991b20839 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal02/P2/P2.cabal
+++ b/testsuite/tests/cabal/cabal02/P2/P2.cabal
diff --git a/testsuite/tests/ghc-regress/cabal/cabal02/Q/B.hs b/testsuite/tests/cabal/cabal02/Q/B.hs
index 0fd13a9ff3..0fd13a9ff3 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal02/Q/B.hs
+++ b/testsuite/tests/cabal/cabal02/Q/B.hs
diff --git a/testsuite/tests/ghc-regress/cabal/cabal02/Q/Q.cabal b/testsuite/tests/cabal/cabal02/Q/Q.cabal
index e439f49175..e439f49175 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal02/Q/Q.cabal
+++ b/testsuite/tests/cabal/cabal02/Q/Q.cabal
diff --git a/testsuite/tests/ghc-regress/cabal/cabal02/R/Main.hs b/testsuite/tests/cabal/cabal02/R/Main.hs
index a6ddcdf6c1..a6ddcdf6c1 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal02/R/Main.hs
+++ b/testsuite/tests/cabal/cabal02/R/Main.hs
diff --git a/testsuite/tests/ghc-regress/cabal/cabal02/R/R.cabal b/testsuite/tests/cabal/cabal02/R/R.cabal
index 73c6bfc881..73c6bfc881 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal02/R/R.cabal
+++ b/testsuite/tests/cabal/cabal02/R/R.cabal
diff --git a/testsuite/tests/ghc-regress/cabal/cabal02/all.T b/testsuite/tests/cabal/cabal02/all.T
index bfa809109b..bfa809109b 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal02/all.T
+++ b/testsuite/tests/cabal/cabal02/all.T
diff --git a/testsuite/tests/cabal/cabal03/Makefile b/testsuite/tests/cabal/cabal03/Makefile
new file mode 100644
index 0000000000..f87212f349
--- /dev/null
+++ b/testsuite/tests/cabal/cabal03/Makefile
@@ -0,0 +1,41 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+# SETUP=../Setup
+SETUP=../Setup -v0
+
+# This test is for overlapping/shadowing packages with Cabal.  We
+#   1. install p-1.0 to the global DB
+#   2. install q-1.0 (depending on p-1.0) to a temporary DB
+#   3. install a differnet p-1.0 to the temp DB
+#   4. attempt to configure and buidl r, which depends on p-1.0 and q-1.0
+#
+# step 4 will elicit a warning from Cabal's configure step that the
+# packages are inconsistent, and will cause an error from GHC.
+# Currently the error message from GHC is swallowed by Cabal.
+
+cabal03: clean
+	$(MAKE) clean
+	'$(GHC_PKG)' init tmp.d
+	'$(TEST_HC)' -v0 --make Setup
+	cd p && $(SETUP) clean
+	cd p && $(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --disable-optimisation --ghc-pkg-option=--force
+	cd p && $(SETUP) build
+	cd p && $(SETUP) register
+	cd q && $(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --ghc-pkg-option=--force
+	cd q && $(SETUP) build
+	cd q && $(SETUP) register
+	cd p && $(SETUP) clean
+	cd p && $(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --ghc-pkg-option=--force
+	cd p && $(SETUP) build
+	cd p && $(SETUP) register
+	cd r && ! ../Setup configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --ghc-pkg-option=--force
+ifneq "$(CLEANUP)" ""
+	$(MAKE) clean
+endif
+
+clean :
+	'$(GHC_PKG)' unregister --force p >/dev/null 2>&1 || true
+	'$(GHC_PKG)' unregister --force q >/dev/null 2>&1 || true
+	$(RM) -r tmp.d *.o *.hi */*.o */*.hi */Setup$(exeext) */dist Setup$(exeext)
diff --git a/testsuite/tests/ghc-regress/cabal/cabal03/Setup.lhs b/testsuite/tests/cabal/cabal03/Setup.lhs
index b2dccbe310..b2dccbe310 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal03/Setup.lhs
+++ b/testsuite/tests/cabal/cabal03/Setup.lhs
diff --git a/testsuite/tests/ghc-regress/cabal/cabal03/all.T b/testsuite/tests/cabal/cabal03/all.T
index 01d3882a84..01d3882a84 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal03/all.T
+++ b/testsuite/tests/cabal/cabal03/all.T
diff --git a/testsuite/tests/ghc-regress/cabal/cabal03/p/P.hs b/testsuite/tests/cabal/cabal03/p/P.hs
index 801fa390bd..801fa390bd 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal03/p/P.hs
+++ b/testsuite/tests/cabal/cabal03/p/P.hs
diff --git a/testsuite/tests/ghc-regress/cabal/cabal03/p/p.cabal b/testsuite/tests/cabal/cabal03/p/p.cabal
index 5ef93a0b92..5ef93a0b92 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal03/p/p.cabal
+++ b/testsuite/tests/cabal/cabal03/p/p.cabal
diff --git a/testsuite/tests/ghc-regress/cabal/cabal03/q/q.cabal b/testsuite/tests/cabal/cabal03/q/q.cabal
index 691e60b623..691e60b623 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal03/q/q.cabal
+++ b/testsuite/tests/cabal/cabal03/q/q.cabal
diff --git a/testsuite/tests/ghc-regress/cabal/cabal03/r/r.cabal b/testsuite/tests/cabal/cabal03/r/r.cabal
index b874bb4e15..b874bb4e15 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal03/r/r.cabal
+++ b/testsuite/tests/cabal/cabal03/r/r.cabal
diff --git a/testsuite/tests/ghc-regress/cabal/cabal04/Library.hs b/testsuite/tests/cabal/cabal04/Library.hs
index e21ed20bdf..e21ed20bdf 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal04/Library.hs
+++ b/testsuite/tests/cabal/cabal04/Library.hs
diff --git a/testsuite/tests/cabal/cabal04/Makefile b/testsuite/tests/cabal/cabal04/Makefile
new file mode 100644
index 0000000000..dbdf30745f
--- /dev/null
+++ b/testsuite/tests/cabal/cabal04/Makefile
@@ -0,0 +1,23 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+SETUP=./Setup -v0
+
+# This tests that we can build a Cabal package that uses TH with both
+# profiling and dynamic linking. (#3604)
+
+cabal04:
+	$(MAKE) clean
+	'$(TEST_HC)' -v0 --make Setup
+	$(SETUP) clean
+	$(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' $(PROF) $(DYN)
+	$(SETUP) build 2> err
+	! grep -v "Creating library file" err
+ifneq "$(CLEANUP)" ""
+	$(MAKE) clean
+endif
+
+clean :
+	$(RM) -r *.o *.hi dist Setup$(exeext) err
+
diff --git a/testsuite/tests/ghc-regress/cabal/cabal04/Setup.lhs b/testsuite/tests/cabal/cabal04/Setup.lhs
index b2dccbe310..b2dccbe310 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal04/Setup.lhs
+++ b/testsuite/tests/cabal/cabal04/Setup.lhs
diff --git a/testsuite/tests/ghc-regress/cabal/cabal04/TH.hs b/testsuite/tests/cabal/cabal04/TH.hs
index 8719c7d550..8719c7d550 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal04/TH.hs
+++ b/testsuite/tests/cabal/cabal04/TH.hs
diff --git a/testsuite/tests/ghc-regress/cabal/cabal04/all.T b/testsuite/tests/cabal/cabal04/all.T
index 81c11f12b5..81c11f12b5 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal04/all.T
+++ b/testsuite/tests/cabal/cabal04/all.T
diff --git a/testsuite/tests/ghc-regress/cabal/cabal04/thtest.cabal b/testsuite/tests/cabal/cabal04/thtest.cabal
index 73d63ca236..73d63ca236 100644
--- a/testsuite/tests/ghc-regress/cabal/cabal04/thtest.cabal
+++ b/testsuite/tests/cabal/cabal04/thtest.cabal
diff --git a/testsuite/tests/ghc-regress/cabal/ghcpkg01.stderr b/testsuite/tests/cabal/ghcpkg01.stderr
index 585c7aaa83..585c7aaa83 100644
--- a/testsuite/tests/ghc-regress/cabal/ghcpkg01.stderr
+++ b/testsuite/tests/cabal/ghcpkg01.stderr
diff --git a/testsuite/tests/ghc-regress/cabal/ghcpkg01.stdout b/testsuite/tests/cabal/ghcpkg01.stdout
index fb3ecdf6e8..fb3ecdf6e8 100644
--- a/testsuite/tests/ghc-regress/cabal/ghcpkg01.stdout
+++ b/testsuite/tests/cabal/ghcpkg01.stdout
diff --git a/testsuite/tests/ghc-regress/cabal/ghcpkg03.stderr b/testsuite/tests/cabal/ghcpkg03.stderr
index f30d7fd1e8..f30d7fd1e8 100644
--- a/testsuite/tests/ghc-regress/cabal/ghcpkg03.stderr
+++ b/testsuite/tests/cabal/ghcpkg03.stderr
diff --git a/testsuite/tests/ghc-regress/cabal/ghcpkg03.stderr-i386-unknown-mingw32 b/testsuite/tests/cabal/ghcpkg03.stderr-i386-unknown-mingw32
index 71ff88a16b..71ff88a16b 100644
--- a/testsuite/tests/ghc-regress/cabal/ghcpkg03.stderr-i386-unknown-mingw32
+++ b/testsuite/tests/cabal/ghcpkg03.stderr-i386-unknown-mingw32
diff --git a/testsuite/tests/ghc-regress/cabal/ghcpkg03.stdout b/testsuite/tests/cabal/ghcpkg03.stdout
index 9f148b82e4..9f148b82e4 100644
--- a/testsuite/tests/ghc-regress/cabal/ghcpkg03.stdout
+++ b/testsuite/tests/cabal/ghcpkg03.stdout
diff --git a/testsuite/tests/ghc-regress/cabal/ghcpkg04.hs b/testsuite/tests/cabal/ghcpkg04.hs
index 9da260a695..9da260a695 100644
--- a/testsuite/tests/ghc-regress/cabal/ghcpkg04.hs
+++ b/testsuite/tests/cabal/ghcpkg04.hs
diff --git a/testsuite/tests/ghc-regress/cabal/ghcpkg04.stderr b/testsuite/tests/cabal/ghcpkg04.stderr
index 29a912b991..29a912b991 100644
--- a/testsuite/tests/ghc-regress/cabal/ghcpkg04.stderr
+++ b/testsuite/tests/cabal/ghcpkg04.stderr
diff --git a/testsuite/tests/ghc-regress/cabal/ghcpkg05.stderr b/testsuite/tests/cabal/ghcpkg05.stderr
index 5d30ba0381..5d30ba0381 100644
--- a/testsuite/tests/ghc-regress/cabal/ghcpkg05.stderr
+++ b/testsuite/tests/cabal/ghcpkg05.stderr
diff --git a/testsuite/tests/ghc-regress/cabal/ghcpkg05.stderr-i386-unknown-mingw32 b/testsuite/tests/cabal/ghcpkg05.stderr-i386-unknown-mingw32
index 360783bd78..360783bd78 100644
--- a/testsuite/tests/ghc-regress/cabal/ghcpkg05.stderr-i386-unknown-mingw32
+++ b/testsuite/tests/cabal/ghcpkg05.stderr-i386-unknown-mingw32
diff --git a/testsuite/tests/ghc-regress/cabal/ghcpkg05.stdout b/testsuite/tests/cabal/ghcpkg05.stdout
index f89d332351..f89d332351 100644
--- a/testsuite/tests/ghc-regress/cabal/ghcpkg05.stdout
+++ b/testsuite/tests/cabal/ghcpkg05.stdout
diff --git a/testsuite/tests/ghc-regress/cabal/ghcpkg06.stderr b/testsuite/tests/cabal/ghcpkg06.stderr
index d33eef7b8e..d33eef7b8e 100644
--- a/testsuite/tests/ghc-regress/cabal/ghcpkg06.stderr
+++ b/testsuite/tests/cabal/ghcpkg06.stderr
diff --git a/testsuite/tests/ghc-regress/cabal/ghcpkg06.stdout b/testsuite/tests/cabal/ghcpkg06.stdout
index 3bc1858b6a..3bc1858b6a 100644
--- a/testsuite/tests/ghc-regress/cabal/ghcpkg06.stdout
+++ b/testsuite/tests/cabal/ghcpkg06.stdout
diff --git a/testsuite/tests/ghc-regress/cabal/pkg01.hs b/testsuite/tests/cabal/pkg01.hs
index b06b8e0276..b06b8e0276 100644
--- a/testsuite/tests/ghc-regress/cabal/pkg01.hs
+++ b/testsuite/tests/cabal/pkg01.hs
diff --git a/testsuite/tests/ghc-regress/cabal/pkg01.stderr b/testsuite/tests/cabal/pkg01.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/cabal/pkg01.stderr
+++ b/testsuite/tests/cabal/pkg01.stderr
diff --git a/testsuite/tests/ghc-regress/cabal/pkg02/A.hs b/testsuite/tests/cabal/pkg02/A.hs
index fa288c35e6..fa288c35e6 100644
--- a/testsuite/tests/ghc-regress/cabal/pkg02/A.hs
+++ b/testsuite/tests/cabal/pkg02/A.hs
diff --git a/testsuite/tests/ghc-regress/cabal/pkg02/Foreign.hs b/testsuite/tests/cabal/pkg02/Foreign.hs
index 3970ce1896..3970ce1896 100644
--- a/testsuite/tests/ghc-regress/cabal/pkg02/Foreign.hs
+++ b/testsuite/tests/cabal/pkg02/Foreign.hs
diff --git a/testsuite/tests/cabal/pkg02/Makefile b/testsuite/tests/cabal/pkg02/Makefile
new file mode 100644
index 0000000000..4a268530f1
--- /dev/null
+++ b/testsuite/tests/cabal/pkg02/Makefile
@@ -0,0 +1,4 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
diff --git a/testsuite/tests/ghc-regress/cabal/pkg02/all.T b/testsuite/tests/cabal/pkg02/all.T
index b3dfecc0b5..b3dfecc0b5 100644
--- a/testsuite/tests/ghc-regress/cabal/pkg02/all.T
+++ b/testsuite/tests/cabal/pkg02/all.T
diff --git a/testsuite/tests/ghc-regress/cabal/pkg02/pkg02.stderr b/testsuite/tests/cabal/pkg02/pkg02.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/cabal/pkg02/pkg02.stderr
+++ b/testsuite/tests/cabal/pkg02/pkg02.stderr
diff --git a/testsuite/tests/ghc-regress/cabal/shadow.stderr b/testsuite/tests/cabal/shadow.stderr
index a0a38cde22..a0a38cde22 100644
--- a/testsuite/tests/ghc-regress/cabal/shadow.stderr
+++ b/testsuite/tests/cabal/shadow.stderr
diff --git a/testsuite/tests/ghc-regress/cabal/shadow.stdout b/testsuite/tests/cabal/shadow.stdout
index 0d14e9cb8a..0d14e9cb8a 100644
--- a/testsuite/tests/ghc-regress/cabal/shadow.stdout
+++ b/testsuite/tests/cabal/shadow.stdout
diff --git a/testsuite/tests/ghc-regress/cabal/shadow1.pkg b/testsuite/tests/cabal/shadow1.pkg
index 7bf047f3d2..7bf047f3d2 100644
--- a/testsuite/tests/ghc-regress/cabal/shadow1.pkg
+++ b/testsuite/tests/cabal/shadow1.pkg
diff --git a/testsuite/tests/ghc-regress/cabal/shadow2.pkg b/testsuite/tests/cabal/shadow2.pkg
index b720dc9479..b720dc9479 100644
--- a/testsuite/tests/ghc-regress/cabal/shadow2.pkg
+++ b/testsuite/tests/cabal/shadow2.pkg
diff --git a/testsuite/tests/ghc-regress/cabal/shadow3.pkg b/testsuite/tests/cabal/shadow3.pkg
index 933ed3f67d..933ed3f67d 100644
--- a/testsuite/tests/ghc-regress/cabal/shadow3.pkg
+++ b/testsuite/tests/cabal/shadow3.pkg
diff --git a/testsuite/tests/ghc-regress/cabal/test.pkg b/testsuite/tests/cabal/test.pkg
index 02a07ab7b6..02a07ab7b6 100644
--- a/testsuite/tests/ghc-regress/cabal/test.pkg
+++ b/testsuite/tests/cabal/test.pkg
diff --git a/testsuite/tests/ghc-regress/cabal/test2.pkg b/testsuite/tests/cabal/test2.pkg
index a6d28d629a..a6d28d629a 100644
--- a/testsuite/tests/ghc-regress/cabal/test2.pkg
+++ b/testsuite/tests/cabal/test2.pkg
diff --git a/testsuite/tests/ghc-regress/cabal/test3.pkg b/testsuite/tests/cabal/test3.pkg
index 6d3257126b..6d3257126b 100644
--- a/testsuite/tests/ghc-regress/cabal/test3.pkg
+++ b/testsuite/tests/cabal/test3.pkg
diff --git a/testsuite/tests/ghc-regress/cabal/test4.pkg b/testsuite/tests/cabal/test4.pkg
index 598559a80f..598559a80f 100644
--- a/testsuite/tests/ghc-regress/cabal/test4.pkg
+++ b/testsuite/tests/cabal/test4.pkg
diff --git a/testsuite/tests/ghc-regress/cabal/test5.pkg b/testsuite/tests/cabal/test5.pkg
index fc27bc9ba5..fc27bc9ba5 100644
--- a/testsuite/tests/ghc-regress/cabal/test5.pkg
+++ b/testsuite/tests/cabal/test5.pkg
diff --git a/testsuite/tests/ghc-regress/cabal/testdup.pkg b/testsuite/tests/cabal/testdup.pkg
index 77000eda27..77000eda27 100644
--- a/testsuite/tests/ghc-regress/cabal/testdup.pkg
+++ b/testsuite/tests/cabal/testdup.pkg
diff --git a/testsuite/tests/codeGen/Makefile b/testsuite/tests/codeGen/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/codeGen/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/1916.hs b/testsuite/tests/codeGen/should_compile/1916.hs
index 7210aaf41c..7210aaf41c 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/1916.hs
+++ b/testsuite/tests/codeGen/should_compile/1916.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/2388.hs b/testsuite/tests/codeGen/should_compile/2388.hs
index f3364f5b6e..f3364f5b6e 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/2388.hs
+++ b/testsuite/tests/codeGen/should_compile/2388.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/2578.hs b/testsuite/tests/codeGen/should_compile/2578.hs
index c851b54f88..c851b54f88 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/2578.hs
+++ b/testsuite/tests/codeGen/should_compile/2578.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/3132.hs b/testsuite/tests/codeGen/should_compile/3132.hs
index c6aa2579e9..c6aa2579e9 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/3132.hs
+++ b/testsuite/tests/codeGen/should_compile/3132.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/3579.hs b/testsuite/tests/codeGen/should_compile/3579.hs
index 29711e147b..29711e147b 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/3579.hs
+++ b/testsuite/tests/codeGen/should_compile/3579.hs
diff --git a/testsuite/tests/codeGen/should_compile/Makefile b/testsuite/tests/codeGen/should_compile/Makefile
new file mode 100644
index 0000000000..ff43099198
--- /dev/null
+++ b/testsuite/tests/codeGen/should_compile/Makefile
@@ -0,0 +1,7 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+2578:
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make 2578 -fforce-recomp -v0
+
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/T3286.hs b/testsuite/tests/codeGen/should_compile/T3286.hs
index 0cc852db94..0cc852db94 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/T3286.hs
+++ b/testsuite/tests/codeGen/should_compile/T3286.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/T3286b.hs b/testsuite/tests/codeGen/should_compile/T3286b.hs
index f6c1fdbeac..f6c1fdbeac 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/T3286b.hs
+++ b/testsuite/tests/codeGen/should_compile/T3286b.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/all.T b/testsuite/tests/codeGen/should_compile/all.T
index ba29c2a145..ba29c2a145 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/all.T
+++ b/testsuite/tests/codeGen/should_compile/all.T
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/cg001.hs b/testsuite/tests/codeGen/should_compile/cg001.hs
index ad00a8f89c..ad00a8f89c 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/cg001.hs
+++ b/testsuite/tests/codeGen/should_compile/cg001.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/cg002.hs b/testsuite/tests/codeGen/should_compile/cg002.hs
index 9d655d9d12..9d655d9d12 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/cg002.hs
+++ b/testsuite/tests/codeGen/should_compile/cg002.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/cg003.hs b/testsuite/tests/codeGen/should_compile/cg003.hs
index e7cea2e0b3..e7cea2e0b3 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/cg003.hs
+++ b/testsuite/tests/codeGen/should_compile/cg003.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/cg004.hs b/testsuite/tests/codeGen/should_compile/cg004.hs
index fb8e3cc413..fb8e3cc413 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/cg004.hs
+++ b/testsuite/tests/codeGen/should_compile/cg004.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/cg005.hs b/testsuite/tests/codeGen/should_compile/cg005.hs
index a25ad4250a..a25ad4250a 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/cg005.hs
+++ b/testsuite/tests/codeGen/should_compile/cg005.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/cg006.hs b/testsuite/tests/codeGen/should_compile/cg006.hs
index 494b37937b..494b37937b 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/cg006.hs
+++ b/testsuite/tests/codeGen/should_compile/cg006.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/cg007.hs b/testsuite/tests/codeGen/should_compile/cg007.hs
index 5ef739bd47..5ef739bd47 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/cg007.hs
+++ b/testsuite/tests/codeGen/should_compile/cg007.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/cg008.hs b/testsuite/tests/codeGen/should_compile/cg008.hs
index 10099c1b48..10099c1b48 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/cg008.hs
+++ b/testsuite/tests/codeGen/should_compile/cg008.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/jmp_tbl.hs b/testsuite/tests/codeGen/should_compile/jmp_tbl.hs
index 56904ed7a1..56904ed7a1 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/jmp_tbl.hs
+++ b/testsuite/tests/codeGen/should_compile/jmp_tbl.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/massive_array.hs b/testsuite/tests/codeGen/should_compile/massive_array.hs
index a9db12bc4c..a9db12bc4c 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/massive_array.hs
+++ b/testsuite/tests/codeGen/should_compile/massive_array.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/1852.hs b/testsuite/tests/codeGen/should_run/1852.hs
index f5d9370741..f5d9370741 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/1852.hs
+++ b/testsuite/tests/codeGen/should_run/1852.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/1852.stdout b/testsuite/tests/codeGen/should_run/1852.stdout
index 8adb9bb604..8adb9bb604 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/1852.stdout
+++ b/testsuite/tests/codeGen/should_run/1852.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/1861.hs b/testsuite/tests/codeGen/should_run/1861.hs
index b6136f4ea2..b6136f4ea2 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/1861.hs
+++ b/testsuite/tests/codeGen/should_run/1861.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/1861.stdout b/testsuite/tests/codeGen/should_run/1861.stdout
index 06eb4d10ee..06eb4d10ee 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/1861.stdout
+++ b/testsuite/tests/codeGen/should_run/1861.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/2080.hs b/testsuite/tests/codeGen/should_run/2080.hs
index a1baf757f5..a1baf757f5 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/2080.hs
+++ b/testsuite/tests/codeGen/should_run/2080.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/2080.stdout b/testsuite/tests/codeGen/should_run/2080.stdout
index bc59c12aa1..bc59c12aa1 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/2080.stdout
+++ b/testsuite/tests/codeGen/should_run/2080.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/2838.hs b/testsuite/tests/codeGen/should_run/2838.hs
index 0933c1203e..0933c1203e 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/2838.hs
+++ b/testsuite/tests/codeGen/should_run/2838.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/2838.stdout b/testsuite/tests/codeGen/should_run/2838.stdout
index 573541ac97..573541ac97 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/2838.stdout
+++ b/testsuite/tests/codeGen/should_run/2838.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/2838.stdout-ws-64 b/testsuite/tests/codeGen/should_run/2838.stdout-ws-64
index 1862ace676..1862ace676 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/2838.stdout-ws-64
+++ b/testsuite/tests/codeGen/should_run/2838.stdout-ws-64
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/3207.hs b/testsuite/tests/codeGen/should_run/3207.hs
index 4738fca343..4738fca343 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/3207.hs
+++ b/testsuite/tests/codeGen/should_run/3207.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/3207.stdout b/testsuite/tests/codeGen/should_run/3207.stdout
index 6a452c185a..6a452c185a 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/3207.stdout
+++ b/testsuite/tests/codeGen/should_run/3207.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/3561.hs b/testsuite/tests/codeGen/should_run/3561.hs
index 44258a839c..44258a839c 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/3561.hs
+++ b/testsuite/tests/codeGen/should_run/3561.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/3561.stdout b/testsuite/tests/codeGen/should_run/3561.stdout
index 7ed6ff82de..7ed6ff82de 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/3561.stdout
+++ b/testsuite/tests/codeGen/should_run/3561.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/3677.hs b/testsuite/tests/codeGen/should_run/3677.hs
index 67b12b2672..67b12b2672 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/3677.hs
+++ b/testsuite/tests/codeGen/should_run/3677.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/3677.stdout b/testsuite/tests/codeGen/should_run/3677.stdout
index 53b22189de..53b22189de 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/3677.stdout
+++ b/testsuite/tests/codeGen/should_run/3677.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/4441.hs b/testsuite/tests/codeGen/should_run/4441.hs
index ee96170af8..ee96170af8 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/4441.hs
+++ b/testsuite/tests/codeGen/should_run/4441.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/4441.stdout b/testsuite/tests/codeGen/should_run/4441.stdout
index 865b73fb17..865b73fb17 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/4441.stdout
+++ b/testsuite/tests/codeGen/should_run/4441.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/5129.hs b/testsuite/tests/codeGen/should_run/5129.hs
index 6bc1912754..6bc1912754 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/5129.hs
+++ b/testsuite/tests/codeGen/should_run/5129.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/5149.hs b/testsuite/tests/codeGen/should_run/5149.hs
index c0c88e3015..c0c88e3015 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/5149.hs
+++ b/testsuite/tests/codeGen/should_run/5149.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/5149.stdout b/testsuite/tests/codeGen/should_run/5149.stdout
index d00491fd7e..d00491fd7e 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/5149.stdout
+++ b/testsuite/tests/codeGen/should_run/5149.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/5149_cmm.cmm b/testsuite/tests/codeGen/should_run/5149_cmm.cmm
index b1e3dd6c43..b1e3dd6c43 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/5149_cmm.cmm
+++ b/testsuite/tests/codeGen/should_run/5149_cmm.cmm
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/Cgrun067A.hs b/testsuite/tests/codeGen/should_run/Cgrun067A.hs
index 96e944ed25..96e944ed25 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/Cgrun067A.hs
+++ b/testsuite/tests/codeGen/should_run/Cgrun067A.hs
diff --git a/testsuite/tests/codeGen/should_run/Makefile b/testsuite/tests/codeGen/should_run/Makefile
new file mode 100644
index 0000000000..4a268530f1
--- /dev/null
+++ b/testsuite/tests/codeGen/should_run/Makefile
@@ -0,0 +1,4 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T
index f4a5dc66af..f4a5dc66af 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/all.T
+++ b/testsuite/tests/codeGen/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun001.hs b/testsuite/tests/codeGen/should_run/cgrun001.hs
index 5482f13127..5482f13127 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun001.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun001.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun001.stdout b/testsuite/tests/codeGen/should_run/cgrun001.stdout
index 6a0e60d48b..6a0e60d48b 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun001.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun001.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun002.hs b/testsuite/tests/codeGen/should_run/cgrun002.hs
index dddaabd66f..dddaabd66f 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun002.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun002.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun002.stdout b/testsuite/tests/codeGen/should_run/cgrun002.stdout
index d81cc0710e..d81cc0710e 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun002.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun002.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun003.hs b/testsuite/tests/codeGen/should_run/cgrun003.hs
index 47b2d9e7bf..47b2d9e7bf 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun003.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun003.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun003.stdout b/testsuite/tests/codeGen/should_run/cgrun003.stdout
index d81cc0710e..d81cc0710e 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun003.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun003.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun004.hs b/testsuite/tests/codeGen/should_run/cgrun004.hs
index 1f4a2737c3..1f4a2737c3 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun004.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun004.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun004.stdout b/testsuite/tests/codeGen/should_run/cgrun004.stdout
index ec635144f6..ec635144f6 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun004.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun004.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun005.hs b/testsuite/tests/codeGen/should_run/cgrun005.hs
index 4159d4c882..4159d4c882 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun005.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun005.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun005.stdout b/testsuite/tests/codeGen/should_run/cgrun005.stdout
index 12bd33f964..12bd33f964 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun005.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun005.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun006.hs b/testsuite/tests/codeGen/should_run/cgrun006.hs
index 609c3c2b4b..609c3c2b4b 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun006.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun006.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun006.stdout b/testsuite/tests/codeGen/should_run/cgrun006.stdout
index b1bd38b62a..b1bd38b62a 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun006.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun006.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun007.hs b/testsuite/tests/codeGen/should_run/cgrun007.hs
index 317b921a42..317b921a42 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun007.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun007.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun007.stdout b/testsuite/tests/codeGen/should_run/cgrun007.stdout
index 7ed6ff82de..7ed6ff82de 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun007.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun007.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun008.hs b/testsuite/tests/codeGen/should_run/cgrun008.hs
index 1713b4834e..1713b4834e 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun008.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun008.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun008.stdout b/testsuite/tests/codeGen/should_run/cgrun008.stdout
index 48082f72f0..48082f72f0 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun008.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun008.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun009.hs b/testsuite/tests/codeGen/should_run/cgrun009.hs
index de03fc42cd..de03fc42cd 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun009.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun009.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun009.stdout b/testsuite/tests/codeGen/should_run/cgrun009.stdout
index 7ed6ff82de..7ed6ff82de 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun009.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun009.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun010.hs b/testsuite/tests/codeGen/should_run/cgrun010.hs
index ccc323d4cf..ccc323d4cf 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun010.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun010.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun010.stdout b/testsuite/tests/codeGen/should_run/cgrun010.stdout
index 7f8f011eb7..7f8f011eb7 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun010.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun010.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun011.hs b/testsuite/tests/codeGen/should_run/cgrun011.hs
index c687e50272..c687e50272 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun011.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun011.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun011.stdout b/testsuite/tests/codeGen/should_run/cgrun011.stdout
index d81cc0710e..d81cc0710e 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun011.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun011.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun012.hs b/testsuite/tests/codeGen/should_run/cgrun012.hs
index 8fe0a869c4..8fe0a869c4 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun012.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun012.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun012.stdout b/testsuite/tests/codeGen/should_run/cgrun012.stdout
index d81cc0710e..d81cc0710e 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun012.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun012.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun013.hs b/testsuite/tests/codeGen/should_run/cgrun013.hs
index 4d2f06de6c..4d2f06de6c 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun013.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun013.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun013.stdout b/testsuite/tests/codeGen/should_run/cgrun013.stdout
index a865e6b929..a865e6b929 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun013.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun013.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun014.hs b/testsuite/tests/codeGen/should_run/cgrun014.hs
index a01c1017ad..a01c1017ad 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun014.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun014.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun014.stdout b/testsuite/tests/codeGen/should_run/cgrun014.stdout
index 6f6cbc5cba..6f6cbc5cba 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun014.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun014.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun015.hs b/testsuite/tests/codeGen/should_run/cgrun015.hs
index eba3b8ab30..eba3b8ab30 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun015.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun015.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun015.stdout b/testsuite/tests/codeGen/should_run/cgrun015.stdout
index 8c7e5a667f..8c7e5a667f 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun015.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun015.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun016.hs b/testsuite/tests/codeGen/should_run/cgrun016.hs
index ba5dd04fea..ba5dd04fea 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun016.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun016.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun016.stderr b/testsuite/tests/codeGen/should_run/cgrun016.stderr
index 03635bfa36..03635bfa36 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun016.stderr
+++ b/testsuite/tests/codeGen/should_run/cgrun016.stderr
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun016.stdout b/testsuite/tests/codeGen/should_run/cgrun016.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun016.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun016.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun017.hs b/testsuite/tests/codeGen/should_run/cgrun017.hs
index 275eb9b31b..275eb9b31b 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun017.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun017.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun017.stdout b/testsuite/tests/codeGen/should_run/cgrun017.stdout
index c5b23b39d2..c5b23b39d2 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun017.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun017.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun018.hs b/testsuite/tests/codeGen/should_run/cgrun018.hs
index 49f9800cb6..49f9800cb6 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun018.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun018.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun018.stdout b/testsuite/tests/codeGen/should_run/cgrun018.stdout
index 805ee30112..805ee30112 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun018.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun018.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun019.hs b/testsuite/tests/codeGen/should_run/cgrun019.hs
index 242ea3b4df..242ea3b4df 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun019.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun019.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun019.stdout b/testsuite/tests/codeGen/should_run/cgrun019.stdout
index 9ed4dbb21c..9ed4dbb21c 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun019.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun019.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun020.hs b/testsuite/tests/codeGen/should_run/cgrun020.hs
index 9f4b7c64e1..9f4b7c64e1 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun020.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun020.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun020.stdout b/testsuite/tests/codeGen/should_run/cgrun020.stdout
index 3a2e3f4984..3a2e3f4984 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun020.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun020.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun021.hs b/testsuite/tests/codeGen/should_run/cgrun021.hs
index 190f8dd155..190f8dd155 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun021.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun021.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun021.stdout b/testsuite/tests/codeGen/should_run/cgrun021.stdout
index 17203effa1..17203effa1 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun021.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun021.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun022.hs b/testsuite/tests/codeGen/should_run/cgrun022.hs
index e69675431c..e69675431c 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun022.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun022.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun022.stdout b/testsuite/tests/codeGen/should_run/cgrun022.stdout
index 2e65efe2a1..2e65efe2a1 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun022.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun022.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun023.stdout b/testsuite/tests/codeGen/should_run/cgrun023.stdout
index c1f22fbc23..c1f22fbc23 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun023.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun023.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun024.hs b/testsuite/tests/codeGen/should_run/cgrun024.hs
index 7a695474e5..7a695474e5 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun024.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun024.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun024.stdout b/testsuite/tests/codeGen/should_run/cgrun024.stdout
index c1f22fbc23..c1f22fbc23 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun024.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun024.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun025.hs b/testsuite/tests/codeGen/should_run/cgrun025.hs
index 8df8945088..8df8945088 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun025.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun025.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun025.stderr b/testsuite/tests/codeGen/should_run/cgrun025.stderr
index a62fc44c04..a62fc44c04 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun025.stderr
+++ b/testsuite/tests/codeGen/should_run/cgrun025.stderr
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun025.stdout b/testsuite/tests/codeGen/should_run/cgrun025.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun025.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun025.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun026.hs b/testsuite/tests/codeGen/should_run/cgrun026.hs
index 4f15f93f8e..4f15f93f8e 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun026.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun026.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun026.stdout b/testsuite/tests/codeGen/should_run/cgrun026.stdout
index 92043490a7..92043490a7 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun026.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun026.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun027.hs b/testsuite/tests/codeGen/should_run/cgrun027.hs
index 646d05c38b..646d05c38b 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun027.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun027.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun027.stdout b/testsuite/tests/codeGen/should_run/cgrun027.stdout
index 8c61d23e12..8c61d23e12 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun027.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun027.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun028.hs b/testsuite/tests/codeGen/should_run/cgrun028.hs
index 3fa877cdb8..3fa877cdb8 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun028.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun028.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun028.stdout b/testsuite/tests/codeGen/should_run/cgrun028.stdout
index d81cc0710e..d81cc0710e 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun028.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun028.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun031.hs b/testsuite/tests/codeGen/should_run/cgrun031.hs
index 2a2c7a9b64..2a2c7a9b64 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun031.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun031.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun031.stdout b/testsuite/tests/codeGen/should_run/cgrun031.stdout
index a91166f4a3..a91166f4a3 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun031.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun031.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun032.hs b/testsuite/tests/codeGen/should_run/cgrun032.hs
index 3c1404b319..3c1404b319 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun032.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun032.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun032.stdout b/testsuite/tests/codeGen/should_run/cgrun032.stdout
index d81cc0710e..d81cc0710e 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun032.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun032.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun033.hs b/testsuite/tests/codeGen/should_run/cgrun033.hs
index 6e4a0b9a9d..6e4a0b9a9d 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun033.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun033.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun033.stdout b/testsuite/tests/codeGen/should_run/cgrun033.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun033.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun033.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun034.hs b/testsuite/tests/codeGen/should_run/cgrun034.hs
index 0f7f05297e..0f7f05297e 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun034.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun034.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun034.stdout b/testsuite/tests/codeGen/should_run/cgrun034.stdout
index 0c2be1c979..0c2be1c979 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun034.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun034.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun035.hs b/testsuite/tests/codeGen/should_run/cgrun035.hs
index dfd73cb40a..dfd73cb40a 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun035.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun035.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun035.stdout b/testsuite/tests/codeGen/should_run/cgrun035.stdout
index d3827e75a5..d3827e75a5 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun035.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun035.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun036.hs b/testsuite/tests/codeGen/should_run/cgrun036.hs
index 40bfa74328..40bfa74328 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun036.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun036.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun036.stdout b/testsuite/tests/codeGen/should_run/cgrun036.stdout
index 7b74638be6..7b74638be6 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun036.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun036.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun037.hs b/testsuite/tests/codeGen/should_run/cgrun037.hs
index 9c16f37962..9c16f37962 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun037.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun037.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun037.stdout b/testsuite/tests/codeGen/should_run/cgrun037.stdout
index fa50190f4c..fa50190f4c 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun037.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun037.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun038.hs b/testsuite/tests/codeGen/should_run/cgrun038.hs
index 57669c6d29..57669c6d29 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun038.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun038.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun038.stdout b/testsuite/tests/codeGen/should_run/cgrun038.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun038.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun038.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun039.hs b/testsuite/tests/codeGen/should_run/cgrun039.hs
index b7b301794d..b7b301794d 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun039.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun039.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun039.stdout b/testsuite/tests/codeGen/should_run/cgrun039.stdout
index 1c2d5d620b..1c2d5d620b 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun039.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun039.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun040.hs b/testsuite/tests/codeGen/should_run/cgrun040.hs
index d747d4ab8b..d747d4ab8b 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun040.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun040.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun040.stdout b/testsuite/tests/codeGen/should_run/cgrun040.stdout
index b4de394767..b4de394767 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun040.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun040.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun043.hs b/testsuite/tests/codeGen/should_run/cgrun043.hs
index 88de4c92f2..88de4c92f2 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun043.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun043.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun043.stdout b/testsuite/tests/codeGen/should_run/cgrun043.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun043.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun043.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun044.hs b/testsuite/tests/codeGen/should_run/cgrun044.hs
index cc2c5d64e5..cc2c5d64e5 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun044.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun044.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun044.stdout b/testsuite/tests/codeGen/should_run/cgrun044.stdout
index 0eb505e236..0eb505e236 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun044.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun044.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun045.hs b/testsuite/tests/codeGen/should_run/cgrun045.hs
index efd0b5c119..efd0b5c119 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun045.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun045.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun045.stderr b/testsuite/tests/codeGen/should_run/cgrun045.stderr
index 711048f792..711048f792 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun045.stderr
+++ b/testsuite/tests/codeGen/should_run/cgrun045.stderr
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun045.stdout b/testsuite/tests/codeGen/should_run/cgrun045.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun045.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun045.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun046.hs b/testsuite/tests/codeGen/should_run/cgrun046.hs
index be414a8a75..be414a8a75 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun046.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun046.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun046.stdout b/testsuite/tests/codeGen/should_run/cgrun046.stdout
index f2776bdd89..f2776bdd89 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun046.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun046.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun047.hs b/testsuite/tests/codeGen/should_run/cgrun047.hs
index 234c6671b6..234c6671b6 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun047.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun047.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun047.stdout b/testsuite/tests/codeGen/should_run/cgrun047.stdout
index 732d4fe8ff..732d4fe8ff 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun047.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun047.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun048.hs b/testsuite/tests/codeGen/should_run/cgrun048.hs
index 30f0b3e387..30f0b3e387 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun048.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun048.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun048.stdout b/testsuite/tests/codeGen/should_run/cgrun048.stdout
index ff596497db..ff596497db 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun048.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun048.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun049.hs b/testsuite/tests/codeGen/should_run/cgrun049.hs
index d4b6a77908..d4b6a77908 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun049.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun049.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun049.stdout b/testsuite/tests/codeGen/should_run/cgrun049.stdout
index 00750edc07..00750edc07 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun049.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun049.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun050.hs b/testsuite/tests/codeGen/should_run/cgrun050.hs
index 7eb2cee05f..7eb2cee05f 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun050.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun050.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun050.stdout b/testsuite/tests/codeGen/should_run/cgrun050.stdout
index 7f8f011eb7..7f8f011eb7 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun050.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun050.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun051.hs b/testsuite/tests/codeGen/should_run/cgrun051.hs
index c8ebb7f5e3..c8ebb7f5e3 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun051.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun051.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun051.stderr b/testsuite/tests/codeGen/should_run/cgrun051.stderr
index fddcb81968..fddcb81968 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun051.stderr
+++ b/testsuite/tests/codeGen/should_run/cgrun051.stderr
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun052.hs b/testsuite/tests/codeGen/should_run/cgrun052.hs
index cfce05442f..cfce05442f 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun052.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun052.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun052.stdout b/testsuite/tests/codeGen/should_run/cgrun052.stdout
index 9766475a41..9766475a41 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun052.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun052.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun053.hs b/testsuite/tests/codeGen/should_run/cgrun053.hs
index f100cc983d..f100cc983d 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun053.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun053.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun054.hs b/testsuite/tests/codeGen/should_run/cgrun054.hs
index cff967e9bb..cff967e9bb 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun054.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun054.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun054.stdout b/testsuite/tests/codeGen/should_run/cgrun054.stdout
index 8b7f679ed1..8b7f679ed1 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun054.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun054.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun055.hs b/testsuite/tests/codeGen/should_run/cgrun055.hs
index 737632748d..737632748d 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun055.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun055.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun055.stdout b/testsuite/tests/codeGen/should_run/cgrun055.stdout
index c5907cac04..c5907cac04 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun055.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun055.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun056.hs b/testsuite/tests/codeGen/should_run/cgrun056.hs
index e1a10511a7..e1a10511a7 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun056.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun056.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun056.stdout b/testsuite/tests/codeGen/should_run/cgrun056.stdout
index 91d6f80f27..91d6f80f27 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun056.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun056.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun057.hs b/testsuite/tests/codeGen/should_run/cgrun057.hs
index 09119546fb..09119546fb 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun057.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun057.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun057.stderr b/testsuite/tests/codeGen/should_run/cgrun057.stderr
index d3d46dacf3..d3d46dacf3 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun057.stderr
+++ b/testsuite/tests/codeGen/should_run/cgrun057.stderr
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun058.hs b/testsuite/tests/codeGen/should_run/cgrun058.hs
index f0001584d1..f0001584d1 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun058.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun058.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun058.stdout b/testsuite/tests/codeGen/should_run/cgrun058.stdout
index fe51488c70..fe51488c70 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun058.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun058.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun059.hs b/testsuite/tests/codeGen/should_run/cgrun059.hs
index 52d2ee88a5..52d2ee88a5 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun059.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun059.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun059.stderr b/testsuite/tests/codeGen/should_run/cgrun059.stderr
index 005f06e295..005f06e295 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun059.stderr
+++ b/testsuite/tests/codeGen/should_run/cgrun059.stderr
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun059.stdout b/testsuite/tests/codeGen/should_run/cgrun059.stdout
index 929ec8f128..929ec8f128 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun059.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun059.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun060.hs b/testsuite/tests/codeGen/should_run/cgrun060.hs
index a7558029d4..a7558029d4 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun060.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun060.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun060.stdout b/testsuite/tests/codeGen/should_run/cgrun060.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun060.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun060.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun061.hs b/testsuite/tests/codeGen/should_run/cgrun061.hs
index 9e32c654db..9e32c654db 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun061.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun061.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun061.stdout b/testsuite/tests/codeGen/should_run/cgrun061.stdout
index 071144f214..071144f214 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun061.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun061.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun062.hs b/testsuite/tests/codeGen/should_run/cgrun062.hs
index 915f84c397..915f84c397 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun062.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun062.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun062.stdout b/testsuite/tests/codeGen/should_run/cgrun062.stdout
index 3bb22bbe9a..3bb22bbe9a 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun062.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun062.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun063.hs b/testsuite/tests/codeGen/should_run/cgrun063.hs
index 14f3cb8d14..14f3cb8d14 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun063.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun063.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun063.stdout b/testsuite/tests/codeGen/should_run/cgrun063.stdout
index 73f45448d9..73f45448d9 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun063.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun063.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun064.hs b/testsuite/tests/codeGen/should_run/cgrun064.hs
index aa037e8782..aa037e8782 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun064.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun064.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun064.stdout b/testsuite/tests/codeGen/should_run/cgrun064.stdout
index 8e741ceec6..8e741ceec6 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun064.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun064.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun065.hs b/testsuite/tests/codeGen/should_run/cgrun065.hs
index 6934832013..6934832013 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun065.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun065.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun065.stdout b/testsuite/tests/codeGen/should_run/cgrun065.stdout
index bf895d50ef..bf895d50ef 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun065.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun065.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun066.hs b/testsuite/tests/codeGen/should_run/cgrun066.hs
index aa1c621d71..aa1c621d71 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun066.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun066.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun066.stdout b/testsuite/tests/codeGen/should_run/cgrun066.stdout
index b9cb48f6e4..b9cb48f6e4 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun066.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun066.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun067.hs b/testsuite/tests/codeGen/should_run/cgrun067.hs
index 74666c1ee6..74666c1ee6 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun067.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun067.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun067.stdout b/testsuite/tests/codeGen/should_run/cgrun067.stdout
index 14e24d4190..14e24d4190 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun067.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun067.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun068.hs b/testsuite/tests/codeGen/should_run/cgrun068.hs
index f5096ad998..f5096ad998 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun068.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun068.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun068.stdout b/testsuite/tests/codeGen/should_run/cgrun068.stdout
index 122a125a8e..122a125a8e 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun068.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun068.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun069.hs b/testsuite/tests/codeGen/should_run/cgrun069.hs
index 076abc211e..076abc211e 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun069.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun069.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun069.stdout b/testsuite/tests/codeGen/should_run/cgrun069.stdout
index bee6602b04..bee6602b04 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun069.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun069.stdout
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun069_cmm.cmm b/testsuite/tests/codeGen/should_run/cgrun069_cmm.cmm
index b2f563bbf6..b2f563bbf6 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun069_cmm.cmm
+++ b/testsuite/tests/codeGen/should_run/cgrun069_cmm.cmm
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun070.hs b/testsuite/tests/codeGen/should_run/cgrun070.hs
index 1f6b5622ba..1f6b5622ba 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun070.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun070.hs
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun070.stdout b/testsuite/tests/codeGen/should_run/cgrun070.stdout
index db95c83d7b..db95c83d7b 100644
--- a/testsuite/tests/ghc-regress/codeGen/should_run/cgrun070.stdout
+++ b/testsuite/tests/codeGen/should_run/cgrun070.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/2317/2317.hs b/testsuite/tests/concurrent/2317/2317.hs
index 5025582ebe..5025582ebe 100644
--- a/testsuite/tests/ghc-regress/concurrent/2317/2317.hs
+++ b/testsuite/tests/concurrent/2317/2317.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/2317/2317.stdout b/testsuite/tests/concurrent/2317/2317.stdout
index 7ab314964e..7ab314964e 100644
--- a/testsuite/tests/ghc-regress/concurrent/2317/2317.stdout
+++ b/testsuite/tests/concurrent/2317/2317.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/Makefile b/testsuite/tests/concurrent/2317/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/deSugar/Makefile
+++ b/testsuite/tests/concurrent/2317/Makefile
diff --git a/testsuite/tests/ghc-regress/concurrent/2317/all.T b/testsuite/tests/concurrent/2317/all.T
index 80b46f8c75..80b46f8c75 100644
--- a/testsuite/tests/ghc-regress/concurrent/2317/all.T
+++ b/testsuite/tests/concurrent/2317/all.T
diff --git a/testsuite/tests/concurrent/Makefile b/testsuite/tests/concurrent/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/concurrent/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/concurrent/prog001/Arithmetic.hs b/testsuite/tests/concurrent/prog001/Arithmetic.hs
index c1c18c549b..c1c18c549b 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog001/Arithmetic.hs
+++ b/testsuite/tests/concurrent/prog001/Arithmetic.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog001/Converter.hs b/testsuite/tests/concurrent/prog001/Converter.hs
index d3dfe2a34f..d3dfe2a34f 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog001/Converter.hs
+++ b/testsuite/tests/concurrent/prog001/Converter.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog001/Main.hs b/testsuite/tests/concurrent/prog001/Main.hs
index b90fe11c5d..b90fe11c5d 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog001/Main.hs
+++ b/testsuite/tests/concurrent/prog001/Main.hs
diff --git a/testsuite/tests/ghc-regress/deriving/Makefile b/testsuite/tests/concurrent/prog001/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/deriving/Makefile
+++ b/testsuite/tests/concurrent/prog001/Makefile
diff --git a/testsuite/tests/ghc-regress/concurrent/prog001/Mult.hs b/testsuite/tests/concurrent/prog001/Mult.hs
index e387244f68..e387244f68 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog001/Mult.hs
+++ b/testsuite/tests/concurrent/prog001/Mult.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog001/Stream.hs b/testsuite/tests/concurrent/prog001/Stream.hs
index 349af32962..349af32962 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog001/Stream.hs
+++ b/testsuite/tests/concurrent/prog001/Stream.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog001/Thread.hs b/testsuite/tests/concurrent/prog001/Thread.hs
index 62bb7dd3c3..62bb7dd3c3 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog001/Thread.hs
+++ b/testsuite/tests/concurrent/prog001/Thread.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog001/Trit.hs b/testsuite/tests/concurrent/prog001/Trit.hs
index bb6d03c9e2..bb6d03c9e2 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog001/Trit.hs
+++ b/testsuite/tests/concurrent/prog001/Trit.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog001/Utilities.hs b/testsuite/tests/concurrent/prog001/Utilities.hs
index 9e8a39187d..9e8a39187d 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog001/Utilities.hs
+++ b/testsuite/tests/concurrent/prog001/Utilities.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog001/all.T b/testsuite/tests/concurrent/prog001/all.T
index 70f38dca4f..70f38dca4f 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog001/all.T
+++ b/testsuite/tests/concurrent/prog001/all.T
diff --git a/testsuite/tests/ghc-regress/concurrent/prog001/concprog001.stdout b/testsuite/tests/concurrent/prog001/concprog001.stdout
index fb69b5b792..fb69b5b792 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog001/concprog001.stdout
+++ b/testsuite/tests/concurrent/prog001/concprog001.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/prog002/Event.hs b/testsuite/tests/concurrent/prog002/Event.hs
index 4abf6878c4..4abf6878c4 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog002/Event.hs
+++ b/testsuite/tests/concurrent/prog002/Event.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog002/FileIO.hs b/testsuite/tests/concurrent/prog002/FileIO.hs
index bf97712287..bf97712287 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog002/FileIO.hs
+++ b/testsuite/tests/concurrent/prog002/FileIO.hs
diff --git a/testsuite/tests/ghc-regress/dph/Makefile b/testsuite/tests/concurrent/prog002/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/dph/Makefile
+++ b/testsuite/tests/concurrent/prog002/Makefile
diff --git a/testsuite/tests/ghc-regress/concurrent/prog002/Scheduler.hs b/testsuite/tests/concurrent/prog002/Scheduler.hs
index bbfd374c43..bbfd374c43 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog002/Scheduler.hs
+++ b/testsuite/tests/concurrent/prog002/Scheduler.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog002/Server.hs b/testsuite/tests/concurrent/prog002/Server.hs
index 2ff1ccb8c8..2ff1ccb8c8 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog002/Server.hs
+++ b/testsuite/tests/concurrent/prog002/Server.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog002/Thread.hs b/testsuite/tests/concurrent/prog002/Thread.hs
index 9e342ac977..9e342ac977 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog002/Thread.hs
+++ b/testsuite/tests/concurrent/prog002/Thread.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog002/all.T b/testsuite/tests/concurrent/prog002/all.T
index f87bc8b77f..f87bc8b77f 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog002/all.T
+++ b/testsuite/tests/concurrent/prog002/all.T
diff --git a/testsuite/tests/ghc-regress/concurrent/prog002/concprog002.stderr b/testsuite/tests/concurrent/prog002/concprog002.stderr
index 268fccc3f6..268fccc3f6 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog002/concprog002.stderr
+++ b/testsuite/tests/concurrent/prog002/concprog002.stderr
diff --git a/testsuite/tests/ghc-regress/concurrent/prog002/concprog002.stdout b/testsuite/tests/concurrent/prog002/concprog002.stdout
index f8d8e8defa..f8d8e8defa 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog002/concprog002.stdout
+++ b/testsuite/tests/concurrent/prog002/concprog002.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/BackList2.lhs b/testsuite/tests/concurrent/prog003/BackList2.lhs
index b856beb4c3..b856beb4c3 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog003/BackList2.lhs
+++ b/testsuite/tests/concurrent/prog003/BackList2.lhs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/CASList.hs b/testsuite/tests/concurrent/prog003/CASList.hs
index 445af790a3..445af790a3 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog003/CASList.hs
+++ b/testsuite/tests/concurrent/prog003/CASList.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/Collate.hs b/testsuite/tests/concurrent/prog003/Collate.hs
index 2c1879d450..2c1879d450 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog003/Collate.hs
+++ b/testsuite/tests/concurrent/prog003/Collate.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/Collection.hs b/testsuite/tests/concurrent/prog003/Collection.hs
index 73a71f6714..73a71f6714 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog003/Collection.hs
+++ b/testsuite/tests/concurrent/prog003/Collection.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/IOList.lhs b/testsuite/tests/concurrent/prog003/IOList.lhs
index 72aa1dee46..72aa1dee46 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog003/IOList.lhs
+++ b/testsuite/tests/concurrent/prog003/IOList.lhs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/ImmList.hs b/testsuite/tests/concurrent/prog003/ImmList.hs
index 70d81633d2..70d81633d2 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog003/ImmList.hs
+++ b/testsuite/tests/concurrent/prog003/ImmList.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/MVarListLockCoupling.hs b/testsuite/tests/concurrent/prog003/MVarListLockCoupling.hs
index 0820ccd0d2..0820ccd0d2 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog003/MVarListLockCoupling.hs
+++ b/testsuite/tests/concurrent/prog003/MVarListLockCoupling.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/Main.lhs b/testsuite/tests/concurrent/prog003/Main.lhs
index e4e8ad790e..e4e8ad790e 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog003/Main.lhs
+++ b/testsuite/tests/concurrent/prog003/Main.lhs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/MainMVarList.lhs b/testsuite/tests/concurrent/prog003/MainMVarList.lhs
index 9bcf9b1240..9bcf9b1240 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog003/MainMVarList.lhs
+++ b/testsuite/tests/concurrent/prog003/MainMVarList.lhs
diff --git a/testsuite/tests/ghc-regress/esc/Makefile b/testsuite/tests/concurrent/prog003/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/esc/Makefile
+++ b/testsuite/tests/concurrent/prog003/Makefile
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/RefInterface.hs b/testsuite/tests/concurrent/prog003/RefInterface.hs
index 95ecbcdb49..95ecbcdb49 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog003/RefInterface.hs
+++ b/testsuite/tests/concurrent/prog003/RefInterface.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/TestData.hs b/testsuite/tests/concurrent/prog003/TestData.hs
index 4be06adcb2..4be06adcb2 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog003/TestData.hs
+++ b/testsuite/tests/concurrent/prog003/TestData.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/TestDataParser.hs b/testsuite/tests/concurrent/prog003/TestDataParser.hs
index 4a85d9576e..4a85d9576e 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog003/TestDataParser.hs
+++ b/testsuite/tests/concurrent/prog003/TestDataParser.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/TestRun.hs b/testsuite/tests/concurrent/prog003/TestRun.hs
index fd6e19de1d..fd6e19de1d 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog003/TestRun.hs
+++ b/testsuite/tests/concurrent/prog003/TestRun.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/all.T b/testsuite/tests/concurrent/prog003/all.T
index fc342e9fd0..fc342e9fd0 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog003/all.T
+++ b/testsuite/tests/concurrent/prog003/all.T
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/concprog003.stdout b/testsuite/tests/concurrent/prog003/concprog003.stdout
index 2839764088..2839764088 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog003/concprog003.stdout
+++ b/testsuite/tests/concurrent/prog003/concprog003.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/test-8-3000-3000-2-1-4 b/testsuite/tests/concurrent/prog003/test-8-3000-3000-2-1-4
index c287bf71ba..c287bf71ba 100644
--- a/testsuite/tests/ghc-regress/concurrent/prog003/test-8-3000-3000-2-1-4
+++ b/testsuite/tests/concurrent/prog003/test-8-3000-3000-2-1-4
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/1980.hs b/testsuite/tests/concurrent/should_run/1980.hs
index 61fcd9d15b..61fcd9d15b 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/1980.hs
+++ b/testsuite/tests/concurrent/should_run/1980.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/2910.hs b/testsuite/tests/concurrent/should_run/2910.hs
index 2867008159..2867008159 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/2910.hs
+++ b/testsuite/tests/concurrent/should_run/2910.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/2910.stdout b/testsuite/tests/concurrent/should_run/2910.stdout
index 145fced527..145fced527 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/2910.stdout
+++ b/testsuite/tests/concurrent/should_run/2910.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/2910a.hs b/testsuite/tests/concurrent/should_run/2910a.hs
index 380c15467d..380c15467d 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/2910a.hs
+++ b/testsuite/tests/concurrent/should_run/2910a.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/2910a.stdout b/testsuite/tests/concurrent/should_run/2910a.stdout
index 145fced527..145fced527 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/2910a.stdout
+++ b/testsuite/tests/concurrent/should_run/2910a.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/3279.hs b/testsuite/tests/concurrent/should_run/3279.hs
index 279895f444..279895f444 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/3279.hs
+++ b/testsuite/tests/concurrent/should_run/3279.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/3279.stdout b/testsuite/tests/concurrent/should_run/3279.stdout
index 0cfbf08886..0cfbf08886 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/3279.stdout
+++ b/testsuite/tests/concurrent/should_run/3279.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/3429.hs b/testsuite/tests/concurrent/should_run/3429.hs
index 8b12a8b1ff..8b12a8b1ff 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/3429.hs
+++ b/testsuite/tests/concurrent/should_run/3429.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/3429.stdout b/testsuite/tests/concurrent/should_run/3429.stdout
index ad88db8c31..ad88db8c31 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/3429.stdout
+++ b/testsuite/tests/concurrent/should_run/3429.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/4030.hs b/testsuite/tests/concurrent/should_run/4030.hs
index 1993bad86b..1993bad86b 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/4030.hs
+++ b/testsuite/tests/concurrent/should_run/4030.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/4030.stderr b/testsuite/tests/concurrent/should_run/4030.stderr
index 0e2a7bfc12..0e2a7bfc12 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/4030.stderr
+++ b/testsuite/tests/concurrent/should_run/4030.stderr
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/4262.hs b/testsuite/tests/concurrent/should_run/4262.hs
index e114b558a6..e114b558a6 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/4262.hs
+++ b/testsuite/tests/concurrent/should_run/4262.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/4262.stdout b/testsuite/tests/concurrent/should_run/4262.stdout
index 45a4fb75db..45a4fb75db 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/4262.stdout
+++ b/testsuite/tests/concurrent/should_run/4262.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/4811.hs b/testsuite/tests/concurrent/should_run/4811.hs
index 5aad0a51df..5aad0a51df 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/4811.hs
+++ b/testsuite/tests/concurrent/should_run/4811.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/4813.hs b/testsuite/tests/concurrent/should_run/4813.hs
index db3a9778c6..db3a9778c6 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/4813.hs
+++ b/testsuite/tests/concurrent/should_run/4813.hs
diff --git a/testsuite/tests/concurrent/should_run/Makefile b/testsuite/tests/concurrent/should_run/Makefile
new file mode 100644
index 0000000000..c6bef49619
--- /dev/null
+++ b/testsuite/tests/concurrent/should_run/Makefile
@@ -0,0 +1,6 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+conc059_setup :
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c conc059.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index cdcbd6da68..cdcbd6da68 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/all.T
+++ b/testsuite/tests/concurrent/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/allowinterrupt001.hs b/testsuite/tests/concurrent/should_run/allowinterrupt001.hs
index 938aa65383..938aa65383 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/allowinterrupt001.hs
+++ b/testsuite/tests/concurrent/should_run/allowinterrupt001.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/async001.hs b/testsuite/tests/concurrent/should_run/async001.hs
index 7d765e26f9..7d765e26f9 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/async001.hs
+++ b/testsuite/tests/concurrent/should_run/async001.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/async001.stdout b/testsuite/tests/concurrent/should_run/async001.stdout
index 241be4a895..241be4a895 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/async001.stdout
+++ b/testsuite/tests/concurrent/should_run/async001.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc001.hs b/testsuite/tests/concurrent/should_run/conc001.hs
index 99488fb07b..99488fb07b 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc001.hs
+++ b/testsuite/tests/concurrent/should_run/conc001.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc001.stdout b/testsuite/tests/concurrent/should_run/conc001.stdout
index 3b18e512db..3b18e512db 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc001.stdout
+++ b/testsuite/tests/concurrent/should_run/conc001.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc002.hs b/testsuite/tests/concurrent/should_run/conc002.hs
index 93efd6fe4c..93efd6fe4c 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc002.hs
+++ b/testsuite/tests/concurrent/should_run/conc002.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc002.stdout b/testsuite/tests/concurrent/should_run/conc002.stdout
index 5e1c309dae..5e1c309dae 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc002.stdout
+++ b/testsuite/tests/concurrent/should_run/conc002.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc003.hs b/testsuite/tests/concurrent/should_run/conc003.hs
index c7b1f9a56c..c7b1f9a56c 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc003.hs
+++ b/testsuite/tests/concurrent/should_run/conc003.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc003.stdout b/testsuite/tests/concurrent/should_run/conc003.stdout
index 5e1c309dae..5e1c309dae 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc003.stdout
+++ b/testsuite/tests/concurrent/should_run/conc003.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc004.hs b/testsuite/tests/concurrent/should_run/conc004.hs
index ec46c4ba73..ec46c4ba73 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc004.hs
+++ b/testsuite/tests/concurrent/should_run/conc004.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc004.stdout b/testsuite/tests/concurrent/should_run/conc004.stdout
index 348ebd9491..348ebd9491 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc004.stdout
+++ b/testsuite/tests/concurrent/should_run/conc004.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc006.hs b/testsuite/tests/concurrent/should_run/conc006.hs
index 4a77b5fc95..4a77b5fc95 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc006.hs
+++ b/testsuite/tests/concurrent/should_run/conc006.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc006.stdout b/testsuite/tests/concurrent/should_run/conc006.stdout
index b9d569380c..b9d569380c 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc006.stdout
+++ b/testsuite/tests/concurrent/should_run/conc006.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc007.hs b/testsuite/tests/concurrent/should_run/conc007.hs
index 74535ebe6d..74535ebe6d 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc007.hs
+++ b/testsuite/tests/concurrent/should_run/conc007.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc007.stdout b/testsuite/tests/concurrent/should_run/conc007.stdout
index ee81b5ecd3..ee81b5ecd3 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc007.stdout
+++ b/testsuite/tests/concurrent/should_run/conc007.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc008.hs b/testsuite/tests/concurrent/should_run/conc008.hs
index 66a4b5f973..66a4b5f973 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc008.hs
+++ b/testsuite/tests/concurrent/should_run/conc008.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc008.stdout b/testsuite/tests/concurrent/should_run/conc008.stdout
index faed5b894d..faed5b894d 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc008.stdout
+++ b/testsuite/tests/concurrent/should_run/conc008.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc009.hs b/testsuite/tests/concurrent/should_run/conc009.hs
index 94c7809332..94c7809332 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc009.hs
+++ b/testsuite/tests/concurrent/should_run/conc009.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc009.stderr b/testsuite/tests/concurrent/should_run/conc009.stderr
index e42034eba1..e42034eba1 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc009.stderr
+++ b/testsuite/tests/concurrent/should_run/conc009.stderr
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc010.hs b/testsuite/tests/concurrent/should_run/conc010.hs
index 52acb97a35..52acb97a35 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc010.hs
+++ b/testsuite/tests/concurrent/should_run/conc010.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc010.stdout b/testsuite/tests/concurrent/should_run/conc010.stdout
index b6fc4c620b..b6fc4c620b 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc010.stdout
+++ b/testsuite/tests/concurrent/should_run/conc010.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc012.hs b/testsuite/tests/concurrent/should_run/conc012.hs
index a2f139e401..a2f139e401 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc012.hs
+++ b/testsuite/tests/concurrent/should_run/conc012.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc012.stdout b/testsuite/tests/concurrent/should_run/conc012.stdout
index 12e0c906fc..12e0c906fc 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc012.stdout
+++ b/testsuite/tests/concurrent/should_run/conc012.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc013.hs b/testsuite/tests/concurrent/should_run/conc013.hs
index ea2130ee47..ea2130ee47 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc013.hs
+++ b/testsuite/tests/concurrent/should_run/conc013.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc013.stdout b/testsuite/tests/concurrent/should_run/conc013.stdout
index 98ab9c11f2..98ab9c11f2 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc013.stdout
+++ b/testsuite/tests/concurrent/should_run/conc013.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc014.hs b/testsuite/tests/concurrent/should_run/conc014.hs
index 76cb3c24b0..76cb3c24b0 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc014.hs
+++ b/testsuite/tests/concurrent/should_run/conc014.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc014.stdout b/testsuite/tests/concurrent/should_run/conc014.stdout
index 807edef7c9..807edef7c9 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc014.stdout
+++ b/testsuite/tests/concurrent/should_run/conc014.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc015.hs b/testsuite/tests/concurrent/should_run/conc015.hs
index 7574e15e5e..7574e15e5e 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc015.hs
+++ b/testsuite/tests/concurrent/should_run/conc015.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc015.stdout b/testsuite/tests/concurrent/should_run/conc015.stdout
index be6aa71d11..be6aa71d11 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc015.stdout
+++ b/testsuite/tests/concurrent/should_run/conc015.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc015a.hs b/testsuite/tests/concurrent/should_run/conc015a.hs
index cd8d9dd6c7..cd8d9dd6c7 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc015a.hs
+++ b/testsuite/tests/concurrent/should_run/conc015a.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc015a.stdout b/testsuite/tests/concurrent/should_run/conc015a.stdout
index 19b98e9b60..19b98e9b60 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc015a.stdout
+++ b/testsuite/tests/concurrent/should_run/conc015a.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc016.hs b/testsuite/tests/concurrent/should_run/conc016.hs
index 639b4306b3..639b4306b3 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc016.hs
+++ b/testsuite/tests/concurrent/should_run/conc016.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc016.stdout b/testsuite/tests/concurrent/should_run/conc016.stdout
index 9766475a41..9766475a41 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc016.stdout
+++ b/testsuite/tests/concurrent/should_run/conc016.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc017.hs b/testsuite/tests/concurrent/should_run/conc017.hs
index 30d8a1c56d..30d8a1c56d 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc017.hs
+++ b/testsuite/tests/concurrent/should_run/conc017.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc017.stdout b/testsuite/tests/concurrent/should_run/conc017.stdout
index 7fca279f26..7fca279f26 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc017.stdout
+++ b/testsuite/tests/concurrent/should_run/conc017.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc017a.hs b/testsuite/tests/concurrent/should_run/conc017a.hs
index ad015f7413..ad015f7413 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc017a.hs
+++ b/testsuite/tests/concurrent/should_run/conc017a.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc017a.stdout b/testsuite/tests/concurrent/should_run/conc017a.stdout
index 7fca279f26..7fca279f26 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc017a.stdout
+++ b/testsuite/tests/concurrent/should_run/conc017a.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc018.hs b/testsuite/tests/concurrent/should_run/conc018.hs
index aa83e31738..aa83e31738 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc018.hs
+++ b/testsuite/tests/concurrent/should_run/conc018.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc018.stdout b/testsuite/tests/concurrent/should_run/conc018.stdout
index dd56b71f23..dd56b71f23 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc018.stdout
+++ b/testsuite/tests/concurrent/should_run/conc018.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc019.hs b/testsuite/tests/concurrent/should_run/conc019.hs
index 51b3d7563a..51b3d7563a 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc019.hs
+++ b/testsuite/tests/concurrent/should_run/conc019.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc019.stdout b/testsuite/tests/concurrent/should_run/conc019.stdout
index aba647b928..aba647b928 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc019.stdout
+++ b/testsuite/tests/concurrent/should_run/conc019.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc020.hs b/testsuite/tests/concurrent/should_run/conc020.hs
index 956b761245..956b761245 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc020.hs
+++ b/testsuite/tests/concurrent/should_run/conc020.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc020.stderr b/testsuite/tests/concurrent/should_run/conc020.stderr
index b0bcbfb17f..b0bcbfb17f 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc020.stderr
+++ b/testsuite/tests/concurrent/should_run/conc020.stderr
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc021.hs b/testsuite/tests/concurrent/should_run/conc021.hs
index c07c48af35..c07c48af35 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc021.hs
+++ b/testsuite/tests/concurrent/should_run/conc021.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc021.stderr b/testsuite/tests/concurrent/should_run/conc021.stderr
index 78e92140e6..78e92140e6 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc021.stderr
+++ b/testsuite/tests/concurrent/should_run/conc021.stderr
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc022.hs b/testsuite/tests/concurrent/should_run/conc022.hs
index 5d420d8af7..5d420d8af7 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc022.hs
+++ b/testsuite/tests/concurrent/should_run/conc022.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc022.stdout b/testsuite/tests/concurrent/should_run/conc022.stdout
index 07de2e62f6..07de2e62f6 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc022.stdout
+++ b/testsuite/tests/concurrent/should_run/conc022.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc023.hs b/testsuite/tests/concurrent/should_run/conc023.hs
index b128c224a3..b128c224a3 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc023.hs
+++ b/testsuite/tests/concurrent/should_run/conc023.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc024.hs b/testsuite/tests/concurrent/should_run/conc024.hs
index e37d64a6e2..e37d64a6e2 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc024.hs
+++ b/testsuite/tests/concurrent/should_run/conc024.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc024.stdout b/testsuite/tests/concurrent/should_run/conc024.stdout
index dd56b71f23..dd56b71f23 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc024.stdout
+++ b/testsuite/tests/concurrent/should_run/conc024.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc025.hs b/testsuite/tests/concurrent/should_run/conc025.hs
index a9591d4223..a9591d4223 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc025.hs
+++ b/testsuite/tests/concurrent/should_run/conc025.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc025.stdout b/testsuite/tests/concurrent/should_run/conc025.stdout
index fb1569261c..fb1569261c 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc025.stdout
+++ b/testsuite/tests/concurrent/should_run/conc025.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc026.hs b/testsuite/tests/concurrent/should_run/conc026.hs
index 0aa170afb5..0aa170afb5 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc026.hs
+++ b/testsuite/tests/concurrent/should_run/conc026.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc027.hs b/testsuite/tests/concurrent/should_run/conc027.hs
index 4a04211824..4a04211824 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc027.hs
+++ b/testsuite/tests/concurrent/should_run/conc027.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc028.hs b/testsuite/tests/concurrent/should_run/conc028.hs
index 4d3d16866a..4d3d16866a 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc028.hs
+++ b/testsuite/tests/concurrent/should_run/conc028.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc028.stdout b/testsuite/tests/concurrent/should_run/conc028.stdout
index 91d6f80f27..91d6f80f27 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc028.stdout
+++ b/testsuite/tests/concurrent/should_run/conc028.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc029.hs b/testsuite/tests/concurrent/should_run/conc029.hs
index dc1150073d..dc1150073d 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc029.hs
+++ b/testsuite/tests/concurrent/should_run/conc029.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc029.stdout b/testsuite/tests/concurrent/should_run/conc029.stdout
index b9d569380c..b9d569380c 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc029.stdout
+++ b/testsuite/tests/concurrent/should_run/conc029.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc030.hs b/testsuite/tests/concurrent/should_run/conc030.hs
index 4f01668456..4f01668456 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc030.hs
+++ b/testsuite/tests/concurrent/should_run/conc030.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc030.stdout b/testsuite/tests/concurrent/should_run/conc030.stdout
index ba6ee958ee..ba6ee958ee 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc030.stdout
+++ b/testsuite/tests/concurrent/should_run/conc030.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc031.hs b/testsuite/tests/concurrent/should_run/conc031.hs
index c3347550a9..c3347550a9 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc031.hs
+++ b/testsuite/tests/concurrent/should_run/conc031.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc031.stdout b/testsuite/tests/concurrent/should_run/conc031.stdout
index 8d45abf2c7..8d45abf2c7 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc031.stdout
+++ b/testsuite/tests/concurrent/should_run/conc031.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc032.hs b/testsuite/tests/concurrent/should_run/conc032.hs
index 42149ff477..42149ff477 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc032.hs
+++ b/testsuite/tests/concurrent/should_run/conc032.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc032.stdout b/testsuite/tests/concurrent/should_run/conc032.stdout
index a357bc8aac..a357bc8aac 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc032.stdout
+++ b/testsuite/tests/concurrent/should_run/conc032.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc033.hs b/testsuite/tests/concurrent/should_run/conc033.hs
index 6933822e56..6933822e56 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc033.hs
+++ b/testsuite/tests/concurrent/should_run/conc033.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc033.stdout b/testsuite/tests/concurrent/should_run/conc033.stdout
index 1c0eba9dec..1c0eba9dec 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc033.stdout
+++ b/testsuite/tests/concurrent/should_run/conc033.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc034.hs b/testsuite/tests/concurrent/should_run/conc034.hs
index 4101212ad1..4101212ad1 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc034.hs
+++ b/testsuite/tests/concurrent/should_run/conc034.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc034.stdout b/testsuite/tests/concurrent/should_run/conc034.stdout
index 1f83158694..1f83158694 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc034.stdout
+++ b/testsuite/tests/concurrent/should_run/conc034.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc035.hs b/testsuite/tests/concurrent/should_run/conc035.hs
index fcb2d5c2e4..fcb2d5c2e4 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc035.hs
+++ b/testsuite/tests/concurrent/should_run/conc035.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc035.stdout b/testsuite/tests/concurrent/should_run/conc035.stdout
index f667439731..f667439731 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc035.stdout
+++ b/testsuite/tests/concurrent/should_run/conc035.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc036.hs b/testsuite/tests/concurrent/should_run/conc036.hs
index ead85a530d..ead85a530d 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc036.hs
+++ b/testsuite/tests/concurrent/should_run/conc036.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc036.stdout b/testsuite/tests/concurrent/should_run/conc036.stdout
index d5fb94ff25..d5fb94ff25 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc036.stdout
+++ b/testsuite/tests/concurrent/should_run/conc036.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc037.hs b/testsuite/tests/concurrent/should_run/conc037.hs
index 7da76f5025..7da76f5025 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc037.hs
+++ b/testsuite/tests/concurrent/should_run/conc037.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc037.stdout b/testsuite/tests/concurrent/should_run/conc037.stdout
index 18c9f447f6..18c9f447f6 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc037.stdout
+++ b/testsuite/tests/concurrent/should_run/conc037.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc038.hs b/testsuite/tests/concurrent/should_run/conc038.hs
index 0cf82f3b24..0cf82f3b24 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc038.hs
+++ b/testsuite/tests/concurrent/should_run/conc038.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc038.stdout b/testsuite/tests/concurrent/should_run/conc038.stdout
index 21fc15c4e2..21fc15c4e2 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc038.stdout
+++ b/testsuite/tests/concurrent/should_run/conc038.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc039.hs b/testsuite/tests/concurrent/should_run/conc039.hs
index dc5d181a31..dc5d181a31 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc039.hs
+++ b/testsuite/tests/concurrent/should_run/conc039.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc040.hs b/testsuite/tests/concurrent/should_run/conc040.hs
index be3bfdb915..be3bfdb915 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc040.hs
+++ b/testsuite/tests/concurrent/should_run/conc040.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc040.stderr b/testsuite/tests/concurrent/should_run/conc040.stderr
index d113a02a99..d113a02a99 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc040.stderr
+++ b/testsuite/tests/concurrent/should_run/conc040.stderr
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc041.hs b/testsuite/tests/concurrent/should_run/conc041.hs
index 8aec345b1c..8aec345b1c 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc041.hs
+++ b/testsuite/tests/concurrent/should_run/conc041.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc041.stderr b/testsuite/tests/concurrent/should_run/conc041.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc041.stderr
+++ b/testsuite/tests/concurrent/should_run/conc041.stderr
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc041.stdout b/testsuite/tests/concurrent/should_run/conc041.stdout
index a84f0c9779..a84f0c9779 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc041.stdout
+++ b/testsuite/tests/concurrent/should_run/conc041.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc042.hs b/testsuite/tests/concurrent/should_run/conc042.hs
index 9ebbf3e4ea..9ebbf3e4ea 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc042.hs
+++ b/testsuite/tests/concurrent/should_run/conc042.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc042.stderr b/testsuite/tests/concurrent/should_run/conc042.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc042.stderr
+++ b/testsuite/tests/concurrent/should_run/conc042.stderr
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc042.stdout b/testsuite/tests/concurrent/should_run/conc042.stdout
index 6fea5e3fe9..6fea5e3fe9 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc042.stdout
+++ b/testsuite/tests/concurrent/should_run/conc042.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc043.hs b/testsuite/tests/concurrent/should_run/conc043.hs
index 18cf1196f7..18cf1196f7 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc043.hs
+++ b/testsuite/tests/concurrent/should_run/conc043.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc043.stderr b/testsuite/tests/concurrent/should_run/conc043.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc043.stderr
+++ b/testsuite/tests/concurrent/should_run/conc043.stderr
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc043.stdout b/testsuite/tests/concurrent/should_run/conc043.stdout
index 8b2ff8961d..8b2ff8961d 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc043.stdout
+++ b/testsuite/tests/concurrent/should_run/conc043.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc044.hs b/testsuite/tests/concurrent/should_run/conc044.hs
index 0ad4701f8b..0ad4701f8b 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc044.hs
+++ b/testsuite/tests/concurrent/should_run/conc044.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc044.stderr b/testsuite/tests/concurrent/should_run/conc044.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc044.stderr
+++ b/testsuite/tests/concurrent/should_run/conc044.stderr
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc044.stdout b/testsuite/tests/concurrent/should_run/conc044.stdout
index 8b2ff8961d..8b2ff8961d 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc044.stdout
+++ b/testsuite/tests/concurrent/should_run/conc044.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc045.hs b/testsuite/tests/concurrent/should_run/conc045.hs
index 4ab585eef3..4ab585eef3 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc045.hs
+++ b/testsuite/tests/concurrent/should_run/conc045.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc045.stderr b/testsuite/tests/concurrent/should_run/conc045.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc045.stderr
+++ b/testsuite/tests/concurrent/should_run/conc045.stderr
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc045.stdout b/testsuite/tests/concurrent/should_run/conc045.stdout
index 31640611f4..31640611f4 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc045.stdout
+++ b/testsuite/tests/concurrent/should_run/conc045.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc051.hs b/testsuite/tests/concurrent/should_run/conc051.hs
index db8a796a9c..db8a796a9c 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc051.hs
+++ b/testsuite/tests/concurrent/should_run/conc051.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc058.hs b/testsuite/tests/concurrent/should_run/conc058.hs
index 5fbe4e5af8..5fbe4e5af8 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc058.hs
+++ b/testsuite/tests/concurrent/should_run/conc058.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc058.stderr b/testsuite/tests/concurrent/should_run/conc058.stderr
index 2b5ddd02dc..2b5ddd02dc 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc058.stderr
+++ b/testsuite/tests/concurrent/should_run/conc058.stderr
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc059.hs b/testsuite/tests/concurrent/should_run/conc059.hs
index bed28d27cb..bed28d27cb 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc059.hs
+++ b/testsuite/tests/concurrent/should_run/conc059.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc059.stdout b/testsuite/tests/concurrent/should_run/conc059.stdout
index 92911bfda2..92911bfda2 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc059.stdout
+++ b/testsuite/tests/concurrent/should_run/conc059.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc059_c.c b/testsuite/tests/concurrent/should_run/conc059_c.c
index f15fbdd735..f15fbdd735 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc059_c.c
+++ b/testsuite/tests/concurrent/should_run/conc059_c.c
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc064.hs b/testsuite/tests/concurrent/should_run/conc064.hs
index d37387c601..d37387c601 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc064.hs
+++ b/testsuite/tests/concurrent/should_run/conc064.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc064.stderr b/testsuite/tests/concurrent/should_run/conc064.stderr
index 9a49972f77..9a49972f77 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc064.stderr
+++ b/testsuite/tests/concurrent/should_run/conc064.stderr
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc065.hs b/testsuite/tests/concurrent/should_run/conc065.hs
index db6d7cf3ba..db6d7cf3ba 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc065.hs
+++ b/testsuite/tests/concurrent/should_run/conc065.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc066.hs b/testsuite/tests/concurrent/should_run/conc066.hs
index 81638dfd10..81638dfd10 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc066.hs
+++ b/testsuite/tests/concurrent/should_run/conc066.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc067.hs b/testsuite/tests/concurrent/should_run/conc067.hs
index ef6dde3ff7..ef6dde3ff7 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc067.hs
+++ b/testsuite/tests/concurrent/should_run/conc067.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc068.hs b/testsuite/tests/concurrent/should_run/conc068.hs
index eb90d06591..eb90d06591 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc068.hs
+++ b/testsuite/tests/concurrent/should_run/conc068.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc068.stderr b/testsuite/tests/concurrent/should_run/conc068.stderr
index bf40dfdd92..bf40dfdd92 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc068.stderr
+++ b/testsuite/tests/concurrent/should_run/conc068.stderr
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc069.hs b/testsuite/tests/concurrent/should_run/conc069.hs
index fd757133a5..fd757133a5 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc069.hs
+++ b/testsuite/tests/concurrent/should_run/conc069.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc069.stdout b/testsuite/tests/concurrent/should_run/conc069.stdout
index 240e16e63f..240e16e63f 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc069.stdout
+++ b/testsuite/tests/concurrent/should_run/conc069.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc069a.hs b/testsuite/tests/concurrent/should_run/conc069a.hs
index 5bf619bec1..5bf619bec1 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc069a.hs
+++ b/testsuite/tests/concurrent/should_run/conc069a.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc069a.stdout b/testsuite/tests/concurrent/should_run/conc069a.stdout
index 0883f133dc..0883f133dc 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc069a.stdout
+++ b/testsuite/tests/concurrent/should_run/conc069a.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc070.hs b/testsuite/tests/concurrent/should_run/conc070.hs
index 71eb415427..71eb415427 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc070.hs
+++ b/testsuite/tests/concurrent/should_run/conc070.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc070.stdout b/testsuite/tests/concurrent/should_run/conc070.stdout
index 30f0076668..30f0076668 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc070.stdout
+++ b/testsuite/tests/concurrent/should_run/conc070.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc071.hs b/testsuite/tests/concurrent/should_run/conc071.hs
index 7c58efbc9f..7c58efbc9f 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc071.hs
+++ b/testsuite/tests/concurrent/should_run/conc071.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc071.stdout b/testsuite/tests/concurrent/should_run/conc071.stdout
index 9933b254fe..9933b254fe 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc071.stdout
+++ b/testsuite/tests/concurrent/should_run/conc071.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc072.hs b/testsuite/tests/concurrent/should_run/conc072.hs
index 8f1218084c..8f1218084c 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc072.hs
+++ b/testsuite/tests/concurrent/should_run/conc072.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/conc072.stdout b/testsuite/tests/concurrent/should_run/conc072.stdout
index 739ac3797e..739ac3797e 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/conc072.stdout
+++ b/testsuite/tests/concurrent/should_run/conc072.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/foreignInterruptible.hs b/testsuite/tests/concurrent/should_run/foreignInterruptible.hs
index 32252fb8db..32252fb8db 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/foreignInterruptible.hs
+++ b/testsuite/tests/concurrent/should_run/foreignInterruptible.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/foreignInterruptible.stdout b/testsuite/tests/concurrent/should_run/foreignInterruptible.stdout
index 4048ae362e..4048ae362e 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/foreignInterruptible.stdout
+++ b/testsuite/tests/concurrent/should_run/foreignInterruptible.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/mask001.hs b/testsuite/tests/concurrent/should_run/mask001.hs
index 96bbf53c73..96bbf53c73 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/mask001.hs
+++ b/testsuite/tests/concurrent/should_run/mask001.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/mask002.hs b/testsuite/tests/concurrent/should_run/mask002.hs
index 15b2e64a00..15b2e64a00 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/mask002.hs
+++ b/testsuite/tests/concurrent/should_run/mask002.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/mask002.stdout b/testsuite/tests/concurrent/should_run/mask002.stdout
index baa1975a5a..baa1975a5a 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/mask002.stdout
+++ b/testsuite/tests/concurrent/should_run/mask002.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/numsparks001.hs b/testsuite/tests/concurrent/should_run/numsparks001.hs
index f28bf87d55..f28bf87d55 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/numsparks001.hs
+++ b/testsuite/tests/concurrent/should_run/numsparks001.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/numsparks001.stdout b/testsuite/tests/concurrent/should_run/numsparks001.stdout
index 9dfcf39f5a..9dfcf39f5a 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/numsparks001.stdout
+++ b/testsuite/tests/concurrent/should_run/numsparks001.stdout
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/throwto001.hs b/testsuite/tests/concurrent/should_run/throwto001.hs
index 999d3335d8..999d3335d8 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/throwto001.hs
+++ b/testsuite/tests/concurrent/should_run/throwto001.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/throwto002.hs b/testsuite/tests/concurrent/should_run/throwto002.hs
index c9857f1f1e..c9857f1f1e 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/throwto002.hs
+++ b/testsuite/tests/concurrent/should_run/throwto002.hs
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/throwto003.hs b/testsuite/tests/concurrent/should_run/throwto003.hs
index 6369c62352..6369c62352 100644
--- a/testsuite/tests/ghc-regress/concurrent/should_run/throwto003.hs
+++ b/testsuite/tests/concurrent/should_run/throwto003.hs
diff --git a/testsuite/tests/cpranal/Makefile b/testsuite/tests/cpranal/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/cpranal/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/cpranal/should_compile/Cpr001.hs b/testsuite/tests/cpranal/should_compile/Cpr001.hs
index 0871205bb7..0871205bb7 100644
--- a/testsuite/tests/ghc-regress/cpranal/should_compile/Cpr001.hs
+++ b/testsuite/tests/cpranal/should_compile/Cpr001.hs
diff --git a/testsuite/tests/ghc-regress/cpranal/should_compile/Cpr001_imp.hs b/testsuite/tests/cpranal/should_compile/Cpr001_imp.hs
index 5b2586127b..5b2586127b 100644
--- a/testsuite/tests/ghc-regress/cpranal/should_compile/Cpr001_imp.hs
+++ b/testsuite/tests/cpranal/should_compile/Cpr001_imp.hs
diff --git a/testsuite/tests/ghc-regress/eyeball/Makefile b/testsuite/tests/cpranal/should_compile/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/eyeball/Makefile
+++ b/testsuite/tests/cpranal/should_compile/Makefile
diff --git a/testsuite/tests/ghc-regress/cpranal/should_compile/all.T b/testsuite/tests/cpranal/should_compile/all.T
index 99ffed997f..99ffed997f 100644
--- a/testsuite/tests/ghc-regress/cpranal/should_compile/all.T
+++ b/testsuite/tests/cpranal/should_compile/all.T
diff --git a/testsuite/tests/ghc-regress/cps/all.T b/testsuite/tests/cps/all.T
index 0bfc49254c..0bfc49254c 100644
--- a/testsuite/tests/ghc-regress/cps/all.T
+++ b/testsuite/tests/cps/all.T
diff --git a/testsuite/tests/ghc-regress/cps/cmm001.cmm b/testsuite/tests/cps/cmm001.cmm
index 490a3c938d..490a3c938d 100644
--- a/testsuite/tests/ghc-regress/cps/cmm001.cmm
+++ b/testsuite/tests/cps/cmm001.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cmm002.cmm b/testsuite/tests/cps/cmm002.cmm
index bf3e0d4c6e..bf3e0d4c6e 100644
--- a/testsuite/tests/ghc-regress/cps/cmm002.cmm
+++ b/testsuite/tests/cps/cmm002.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps001.cmm b/testsuite/tests/cps/cps001.cmm
index 72ab24b631..72ab24b631 100644
--- a/testsuite/tests/ghc-regress/cps/cps001.cmm
+++ b/testsuite/tests/cps/cps001.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps002.cmm b/testsuite/tests/cps/cps002.cmm
index 8919820c32..8919820c32 100644
--- a/testsuite/tests/ghc-regress/cps/cps002.cmm
+++ b/testsuite/tests/cps/cps002.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps003.cmm b/testsuite/tests/cps/cps003.cmm
index dba506f9d3..dba506f9d3 100644
--- a/testsuite/tests/ghc-regress/cps/cps003.cmm
+++ b/testsuite/tests/cps/cps003.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps004.cmm b/testsuite/tests/cps/cps004.cmm
index e6079a0464..e6079a0464 100644
--- a/testsuite/tests/ghc-regress/cps/cps004.cmm
+++ b/testsuite/tests/cps/cps004.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps005.cmm b/testsuite/tests/cps/cps005.cmm
index d40dd93404..d40dd93404 100644
--- a/testsuite/tests/ghc-regress/cps/cps005.cmm
+++ b/testsuite/tests/cps/cps005.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps006.cmm b/testsuite/tests/cps/cps006.cmm
index c04b4279ad..c04b4279ad 100644
--- a/testsuite/tests/ghc-regress/cps/cps006.cmm
+++ b/testsuite/tests/cps/cps006.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps007.cmm b/testsuite/tests/cps/cps007.cmm
index 984bb628be..984bb628be 100644
--- a/testsuite/tests/ghc-regress/cps/cps007.cmm
+++ b/testsuite/tests/cps/cps007.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps008.cmm b/testsuite/tests/cps/cps008.cmm
index cdd8ac8a66..cdd8ac8a66 100644
--- a/testsuite/tests/ghc-regress/cps/cps008.cmm
+++ b/testsuite/tests/cps/cps008.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps009.cmm b/testsuite/tests/cps/cps009.cmm
index 581356c0bc..581356c0bc 100644
--- a/testsuite/tests/ghc-regress/cps/cps009.cmm
+++ b/testsuite/tests/cps/cps009.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps010.cmm b/testsuite/tests/cps/cps010.cmm
index 0b0ec9ebc4..0b0ec9ebc4 100644
--- a/testsuite/tests/ghc-regress/cps/cps010.cmm
+++ b/testsuite/tests/cps/cps010.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps011.cmm b/testsuite/tests/cps/cps011.cmm
index 9b344d1c76..9b344d1c76 100644
--- a/testsuite/tests/ghc-regress/cps/cps011.cmm
+++ b/testsuite/tests/cps/cps011.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps012.cmm b/testsuite/tests/cps/cps012.cmm
index 6d828dca27..6d828dca27 100644
--- a/testsuite/tests/ghc-regress/cps/cps012.cmm
+++ b/testsuite/tests/cps/cps012.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps013.cmm b/testsuite/tests/cps/cps013.cmm
index e92daca223..e92daca223 100644
--- a/testsuite/tests/ghc-regress/cps/cps013.cmm
+++ b/testsuite/tests/cps/cps013.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps014.cmm b/testsuite/tests/cps/cps014.cmm
index 3b8b651c43..3b8b651c43 100644
--- a/testsuite/tests/ghc-regress/cps/cps014.cmm
+++ b/testsuite/tests/cps/cps014.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps015.cmm b/testsuite/tests/cps/cps015.cmm
index 2068dd80c3..2068dd80c3 100644
--- a/testsuite/tests/ghc-regress/cps/cps015.cmm
+++ b/testsuite/tests/cps/cps015.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps016.cmm b/testsuite/tests/cps/cps016.cmm
index 44d6057b65..44d6057b65 100644
--- a/testsuite/tests/ghc-regress/cps/cps016.cmm
+++ b/testsuite/tests/cps/cps016.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps017.cmm b/testsuite/tests/cps/cps017.cmm
index 7f12348260..7f12348260 100644
--- a/testsuite/tests/ghc-regress/cps/cps017.cmm
+++ b/testsuite/tests/cps/cps017.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps018.cmm b/testsuite/tests/cps/cps018.cmm
index 545a895887..545a895887 100644
--- a/testsuite/tests/ghc-regress/cps/cps018.cmm
+++ b/testsuite/tests/cps/cps018.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps019.cmm b/testsuite/tests/cps/cps019.cmm
index 12c39a98c4..12c39a98c4 100644
--- a/testsuite/tests/ghc-regress/cps/cps019.cmm
+++ b/testsuite/tests/cps/cps019.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps020.cmm b/testsuite/tests/cps/cps020.cmm
index 2dc7131139..2dc7131139 100644
--- a/testsuite/tests/ghc-regress/cps/cps020.cmm
+++ b/testsuite/tests/cps/cps020.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps021.cmm b/testsuite/tests/cps/cps021.cmm
index fa7e809ee0..fa7e809ee0 100644
--- a/testsuite/tests/ghc-regress/cps/cps021.cmm
+++ b/testsuite/tests/cps/cps021.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps022.cmm b/testsuite/tests/cps/cps022.cmm
index 64d6c39f19..64d6c39f19 100644
--- a/testsuite/tests/ghc-regress/cps/cps022.cmm
+++ b/testsuite/tests/cps/cps022.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps023.cmm b/testsuite/tests/cps/cps023.cmm
index 1a80b9085e..1a80b9085e 100644
--- a/testsuite/tests/ghc-regress/cps/cps023.cmm
+++ b/testsuite/tests/cps/cps023.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps024.cmm b/testsuite/tests/cps/cps024.cmm
index f24cd5e26e..f24cd5e26e 100644
--- a/testsuite/tests/ghc-regress/cps/cps024.cmm
+++ b/testsuite/tests/cps/cps024.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps025.cmm b/testsuite/tests/cps/cps025.cmm
index bc87924c89..bc87924c89 100644
--- a/testsuite/tests/ghc-regress/cps/cps025.cmm
+++ b/testsuite/tests/cps/cps025.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps026.cmm b/testsuite/tests/cps/cps026.cmm
index 1bf4160f43..1bf4160f43 100644
--- a/testsuite/tests/ghc-regress/cps/cps026.cmm
+++ b/testsuite/tests/cps/cps026.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps027.cmm b/testsuite/tests/cps/cps027.cmm
index 953f8fcc53..953f8fcc53 100644
--- a/testsuite/tests/ghc-regress/cps/cps027.cmm
+++ b/testsuite/tests/cps/cps027.cmm
diff --git a/testsuite/tests/ghc-regress/cps/cps028.cmm b/testsuite/tests/cps/cps028.cmm
index 57c897ef89..57c897ef89 100644
--- a/testsuite/tests/ghc-regress/cps/cps028.cmm
+++ b/testsuite/tests/cps/cps028.cmm
diff --git a/testsuite/tests/deSugar/Makefile b/testsuite/tests/deSugar/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/deSugar/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/GadtOverlap.hs b/testsuite/tests/deSugar/should_compile/GadtOverlap.hs
index 89187414a3..89187414a3 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/GadtOverlap.hs
+++ b/testsuite/tests/deSugar/should_compile/GadtOverlap.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/GadtOverlap.stderr b/testsuite/tests/deSugar/should_compile/GadtOverlap.stderr
index 423d69469f..423d69469f 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/GadtOverlap.stderr
+++ b/testsuite/tests/deSugar/should_compile/GadtOverlap.stderr
diff --git a/testsuite/tests/deSugar/should_compile/Makefile b/testsuite/tests/deSugar/should_compile/Makefile
new file mode 100644
index 0000000000..a6cbe41da5
--- /dev/null
+++ b/testsuite/tests/deSugar/should_compile/Makefile
@@ -0,0 +1,8 @@
+TOP=../../..

+include $(TOP)/mk/boilerplate.mk

+include $(TOP)/mk/test.mk

+

+T5252:

+	$(RM) -f T5252*.hi T5252*.o

+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T5252a.hs 

+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T5252.hs

diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T2395.hs b/testsuite/tests/deSugar/should_compile/T2395.hs
index 8600690279..8600690279 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T2395.hs
+++ b/testsuite/tests/deSugar/should_compile/T2395.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T2395.stderr b/testsuite/tests/deSugar/should_compile/T2395.stderr
index 4bfd9d6bb8..4bfd9d6bb8 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T2395.stderr
+++ b/testsuite/tests/deSugar/should_compile/T2395.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T2409.hs b/testsuite/tests/deSugar/should_compile/T2409.hs
index 163786bb58..163786bb58 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T2409.hs
+++ b/testsuite/tests/deSugar/should_compile/T2409.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T3263-1.hs b/testsuite/tests/deSugar/should_compile/T3263-1.hs
index 74249cd663..74249cd663 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T3263-1.hs
+++ b/testsuite/tests/deSugar/should_compile/T3263-1.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T3263-1.stderr b/testsuite/tests/deSugar/should_compile/T3263-1.stderr
index ac21515daf..ac21515daf 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T3263-1.stderr
+++ b/testsuite/tests/deSugar/should_compile/T3263-1.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T3263-2.hs b/testsuite/tests/deSugar/should_compile/T3263-2.hs
index 71288062c5..71288062c5 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T3263-2.hs
+++ b/testsuite/tests/deSugar/should_compile/T3263-2.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T3263-2.stderr b/testsuite/tests/deSugar/should_compile/T3263-2.stderr
index 3f92403e84..3f92403e84 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T3263-2.stderr
+++ b/testsuite/tests/deSugar/should_compile/T3263-2.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T4371.hs b/testsuite/tests/deSugar/should_compile/T4371.hs
index c6542a8540..c6542a8540 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T4371.hs
+++ b/testsuite/tests/deSugar/should_compile/T4371.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T4439.hs b/testsuite/tests/deSugar/should_compile/T4439.hs
index 13b02e65d6..13b02e65d6 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T4439.hs
+++ b/testsuite/tests/deSugar/should_compile/T4439.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T4488.hs b/testsuite/tests/deSugar/should_compile/T4488.hs
index c5bae4e536..c5bae4e536 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T4488.hs
+++ b/testsuite/tests/deSugar/should_compile/T4488.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T4488.stderr b/testsuite/tests/deSugar/should_compile/T4488.stderr
index f8c20a5de0..f8c20a5de0 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T4488.stderr
+++ b/testsuite/tests/deSugar/should_compile/T4488.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T4870.hs b/testsuite/tests/deSugar/should_compile/T4870.hs
index fefcdb194b..fefcdb194b 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T4870.hs
+++ b/testsuite/tests/deSugar/should_compile/T4870.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T4870a.hs b/testsuite/tests/deSugar/should_compile/T4870a.hs
index a4c59a5b66..a4c59a5b66 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T4870a.hs
+++ b/testsuite/tests/deSugar/should_compile/T4870a.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T5117.hs b/testsuite/tests/deSugar/should_compile/T5117.hs
index 15f9c796f0..15f9c796f0 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T5117.hs
+++ b/testsuite/tests/deSugar/should_compile/T5117.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T5117.stderr b/testsuite/tests/deSugar/should_compile/T5117.stderr
index e9ddba143b..e9ddba143b 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T5117.stderr
+++ b/testsuite/tests/deSugar/should_compile/T5117.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T5252.hs b/testsuite/tests/deSugar/should_compile/T5252.hs
index e2498c4089..e2498c4089 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T5252.hs
+++ b/testsuite/tests/deSugar/should_compile/T5252.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/T5252a.hs b/testsuite/tests/deSugar/should_compile/T5252a.hs
index ff1704a566..ff1704a566 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/T5252a.hs
+++ b/testsuite/tests/deSugar/should_compile/T5252a.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/all.T b/testsuite/tests/deSugar/should_compile/all.T
index 0db20f9e71..0db20f9e71 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/all.T
+++ b/testsuite/tests/deSugar/should_compile/all.T
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds-wildcard.hs b/testsuite/tests/deSugar/should_compile/ds-wildcard.hs
index dae882c32b..dae882c32b 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds-wildcard.hs
+++ b/testsuite/tests/deSugar/should_compile/ds-wildcard.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds-wildcard.stderr b/testsuite/tests/deSugar/should_compile/ds-wildcard.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds-wildcard.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds-wildcard.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds001.hs b/testsuite/tests/deSugar/should_compile/ds001.hs
index d3f0b60f56..d3f0b60f56 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds001.hs
+++ b/testsuite/tests/deSugar/should_compile/ds001.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds001.stderr b/testsuite/tests/deSugar/should_compile/ds001.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds001.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds001.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds002.hs b/testsuite/tests/deSugar/should_compile/ds002.hs
index 280674e1fe..280674e1fe 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds002.hs
+++ b/testsuite/tests/deSugar/should_compile/ds002.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds002.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds002.stderr-ghc
index baf7ffde53..baf7ffde53 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds002.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds002.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds003.hs b/testsuite/tests/deSugar/should_compile/ds003.hs
index dafeac94b7..dafeac94b7 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds003.hs
+++ b/testsuite/tests/deSugar/should_compile/ds003.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds003.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds003.stderr-ghc
index 5b1bd3949f..5b1bd3949f 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds003.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds003.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds004.hs b/testsuite/tests/deSugar/should_compile/ds004.hs
index ebbe8e06c2..ebbe8e06c2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds004.hs
+++ b/testsuite/tests/deSugar/should_compile/ds004.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds004.stderr b/testsuite/tests/deSugar/should_compile/ds004.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds004.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds004.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds005.hs b/testsuite/tests/deSugar/should_compile/ds005.hs
index a02e8d9c1d..a02e8d9c1d 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds005.hs
+++ b/testsuite/tests/deSugar/should_compile/ds005.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds005.stderr b/testsuite/tests/deSugar/should_compile/ds005.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds005.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds005.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds006.hs b/testsuite/tests/deSugar/should_compile/ds006.hs
index d66e7c17e8..d66e7c17e8 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds006.hs
+++ b/testsuite/tests/deSugar/should_compile/ds006.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds006.stderr b/testsuite/tests/deSugar/should_compile/ds006.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds006.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds006.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds007.hs b/testsuite/tests/deSugar/should_compile/ds007.hs
index ae12cf7a8c..ae12cf7a8c 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds007.hs
+++ b/testsuite/tests/deSugar/should_compile/ds007.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds007.stderr b/testsuite/tests/deSugar/should_compile/ds007.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds007.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds007.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds008.hs b/testsuite/tests/deSugar/should_compile/ds008.hs
index 73707ed565..73707ed565 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds008.hs
+++ b/testsuite/tests/deSugar/should_compile/ds008.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds008.stderr b/testsuite/tests/deSugar/should_compile/ds008.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds008.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds008.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds009.hs b/testsuite/tests/deSugar/should_compile/ds009.hs
index 6ebcc96adf..6ebcc96adf 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds009.hs
+++ b/testsuite/tests/deSugar/should_compile/ds009.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds009.stderr b/testsuite/tests/deSugar/should_compile/ds009.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds009.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds009.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds010.hs b/testsuite/tests/deSugar/should_compile/ds010.hs
index 268610e124..268610e124 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds010.hs
+++ b/testsuite/tests/deSugar/should_compile/ds010.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds010.stderr b/testsuite/tests/deSugar/should_compile/ds010.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds010.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds010.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds011.hs b/testsuite/tests/deSugar/should_compile/ds011.hs
index dab482ff04..dab482ff04 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds011.hs
+++ b/testsuite/tests/deSugar/should_compile/ds011.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds011.stderr b/testsuite/tests/deSugar/should_compile/ds011.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds011.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds011.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds012.hs b/testsuite/tests/deSugar/should_compile/ds012.hs
index 4ef9d8cc1d..4ef9d8cc1d 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds012.hs
+++ b/testsuite/tests/deSugar/should_compile/ds012.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds012.stderr b/testsuite/tests/deSugar/should_compile/ds012.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds012.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds012.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds013.hs b/testsuite/tests/deSugar/should_compile/ds013.hs
index 3fb55ab47c..3fb55ab47c 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds013.hs
+++ b/testsuite/tests/deSugar/should_compile/ds013.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds013.stderr b/testsuite/tests/deSugar/should_compile/ds013.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds013.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds013.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds014.hs b/testsuite/tests/deSugar/should_compile/ds014.hs
index 23b3709854..23b3709854 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds014.hs
+++ b/testsuite/tests/deSugar/should_compile/ds014.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds014.stderr b/testsuite/tests/deSugar/should_compile/ds014.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds014.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds014.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds015.hs b/testsuite/tests/deSugar/should_compile/ds015.hs
index 24645778ee..24645778ee 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds015.hs
+++ b/testsuite/tests/deSugar/should_compile/ds015.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds015.stderr b/testsuite/tests/deSugar/should_compile/ds015.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds015.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds015.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds016.hs b/testsuite/tests/deSugar/should_compile/ds016.hs
index 41394e7ed9..41394e7ed9 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds016.hs
+++ b/testsuite/tests/deSugar/should_compile/ds016.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds016.stderr b/testsuite/tests/deSugar/should_compile/ds016.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds016.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds016.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds017.hs b/testsuite/tests/deSugar/should_compile/ds017.hs
index e6fd6d02f9..e6fd6d02f9 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds017.hs
+++ b/testsuite/tests/deSugar/should_compile/ds017.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds017.stderr b/testsuite/tests/deSugar/should_compile/ds017.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds017.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds017.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds018.hs b/testsuite/tests/deSugar/should_compile/ds018.hs
index 68a9e4ce47..68a9e4ce47 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds018.hs
+++ b/testsuite/tests/deSugar/should_compile/ds018.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds018.stderr b/testsuite/tests/deSugar/should_compile/ds018.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds018.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds018.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds019.hs b/testsuite/tests/deSugar/should_compile/ds019.hs
index 6bcf43f0ce..6bcf43f0ce 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds019.hs
+++ b/testsuite/tests/deSugar/should_compile/ds019.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds019.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds019.stderr-ghc
index 68816686b1..68816686b1 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds019.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds019.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds020.hs b/testsuite/tests/deSugar/should_compile/ds020.hs
index 184c857a8f..184c857a8f 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds020.hs
+++ b/testsuite/tests/deSugar/should_compile/ds020.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds020.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds020.stderr-ghc
index 3f9205a729..3f9205a729 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds020.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds020.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds021.hs b/testsuite/tests/deSugar/should_compile/ds021.hs
index 4faaba53fd..4faaba53fd 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds021.hs
+++ b/testsuite/tests/deSugar/should_compile/ds021.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds021.stderr b/testsuite/tests/deSugar/should_compile/ds021.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds021.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds021.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds022.hs b/testsuite/tests/deSugar/should_compile/ds022.hs
index 2ac429f95b..2ac429f95b 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds022.hs
+++ b/testsuite/tests/deSugar/should_compile/ds022.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds022.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds022.stderr-ghc
index ce6d4a52c1..ce6d4a52c1 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds022.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds022.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds023.hs b/testsuite/tests/deSugar/should_compile/ds023.hs
index 736107d979..736107d979 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds023.hs
+++ b/testsuite/tests/deSugar/should_compile/ds023.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds023.stderr b/testsuite/tests/deSugar/should_compile/ds023.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds023.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds023.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds024.hs b/testsuite/tests/deSugar/should_compile/ds024.hs
index 76606a90f7..76606a90f7 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds024.hs
+++ b/testsuite/tests/deSugar/should_compile/ds024.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds024.stderr b/testsuite/tests/deSugar/should_compile/ds024.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds024.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds024.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds025.hs b/testsuite/tests/deSugar/should_compile/ds025.hs
index fdbf0ff6ae..fdbf0ff6ae 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds025.hs
+++ b/testsuite/tests/deSugar/should_compile/ds025.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds025.stderr b/testsuite/tests/deSugar/should_compile/ds025.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds025.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds025.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds026.hs b/testsuite/tests/deSugar/should_compile/ds026.hs
index f21ca0b18b..f21ca0b18b 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds026.hs
+++ b/testsuite/tests/deSugar/should_compile/ds026.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds026.stderr b/testsuite/tests/deSugar/should_compile/ds026.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds026.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds026.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds027.hs b/testsuite/tests/deSugar/should_compile/ds027.hs
index 436958e531..436958e531 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds027.hs
+++ b/testsuite/tests/deSugar/should_compile/ds027.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds027.stderr b/testsuite/tests/deSugar/should_compile/ds027.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds027.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds027.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds028.hs b/testsuite/tests/deSugar/should_compile/ds028.hs
index 4c7944aa39..4c7944aa39 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds028.hs
+++ b/testsuite/tests/deSugar/should_compile/ds028.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds028.stderr b/testsuite/tests/deSugar/should_compile/ds028.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds028.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds028.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds029.hs b/testsuite/tests/deSugar/should_compile/ds029.hs
index 000052365e..000052365e 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds029.hs
+++ b/testsuite/tests/deSugar/should_compile/ds029.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds029.stderr b/testsuite/tests/deSugar/should_compile/ds029.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds029.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds029.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds030.hs b/testsuite/tests/deSugar/should_compile/ds030.hs
index 8475b55a0f..8475b55a0f 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds030.hs
+++ b/testsuite/tests/deSugar/should_compile/ds030.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds030.stderr b/testsuite/tests/deSugar/should_compile/ds030.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds030.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds030.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds031.hs b/testsuite/tests/deSugar/should_compile/ds031.hs
index 5f25c15b19..5f25c15b19 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds031.hs
+++ b/testsuite/tests/deSugar/should_compile/ds031.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds031.stderr b/testsuite/tests/deSugar/should_compile/ds031.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds031.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds031.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds032.hs b/testsuite/tests/deSugar/should_compile/ds032.hs
index 09e2de15a7..09e2de15a7 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds032.hs
+++ b/testsuite/tests/deSugar/should_compile/ds032.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds032.stderr b/testsuite/tests/deSugar/should_compile/ds032.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds032.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds032.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds033.hs b/testsuite/tests/deSugar/should_compile/ds033.hs
index 9d89a936c7..9d89a936c7 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds033.hs
+++ b/testsuite/tests/deSugar/should_compile/ds033.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds033.stderr b/testsuite/tests/deSugar/should_compile/ds033.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds033.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds033.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds034.hs b/testsuite/tests/deSugar/should_compile/ds034.hs
index 0725a7a97f..0725a7a97f 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds034.hs
+++ b/testsuite/tests/deSugar/should_compile/ds034.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds034.stderr b/testsuite/tests/deSugar/should_compile/ds034.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds034.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds034.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds035.hs b/testsuite/tests/deSugar/should_compile/ds035.hs
index b3d8568a14..b3d8568a14 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds035.hs
+++ b/testsuite/tests/deSugar/should_compile/ds035.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds035.stderr b/testsuite/tests/deSugar/should_compile/ds035.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds035.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds035.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds036.hs b/testsuite/tests/deSugar/should_compile/ds036.hs
index 12b90ed3ab..12b90ed3ab 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds036.hs
+++ b/testsuite/tests/deSugar/should_compile/ds036.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds036.stderr b/testsuite/tests/deSugar/should_compile/ds036.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds036.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds036.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds037.hs b/testsuite/tests/deSugar/should_compile/ds037.hs
index d5fc1300f3..d5fc1300f3 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds037.hs
+++ b/testsuite/tests/deSugar/should_compile/ds037.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds037.stderr b/testsuite/tests/deSugar/should_compile/ds037.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds037.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds037.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds038.hs b/testsuite/tests/deSugar/should_compile/ds038.hs
index 3accf7cf42..3accf7cf42 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds038.hs
+++ b/testsuite/tests/deSugar/should_compile/ds038.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds038.stderr b/testsuite/tests/deSugar/should_compile/ds038.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds038.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds038.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds039.hs b/testsuite/tests/deSugar/should_compile/ds039.hs
index ad000a5c9f..ad000a5c9f 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds039.hs
+++ b/testsuite/tests/deSugar/should_compile/ds039.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds039.stderr b/testsuite/tests/deSugar/should_compile/ds039.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds039.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds039.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds040.hs b/testsuite/tests/deSugar/should_compile/ds040.hs
index c99f5fab63..c99f5fab63 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds040.hs
+++ b/testsuite/tests/deSugar/should_compile/ds040.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds040.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds040.stderr-ghc
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds040.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds040.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds041.hs b/testsuite/tests/deSugar/should_compile/ds041.hs
index 90c1c22b4d..90c1c22b4d 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds041.hs
+++ b/testsuite/tests/deSugar/should_compile/ds041.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds041.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds041.stderr-ghc
index acf3e1ae6f..acf3e1ae6f 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds041.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds041.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds042.hs b/testsuite/tests/deSugar/should_compile/ds042.hs
index e3f928d8d9..e3f928d8d9 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds042.hs
+++ b/testsuite/tests/deSugar/should_compile/ds042.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds043.hs b/testsuite/tests/deSugar/should_compile/ds043.hs
index 5c7d746b8b..5c7d746b8b 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds043.hs
+++ b/testsuite/tests/deSugar/should_compile/ds043.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds043.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds043.stderr-ghc
index 8529a8c737..8529a8c737 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds043.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds043.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds044.hs b/testsuite/tests/deSugar/should_compile/ds044.hs
index fddf19499e..fddf19499e 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds044.hs
+++ b/testsuite/tests/deSugar/should_compile/ds044.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds045.hs b/testsuite/tests/deSugar/should_compile/ds045.hs
index 5688a530e1..5688a530e1 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds045.hs
+++ b/testsuite/tests/deSugar/should_compile/ds045.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds046.hs b/testsuite/tests/deSugar/should_compile/ds046.hs
index 7096f2bdf0..7096f2bdf0 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds046.hs
+++ b/testsuite/tests/deSugar/should_compile/ds046.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds047.hs b/testsuite/tests/deSugar/should_compile/ds047.hs
index f6ee2b5dc7..f6ee2b5dc7 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds047.hs
+++ b/testsuite/tests/deSugar/should_compile/ds047.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds048.hs b/testsuite/tests/deSugar/should_compile/ds048.hs
index 9274aacbea..9274aacbea 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds048.hs
+++ b/testsuite/tests/deSugar/should_compile/ds048.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds050.hs b/testsuite/tests/deSugar/should_compile/ds050.hs
index be88654d7e..be88654d7e 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds050.hs
+++ b/testsuite/tests/deSugar/should_compile/ds050.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds051.hs b/testsuite/tests/deSugar/should_compile/ds051.hs
index 70c51a792f..70c51a792f 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds051.hs
+++ b/testsuite/tests/deSugar/should_compile/ds051.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds051.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds051.stderr-ghc
index a098efee33..a098efee33 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds051.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds051.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds052.hs b/testsuite/tests/deSugar/should_compile/ds052.hs
index 08612aec98..08612aec98 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds052.hs
+++ b/testsuite/tests/deSugar/should_compile/ds052.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds052.stderr b/testsuite/tests/deSugar/should_compile/ds052.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds052.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds052.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds053.hs b/testsuite/tests/deSugar/should_compile/ds053.hs
index 4069c614d5..4069c614d5 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds053.hs
+++ b/testsuite/tests/deSugar/should_compile/ds053.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds053.stderr-ghc b/testsuite/tests/deSugar/should_compile/ds053.stderr-ghc
index 3bce906869..3bce906869 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds053.stderr-ghc
+++ b/testsuite/tests/deSugar/should_compile/ds053.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds054.hs b/testsuite/tests/deSugar/should_compile/ds054.hs
index 7b05409adf..7b05409adf 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds054.hs
+++ b/testsuite/tests/deSugar/should_compile/ds054.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds055.hs b/testsuite/tests/deSugar/should_compile/ds055.hs
index 280fe968d2..280fe968d2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds055.hs
+++ b/testsuite/tests/deSugar/should_compile/ds055.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds056.hs b/testsuite/tests/deSugar/should_compile/ds056.hs
index 77c3860112..77c3860112 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds056.hs
+++ b/testsuite/tests/deSugar/should_compile/ds056.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds056.stderr b/testsuite/tests/deSugar/should_compile/ds056.stderr
index 6e0972bef4..6e0972bef4 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds056.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds056.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds057.hs b/testsuite/tests/deSugar/should_compile/ds057.hs
index 23bf5d3645..23bf5d3645 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds057.hs
+++ b/testsuite/tests/deSugar/should_compile/ds057.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds058.hs b/testsuite/tests/deSugar/should_compile/ds058.hs
index 0b83d0bd32..0b83d0bd32 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds058.hs
+++ b/testsuite/tests/deSugar/should_compile/ds058.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds058.stderr b/testsuite/tests/deSugar/should_compile/ds058.stderr
index fb504cc514..fb504cc514 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds058.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds058.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds059.hs b/testsuite/tests/deSugar/should_compile/ds059.hs
index f8385726b7..f8385726b7 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds059.hs
+++ b/testsuite/tests/deSugar/should_compile/ds059.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds060.hs b/testsuite/tests/deSugar/should_compile/ds060.hs
index b822605742..b822605742 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds060.hs
+++ b/testsuite/tests/deSugar/should_compile/ds060.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds061.hs b/testsuite/tests/deSugar/should_compile/ds061.hs
index 271bbbbc60..271bbbbc60 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds061.hs
+++ b/testsuite/tests/deSugar/should_compile/ds061.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds062.hs b/testsuite/tests/deSugar/should_compile/ds062.hs
index 18bd5d53e5..18bd5d53e5 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds062.hs
+++ b/testsuite/tests/deSugar/should_compile/ds062.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/ds063.hs b/testsuite/tests/deSugar/should_compile/ds063.hs
index 74bde90887..74bde90887 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/ds063.hs
+++ b/testsuite/tests/deSugar/should_compile/ds063.hs
diff --git a/testsuite/tests/ghc-regress/ffi/Makefile b/testsuite/tests/deSugar/should_run/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/ffi/Makefile
+++ b/testsuite/tests/deSugar/should_run/Makefile
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/T246.hs b/testsuite/tests/deSugar/should_run/T246.hs
index 835e618b79..835e618b79 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/T246.hs
+++ b/testsuite/tests/deSugar/should_run/T246.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/T246.stdout b/testsuite/tests/deSugar/should_run/T246.stdout
index f266ecc65d..f266ecc65d 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/T246.stdout
+++ b/testsuite/tests/deSugar/should_run/T246.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/T3126.hs b/testsuite/tests/deSugar/should_run/T3126.hs
index 811ddc1fa7..811ddc1fa7 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/T3126.hs
+++ b/testsuite/tests/deSugar/should_run/T3126.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/T3126.stdout b/testsuite/tests/deSugar/should_run/T3126.stdout
index 3367978a7b..3367978a7b 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/T3126.stdout
+++ b/testsuite/tests/deSugar/should_run/T3126.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/T3382.hs b/testsuite/tests/deSugar/should_run/T3382.hs
index 800256a1f0..800256a1f0 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/T3382.hs
+++ b/testsuite/tests/deSugar/should_run/T3382.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/T3382.stdout b/testsuite/tests/deSugar/should_run/T3382.stdout
index a92f13b57a..a92f13b57a 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/T3382.stdout
+++ b/testsuite/tests/deSugar/should_run/T3382.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/all.T b/testsuite/tests/deSugar/should_run/all.T
index 9c8664d64b..9c8664d64b 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/all.T
+++ b/testsuite/tests/deSugar/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun001.hs b/testsuite/tests/deSugar/should_run/dsrun001.hs
index e40ea2a11d..e40ea2a11d 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun001.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun001.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun001.stdout b/testsuite/tests/deSugar/should_run/dsrun001.stdout
index a375d0fe24..a375d0fe24 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun001.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun001.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun002.hs b/testsuite/tests/deSugar/should_run/dsrun002.hs
index acad275f74..acad275f74 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun002.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun002.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun002.stdout b/testsuite/tests/deSugar/should_run/dsrun002.stdout
index 660eacecf5..660eacecf5 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun002.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun002.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun003.hs b/testsuite/tests/deSugar/should_run/dsrun003.hs
index d100bff718..d100bff718 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun003.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun003.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun003.stdout b/testsuite/tests/deSugar/should_run/dsrun003.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun003.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun003.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun004.hs b/testsuite/tests/deSugar/should_run/dsrun004.hs
index 8f54e330e1..8f54e330e1 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun004.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun004.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun004.stdout b/testsuite/tests/deSugar/should_run/dsrun004.stdout
index 49ae94bb33..49ae94bb33 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun004.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun004.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun005.hs b/testsuite/tests/deSugar/should_run/dsrun005.hs
index 238a2c3410..238a2c3410 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun005.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun005.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun005.stderr b/testsuite/tests/deSugar/should_run/dsrun005.stderr
index 73718fc858..73718fc858 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun005.stderr
+++ b/testsuite/tests/deSugar/should_run/dsrun005.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun005.stderr-hugs b/testsuite/tests/deSugar/should_run/dsrun005.stderr-hugs
index e9fed4ae3a..e9fed4ae3a 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun005.stderr-hugs
+++ b/testsuite/tests/deSugar/should_run/dsrun005.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun005.stdout b/testsuite/tests/deSugar/should_run/dsrun005.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun005.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun005.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun006.hs b/testsuite/tests/deSugar/should_run/dsrun006.hs
index 759c9c542d..759c9c542d 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun006.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun006.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun006.stdout b/testsuite/tests/deSugar/should_run/dsrun006.stdout
index 00750edc07..00750edc07 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun006.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun006.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun007.hs b/testsuite/tests/deSugar/should_run/dsrun007.hs
index 19a0c641cb..19a0c641cb 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun007.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun007.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun007.stderr b/testsuite/tests/deSugar/should_run/dsrun007.stderr
index f313633803..f313633803 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun007.stderr
+++ b/testsuite/tests/deSugar/should_run/dsrun007.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun007.stderr-hugs b/testsuite/tests/deSugar/should_run/dsrun007.stderr-hugs
index 8941f55132..8941f55132 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun007.stderr-hugs
+++ b/testsuite/tests/deSugar/should_run/dsrun007.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun008.hs b/testsuite/tests/deSugar/should_run/dsrun008.hs
index c055da563c..c055da563c 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun008.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun008.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun008.stderr b/testsuite/tests/deSugar/should_run/dsrun008.stderr
index ff7de054f2..ff7de054f2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun008.stderr
+++ b/testsuite/tests/deSugar/should_run/dsrun008.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun008.stderr-hugs b/testsuite/tests/deSugar/should_run/dsrun008.stderr-hugs
index 18ee3730c2..18ee3730c2 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun008.stderr-hugs
+++ b/testsuite/tests/deSugar/should_run/dsrun008.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun009.hs b/testsuite/tests/deSugar/should_run/dsrun009.hs
index 104f1af2e3..104f1af2e3 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun009.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun009.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun009.stdout b/testsuite/tests/deSugar/should_run/dsrun009.stdout
index 1f0a31b942..1f0a31b942 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun009.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun009.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun010.hs b/testsuite/tests/deSugar/should_run/dsrun010.hs
index 99a9297f8b..99a9297f8b 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun010.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun010.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun010.stdout b/testsuite/tests/deSugar/should_run/dsrun010.stdout
index bc59c12aa1..bc59c12aa1 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun010.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun010.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun011.hs b/testsuite/tests/deSugar/should_run/dsrun011.hs
index b7e518c0bf..b7e518c0bf 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun011.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun011.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun011.stdout b/testsuite/tests/deSugar/should_run/dsrun011.stdout
index a817176f4a..a817176f4a 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun011.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun011.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun012.hs b/testsuite/tests/deSugar/should_run/dsrun012.hs
index 52ebd160e3..52ebd160e3 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun012.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun012.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun012.stdout b/testsuite/tests/deSugar/should_run/dsrun012.stdout
index a8fa06e1be..a8fa06e1be 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun012.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun012.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun013.hs b/testsuite/tests/deSugar/should_run/dsrun013.hs
index c9cc59ead9..c9cc59ead9 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun013.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun013.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun013.stdout b/testsuite/tests/deSugar/should_run/dsrun013.stdout
index 2dcddd2593..2dcddd2593 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun013.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun013.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun014.hs b/testsuite/tests/deSugar/should_run/dsrun014.hs
index 3b08a7ebf0..3b08a7ebf0 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun014.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun014.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun014.stderr b/testsuite/tests/deSugar/should_run/dsrun014.stderr
index 814f4a4229..814f4a4229 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun014.stderr
+++ b/testsuite/tests/deSugar/should_run/dsrun014.stderr
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun014.stdout b/testsuite/tests/deSugar/should_run/dsrun014.stdout
index 00750edc07..00750edc07 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun014.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun014.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun015.hs b/testsuite/tests/deSugar/should_run/dsrun015.hs
index da5e443605..da5e443605 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun015.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun015.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun015.stdout b/testsuite/tests/deSugar/should_run/dsrun015.stdout
index b085e1acb0..b085e1acb0 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun015.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun015.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun016.hs b/testsuite/tests/deSugar/should_run/dsrun016.hs
index 38747a46e3..38747a46e3 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun016.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun016.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun016.stdout b/testsuite/tests/deSugar/should_run/dsrun016.stdout
index 60b1b8058e..60b1b8058e 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun016.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun016.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun017.hs b/testsuite/tests/deSugar/should_run/dsrun017.hs
index 877db7823c..877db7823c 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun017.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun017.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun017.stdout b/testsuite/tests/deSugar/should_run/dsrun017.stdout
index 60ddd472ac..60ddd472ac 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun017.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun017.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun018.hs b/testsuite/tests/deSugar/should_run/dsrun018.hs
index d89f5b24f3..d89f5b24f3 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun018.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun018.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun018.stdout b/testsuite/tests/deSugar/should_run/dsrun018.stdout
index 7c2936211d..7c2936211d 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun018.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun018.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun019.hs b/testsuite/tests/deSugar/should_run/dsrun019.hs
index 049d264114..049d264114 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun019.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun019.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun019.stdout b/testsuite/tests/deSugar/should_run/dsrun019.stdout
index bfedf5b35e..bfedf5b35e 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun019.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun019.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun020.hs b/testsuite/tests/deSugar/should_run/dsrun020.hs
index 6d26dc5607..6d26dc5607 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun020.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun020.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun020.stdout b/testsuite/tests/deSugar/should_run/dsrun020.stdout
index 771f5460d8..771f5460d8 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun020.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun020.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun021.hs b/testsuite/tests/deSugar/should_run/dsrun021.hs
index 7489f77a4a..7489f77a4a 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun021.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun021.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun021.stdout b/testsuite/tests/deSugar/should_run/dsrun021.stdout
index b7de0302ef..b7de0302ef 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun021.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun021.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun022.hs b/testsuite/tests/deSugar/should_run/dsrun022.hs
index dbbd906ce8..dbbd906ce8 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun022.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun022.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun022.stdout b/testsuite/tests/deSugar/should_run/dsrun022.stdout
index c426e190ce..c426e190ce 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun022.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun022.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun023.hs b/testsuite/tests/deSugar/should_run/dsrun023.hs
index 8189633415..8189633415 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun023.hs
+++ b/testsuite/tests/deSugar/should_run/dsrun023.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun023.stdout b/testsuite/tests/deSugar/should_run/dsrun023.stdout
index 538ca9d5f0..538ca9d5f0 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/dsrun023.stdout
+++ b/testsuite/tests/deSugar/should_run/dsrun023.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/mc01.hs b/testsuite/tests/deSugar/should_run/mc01.hs
index cf5ca1a0e9..cf5ca1a0e9 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/mc01.hs
+++ b/testsuite/tests/deSugar/should_run/mc01.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/mc01.stdout b/testsuite/tests/deSugar/should_run/mc01.stdout
index c426e190ce..c426e190ce 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/mc01.stdout
+++ b/testsuite/tests/deSugar/should_run/mc01.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/mc02.hs b/testsuite/tests/deSugar/should_run/mc02.hs
index 77adf26c37..77adf26c37 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/mc02.hs
+++ b/testsuite/tests/deSugar/should_run/mc02.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/mc02.stdout b/testsuite/tests/deSugar/should_run/mc02.stdout
index b7de0302ef..b7de0302ef 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/mc02.stdout
+++ b/testsuite/tests/deSugar/should_run/mc02.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/mc03.hs b/testsuite/tests/deSugar/should_run/mc03.hs
index 1b52c83c46..1b52c83c46 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/mc03.hs
+++ b/testsuite/tests/deSugar/should_run/mc03.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/mc03.stdout b/testsuite/tests/deSugar/should_run/mc03.stdout
index 538ca9d5f0..538ca9d5f0 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/mc03.stdout
+++ b/testsuite/tests/deSugar/should_run/mc03.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/mc04.hs b/testsuite/tests/deSugar/should_run/mc04.hs
index 38747a46e3..38747a46e3 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/mc04.hs
+++ b/testsuite/tests/deSugar/should_run/mc04.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/mc04.stdout b/testsuite/tests/deSugar/should_run/mc04.stdout
index 60b1b8058e..60b1b8058e 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/mc04.stdout
+++ b/testsuite/tests/deSugar/should_run/mc04.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/mc05.hs b/testsuite/tests/deSugar/should_run/mc05.hs
index c2d7d2d4a5..c2d7d2d4a5 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/mc05.hs
+++ b/testsuite/tests/deSugar/should_run/mc05.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/mc05.stdout b/testsuite/tests/deSugar/should_run/mc05.stdout
index bfedf5b35e..bfedf5b35e 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/mc05.stdout
+++ b/testsuite/tests/deSugar/should_run/mc05.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/mc06.hs b/testsuite/tests/deSugar/should_run/mc06.hs
index 20fe041283..20fe041283 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/mc06.hs
+++ b/testsuite/tests/deSugar/should_run/mc06.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/mc06.stdout b/testsuite/tests/deSugar/should_run/mc06.stdout
index 7c2936211d..7c2936211d 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/mc06.stdout
+++ b/testsuite/tests/deSugar/should_run/mc06.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/mc07.hs b/testsuite/tests/deSugar/should_run/mc07.hs
index 7726dedb65..7726dedb65 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/mc07.hs
+++ b/testsuite/tests/deSugar/should_run/mc07.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/mc07.stdout b/testsuite/tests/deSugar/should_run/mc07.stdout
index 771f5460d8..771f5460d8 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/mc07.stdout
+++ b/testsuite/tests/deSugar/should_run/mc07.stdout
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/mc08.hs b/testsuite/tests/deSugar/should_run/mc08.hs
index 24dd3beb4c..24dd3beb4c 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/mc08.hs
+++ b/testsuite/tests/deSugar/should_run/mc08.hs
diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/mc08.stdout b/testsuite/tests/deSugar/should_run/mc08.stdout
index 60ddd472ac..60ddd472ac 100644
--- a/testsuite/tests/ghc-regress/deSugar/should_run/mc08.stdout
+++ b/testsuite/tests/deSugar/should_run/mc08.stdout
diff --git a/testsuite/tests/deriving/Makefile b/testsuite/tests/deriving/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/deriving/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/generics/Makefile b/testsuite/tests/deriving/should_compile/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/generics/Makefile
+++ b/testsuite/tests/deriving/should_compile/Makefile
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T2378.hs b/testsuite/tests/deriving/should_compile/T2378.hs
index e3118cb863..e3118cb863 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T2378.hs
+++ b/testsuite/tests/deriving/should_compile/T2378.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T2856.hs b/testsuite/tests/deriving/should_compile/T2856.hs
index c8f81a00bc..c8f81a00bc 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T2856.hs
+++ b/testsuite/tests/deriving/should_compile/T2856.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T3012.hs b/testsuite/tests/deriving/should_compile/T3012.hs
index 44b1d64a9c..44b1d64a9c 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T3012.hs
+++ b/testsuite/tests/deriving/should_compile/T3012.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T3057.hs b/testsuite/tests/deriving/should_compile/T3057.hs
index 0e9aef7814..0e9aef7814 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T3057.hs
+++ b/testsuite/tests/deriving/should_compile/T3057.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T3965.hs b/testsuite/tests/deriving/should_compile/T3965.hs
index 2ccaaadfdf..2ccaaadfdf 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T3965.hs
+++ b/testsuite/tests/deriving/should_compile/T3965.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T4220.hs b/testsuite/tests/deriving/should_compile/T4220.hs
index 0b2ba28caa..0b2ba28caa 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T4220.hs
+++ b/testsuite/tests/deriving/should_compile/T4220.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T4302.hs b/testsuite/tests/deriving/should_compile/T4302.hs
index 50369632f9..50369632f9 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T4302.hs
+++ b/testsuite/tests/deriving/should_compile/T4302.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T4325.hs b/testsuite/tests/deriving/should_compile/T4325.hs
index 68ab81744b..68ab81744b 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T4325.hs
+++ b/testsuite/tests/deriving/should_compile/T4325.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T4325.stderr b/testsuite/tests/deriving/should_compile/T4325.stderr
index 90ef1de92d..90ef1de92d 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T4325.stderr
+++ b/testsuite/tests/deriving/should_compile/T4325.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T4816.hs b/testsuite/tests/deriving/should_compile/T4816.hs
index 0e81e39521..0e81e39521 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T4816.hs
+++ b/testsuite/tests/deriving/should_compile/T4816.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T4966.hs b/testsuite/tests/deriving/should_compile/T4966.hs
index d7328c6ef6..d7328c6ef6 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T4966.hs
+++ b/testsuite/tests/deriving/should_compile/T4966.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/T4966.stderr b/testsuite/tests/deriving/should_compile/T4966.stderr
index b8059925bb..b8059925bb 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/T4966.stderr
+++ b/testsuite/tests/deriving/should_compile/T4966.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/all.T b/testsuite/tests/deriving/should_compile/all.T
index 22353ab2ea..22353ab2ea 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/all.T
+++ b/testsuite/tests/deriving/should_compile/all.T
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/deriving-1935.hs b/testsuite/tests/deriving/should_compile/deriving-1935.hs
index 5b3bca0c77..5b3bca0c77 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/deriving-1935.hs
+++ b/testsuite/tests/deriving/should_compile/deriving-1935.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv-foldable-traversable1.hs b/testsuite/tests/deriving/should_compile/drv-foldable-traversable1.hs
index 712f14a3b5..712f14a3b5 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv-foldable-traversable1.hs
+++ b/testsuite/tests/deriving/should_compile/drv-foldable-traversable1.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv-foldable-traversable1.stderr b/testsuite/tests/deriving/should_compile/drv-foldable-traversable1.stderr
index ceae10cabd..ceae10cabd 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv-foldable-traversable1.stderr
+++ b/testsuite/tests/deriving/should_compile/drv-foldable-traversable1.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv-functor1.hs b/testsuite/tests/deriving/should_compile/drv-functor1.hs
index 8249858cae..8249858cae 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv-functor1.hs
+++ b/testsuite/tests/deriving/should_compile/drv-functor1.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv-functor1.stderr b/testsuite/tests/deriving/should_compile/drv-functor1.stderr
index a531dc56ef..a531dc56ef 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv-functor1.stderr
+++ b/testsuite/tests/deriving/should_compile/drv-functor1.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv-functor2.hs b/testsuite/tests/deriving/should_compile/drv-functor2.hs
index d070feb06d..d070feb06d 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv-functor2.hs
+++ b/testsuite/tests/deriving/should_compile/drv-functor2.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv001.hs b/testsuite/tests/deriving/should_compile/drv001.hs
index 694af6a50f..694af6a50f 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv001.hs
+++ b/testsuite/tests/deriving/should_compile/drv001.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv001.stderr b/testsuite/tests/deriving/should_compile/drv001.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv001.stderr
+++ b/testsuite/tests/deriving/should_compile/drv001.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv002.hs b/testsuite/tests/deriving/should_compile/drv002.hs
index 15eb2d9ecc..15eb2d9ecc 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv002.hs
+++ b/testsuite/tests/deriving/should_compile/drv002.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv002.stderr b/testsuite/tests/deriving/should_compile/drv002.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv002.stderr
+++ b/testsuite/tests/deriving/should_compile/drv002.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv003.hs b/testsuite/tests/deriving/should_compile/drv003.hs
index 0b8149ce8a..0b8149ce8a 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv003.hs
+++ b/testsuite/tests/deriving/should_compile/drv003.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv003.stderr b/testsuite/tests/deriving/should_compile/drv003.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv003.stderr
+++ b/testsuite/tests/deriving/should_compile/drv003.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv004.hs b/testsuite/tests/deriving/should_compile/drv004.hs
index 324a7f81d4..324a7f81d4 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv004.hs
+++ b/testsuite/tests/deriving/should_compile/drv004.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv004.stderr b/testsuite/tests/deriving/should_compile/drv004.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv004.stderr
+++ b/testsuite/tests/deriving/should_compile/drv004.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv005.hs b/testsuite/tests/deriving/should_compile/drv005.hs
index 527dde98b9..527dde98b9 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv005.hs
+++ b/testsuite/tests/deriving/should_compile/drv005.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv005.stderr b/testsuite/tests/deriving/should_compile/drv005.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv005.stderr
+++ b/testsuite/tests/deriving/should_compile/drv005.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv006.hs b/testsuite/tests/deriving/should_compile/drv006.hs
index 62f2cbcf67..62f2cbcf67 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv006.hs
+++ b/testsuite/tests/deriving/should_compile/drv006.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv006.stderr b/testsuite/tests/deriving/should_compile/drv006.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv006.stderr
+++ b/testsuite/tests/deriving/should_compile/drv006.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv007.hs b/testsuite/tests/deriving/should_compile/drv007.hs
index 22da5b4aa3..22da5b4aa3 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv007.hs
+++ b/testsuite/tests/deriving/should_compile/drv007.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv007.stderr b/testsuite/tests/deriving/should_compile/drv007.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv007.stderr
+++ b/testsuite/tests/deriving/should_compile/drv007.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv008.hs b/testsuite/tests/deriving/should_compile/drv008.hs
index b615809caa..b615809caa 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv008.hs
+++ b/testsuite/tests/deriving/should_compile/drv008.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv008.stderr b/testsuite/tests/deriving/should_compile/drv008.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv008.stderr
+++ b/testsuite/tests/deriving/should_compile/drv008.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv009.hs b/testsuite/tests/deriving/should_compile/drv009.hs
index 4ac069d30c..4ac069d30c 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv009.hs
+++ b/testsuite/tests/deriving/should_compile/drv009.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv009.stderr b/testsuite/tests/deriving/should_compile/drv009.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv009.stderr
+++ b/testsuite/tests/deriving/should_compile/drv009.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv010.hs b/testsuite/tests/deriving/should_compile/drv010.hs
index 1a3f9dc33a..1a3f9dc33a 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv010.hs
+++ b/testsuite/tests/deriving/should_compile/drv010.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv010.stderr b/testsuite/tests/deriving/should_compile/drv010.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv010.stderr
+++ b/testsuite/tests/deriving/should_compile/drv010.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv011.hs b/testsuite/tests/deriving/should_compile/drv011.hs
index bba25f5cae..bba25f5cae 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv011.hs
+++ b/testsuite/tests/deriving/should_compile/drv011.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv012.hs b/testsuite/tests/deriving/should_compile/drv012.hs
index eb8f3847cd..eb8f3847cd 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv012.hs
+++ b/testsuite/tests/deriving/should_compile/drv012.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv013.hs b/testsuite/tests/deriving/should_compile/drv013.hs
index 1686bcc232..1686bcc232 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv013.hs
+++ b/testsuite/tests/deriving/should_compile/drv013.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv014.hs b/testsuite/tests/deriving/should_compile/drv014.hs
index 12e2a15b3f..12e2a15b3f 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv014.hs
+++ b/testsuite/tests/deriving/should_compile/drv014.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv015.hs b/testsuite/tests/deriving/should_compile/drv015.hs
index f8cfbce2db..f8cfbce2db 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv015.hs
+++ b/testsuite/tests/deriving/should_compile/drv015.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv020.hs b/testsuite/tests/deriving/should_compile/drv020.hs
index 8794b745e5..8794b745e5 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv020.hs
+++ b/testsuite/tests/deriving/should_compile/drv020.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/drv021.hs b/testsuite/tests/deriving/should_compile/drv021.hs
index c9800508de..c9800508de 100644
--- a/testsuite/tests/ghc-regress/deriving/should_compile/drv021.hs
+++ b/testsuite/tests/deriving/should_compile/drv021.hs
diff --git a/testsuite/tests/deriving/should_fail/Makefile b/testsuite/tests/deriving/should_fail/Makefile
new file mode 100644
index 0000000000..0f0995d29d
--- /dev/null
+++ b/testsuite/tests/deriving/should_fail/Makefile
@@ -0,0 +1,8 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+drvfail016:
+	$(RM) -f drvfail016.hi-boot drvfail016.o-boot
+	'$(TEST_HC)' $(TEST_HC_OPTS) -XGeneralizedNewtypeDeriving -c drvfail016.hs-boot; echo $$?
+
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2394.hs b/testsuite/tests/deriving/should_fail/T2394.hs
index 6e62bc364e..6e62bc364e 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2394.hs
+++ b/testsuite/tests/deriving/should_fail/T2394.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2394.stderr b/testsuite/tests/deriving/should_fail/T2394.stderr
index 9972186ed5..9972186ed5 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2394.stderr
+++ b/testsuite/tests/deriving/should_fail/T2394.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2604.hs b/testsuite/tests/deriving/should_fail/T2604.hs
index 0f830d992b..0f830d992b 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2604.hs
+++ b/testsuite/tests/deriving/should_fail/T2604.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2604.stderr b/testsuite/tests/deriving/should_fail/T2604.stderr
index fa09654c5b..fa09654c5b 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2604.stderr
+++ b/testsuite/tests/deriving/should_fail/T2604.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2604.stderr-7.0 b/testsuite/tests/deriving/should_fail/T2604.stderr-7.0
index aa996e0f87..aa996e0f87 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2604.stderr-7.0
+++ b/testsuite/tests/deriving/should_fail/T2604.stderr-7.0
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2701.hs b/testsuite/tests/deriving/should_fail/T2701.hs
index 37bffc827d..37bffc827d 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2701.hs
+++ b/testsuite/tests/deriving/should_fail/T2701.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2701.stderr b/testsuite/tests/deriving/should_fail/T2701.stderr
index a9181accc1..a9181accc1 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2701.stderr
+++ b/testsuite/tests/deriving/should_fail/T2701.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2721.hs b/testsuite/tests/deriving/should_fail/T2721.hs
index f6485ce514..f6485ce514 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2721.hs
+++ b/testsuite/tests/deriving/should_fail/T2721.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2721.stderr b/testsuite/tests/deriving/should_fail/T2721.stderr
index 03339d3bfa..03339d3bfa 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2721.stderr
+++ b/testsuite/tests/deriving/should_fail/T2721.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2851.hs b/testsuite/tests/deriving/should_fail/T2851.hs
index bc7239af0a..bc7239af0a 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2851.hs
+++ b/testsuite/tests/deriving/should_fail/T2851.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T2851.stderr b/testsuite/tests/deriving/should_fail/T2851.stderr
index a2beb9869d..a2beb9869d 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T2851.stderr
+++ b/testsuite/tests/deriving/should_fail/T2851.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3101.hs b/testsuite/tests/deriving/should_fail/T3101.hs
index 134694a4fe..134694a4fe 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3101.hs
+++ b/testsuite/tests/deriving/should_fail/T3101.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3101.stderr b/testsuite/tests/deriving/should_fail/T3101.stderr
index 34f423daff..34f423daff 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3101.stderr
+++ b/testsuite/tests/deriving/should_fail/T3101.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3621.hs b/testsuite/tests/deriving/should_fail/T3621.hs
index cd574eab81..cd574eab81 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3621.hs
+++ b/testsuite/tests/deriving/should_fail/T3621.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3621.stderr b/testsuite/tests/deriving/should_fail/T3621.stderr
index dc9dc849ab..dc9dc849ab 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3621.stderr
+++ b/testsuite/tests/deriving/should_fail/T3621.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3833.hs b/testsuite/tests/deriving/should_fail/T3833.hs
index d1196c4112..d1196c4112 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3833.hs
+++ b/testsuite/tests/deriving/should_fail/T3833.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3833.stderr b/testsuite/tests/deriving/should_fail/T3833.stderr
index 2d31cc1364..2d31cc1364 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3833.stderr
+++ b/testsuite/tests/deriving/should_fail/T3833.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3834.hs b/testsuite/tests/deriving/should_fail/T3834.hs
index 614170198e..614170198e 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3834.hs
+++ b/testsuite/tests/deriving/should_fail/T3834.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T3834.stderr b/testsuite/tests/deriving/should_fail/T3834.stderr
index 199b4bb799..199b4bb799 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T3834.stderr
+++ b/testsuite/tests/deriving/should_fail/T3834.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T4528.hs b/testsuite/tests/deriving/should_fail/T4528.hs
index 23a8510d98..23a8510d98 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T4528.hs
+++ b/testsuite/tests/deriving/should_fail/T4528.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/T4528.stderr b/testsuite/tests/deriving/should_fail/T4528.stderr
index 8f008e8908..8f008e8908 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/T4528.stderr
+++ b/testsuite/tests/deriving/should_fail/T4528.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/all.T b/testsuite/tests/deriving/should_fail/all.T
index 8fa5e27e60..8fa5e27e60 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/all.T
+++ b/testsuite/tests/deriving/should_fail/all.T
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-foldable-traversable1.hs b/testsuite/tests/deriving/should_fail/drvfail-foldable-traversable1.hs
index ced3f98c63..ced3f98c63 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-foldable-traversable1.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail-foldable-traversable1.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-foldable-traversable1.stderr b/testsuite/tests/deriving/should_fail/drvfail-foldable-traversable1.stderr
index ecd20e8372..ecd20e8372 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-foldable-traversable1.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail-foldable-traversable1.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor1.hs b/testsuite/tests/deriving/should_fail/drvfail-functor1.hs
index 94ebd925b8..94ebd925b8 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor1.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail-functor1.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor1.stderr b/testsuite/tests/deriving/should_fail/drvfail-functor1.stderr
index d221f99f9d..d221f99f9d 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor1.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail-functor1.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.hs b/testsuite/tests/deriving/should_fail/drvfail-functor2.hs
index 7198755b80..7198755b80 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail-functor2.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.stderr b/testsuite/tests/deriving/should_fail/drvfail-functor2.stderr
index 7ce404666f..7ce404666f 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail-functor2.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail-functor2.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail001.hs b/testsuite/tests/deriving/should_fail/drvfail001.hs
index 47447fb3e3..47447fb3e3 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail001.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail001.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail001.stderr b/testsuite/tests/deriving/should_fail/drvfail001.stderr
index a2a149594c..a2a149594c 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail001.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail001.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.hs b/testsuite/tests/deriving/should_fail/drvfail002.hs
index 26a8f083d2..26a8f083d2 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail002.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr b/testsuite/tests/deriving/should_fail/drvfail002.stderr
index c174c69055..c174c69055 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail002.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr-hugs b/testsuite/tests/deriving/should_fail/drvfail002.stderr-hugs
index b67a94ef5c..b67a94ef5c 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail002.stderr-hugs
+++ b/testsuite/tests/deriving/should_fail/drvfail002.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.hs b/testsuite/tests/deriving/should_fail/drvfail003.hs
index 5d22dc1d4a..5d22dc1d4a 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail003.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.stderr b/testsuite/tests/deriving/should_fail/drvfail003.stderr
index 4aa98531b8..4aa98531b8 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail003.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.stderr-hugs b/testsuite/tests/deriving/should_fail/drvfail003.stderr-hugs
index 0dab54095c..0dab54095c 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail003.stderr-hugs
+++ b/testsuite/tests/deriving/should_fail/drvfail003.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.hs b/testsuite/tests/deriving/should_fail/drvfail004.hs
index 8716a5837f..8716a5837f 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail004.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.stderr b/testsuite/tests/deriving/should_fail/drvfail004.stderr
index d08f315cb7..d08f315cb7 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail004.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.stderr-hugs b/testsuite/tests/deriving/should_fail/drvfail004.stderr-hugs
index 4370d8e96c..4370d8e96c 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail004.stderr-hugs
+++ b/testsuite/tests/deriving/should_fail/drvfail004.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail005.hs b/testsuite/tests/deriving/should_fail/drvfail005.hs
index ee44e2f343..ee44e2f343 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail005.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail005.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail005.stderr b/testsuite/tests/deriving/should_fail/drvfail005.stderr
index e27f3c1fd2..e27f3c1fd2 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail005.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail005.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.hs b/testsuite/tests/deriving/should_fail/drvfail006.hs
index 0d8d1a95d9..0d8d1a95d9 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail006.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.stderr b/testsuite/tests/deriving/should_fail/drvfail006.stderr
index 018291b6bb..018291b6bb 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail006.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.stderr-hugs b/testsuite/tests/deriving/should_fail/drvfail006.stderr-hugs
index b4c1c277a0..b4c1c277a0 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail006.stderr-hugs
+++ b/testsuite/tests/deriving/should_fail/drvfail006.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.hs b/testsuite/tests/deriving/should_fail/drvfail007.hs
index 74f9f033d3..74f9f033d3 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail007.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.stderr b/testsuite/tests/deriving/should_fail/drvfail007.stderr
index 7dc7124fd1..7dc7124fd1 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail007.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.stderr-hugs b/testsuite/tests/deriving/should_fail/drvfail007.stderr-hugs
index 3285aeeb78..3285aeeb78 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail007.stderr-hugs
+++ b/testsuite/tests/deriving/should_fail/drvfail007.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail008.hs b/testsuite/tests/deriving/should_fail/drvfail008.hs
index af8628b4d5..af8628b4d5 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail008.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail008.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail008.stderr b/testsuite/tests/deriving/should_fail/drvfail008.stderr
index 9b56dfb1d7..9b56dfb1d7 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail008.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail008.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.hs b/testsuite/tests/deriving/should_fail/drvfail009.hs
index 06155c38a1..06155c38a1 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail009.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.stderr b/testsuite/tests/deriving/should_fail/drvfail009.stderr
index 7594baef39..7594baef39 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail009.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.stderr-hugs b/testsuite/tests/deriving/should_fail/drvfail009.stderr-hugs
index 79fba84f61..79fba84f61 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail009.stderr-hugs
+++ b/testsuite/tests/deriving/should_fail/drvfail009.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.hs b/testsuite/tests/deriving/should_fail/drvfail010.hs
index efecf07cf1..efecf07cf1 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail010.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr b/testsuite/tests/deriving/should_fail/drvfail010.stderr
index a61fb4892f..a61fb4892f 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail010.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr-hugs b/testsuite/tests/deriving/should_fail/drvfail010.stderr-hugs
index f6479975a5..f6479975a5 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail010.stderr-hugs
+++ b/testsuite/tests/deriving/should_fail/drvfail010.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail011.hs b/testsuite/tests/deriving/should_fail/drvfail011.hs
index 33e35c4d83..33e35c4d83 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail011.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail011.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail011.stderr b/testsuite/tests/deriving/should_fail/drvfail011.stderr
index 80e486628b..80e486628b 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail011.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail011.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail012.hs b/testsuite/tests/deriving/should_fail/drvfail012.hs
index 4a073bbed1..4a073bbed1 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail012.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail012.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail012.stderr b/testsuite/tests/deriving/should_fail/drvfail012.stderr
index 22fac4887d..22fac4887d 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail012.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail012.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail013.hs b/testsuite/tests/deriving/should_fail/drvfail013.hs
index d8a7322dba..d8a7322dba 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail013.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail013.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail013.stderr b/testsuite/tests/deriving/should_fail/drvfail013.stderr
index 94927cd790..94927cd790 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail013.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail013.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail014.hs b/testsuite/tests/deriving/should_fail/drvfail014.hs
index 9039332f29..9039332f29 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail014.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail014.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail014.stderr b/testsuite/tests/deriving/should_fail/drvfail014.stderr
index 865a78c44e..865a78c44e 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail014.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail014.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.hs b/testsuite/tests/deriving/should_fail/drvfail015.hs
index 32d6134d34..32d6134d34 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail015.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.stderr b/testsuite/tests/deriving/should_fail/drvfail015.stderr
index a7d8ac6cf1..a7d8ac6cf1 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail015.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.stderr-7.0 b/testsuite/tests/deriving/should_fail/drvfail015.stderr-7.0
index 9f0166e9cd..9f0166e9cd 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail015.stderr-7.0
+++ b/testsuite/tests/deriving/should_fail/drvfail015.stderr-7.0
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.hs-boot b/testsuite/tests/deriving/should_fail/drvfail016.hs-boot
index b3a388f736..b3a388f736 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.hs-boot
+++ b/testsuite/tests/deriving/should_fail/drvfail016.hs-boot
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.stderr b/testsuite/tests/deriving/should_fail/drvfail016.stderr
index 1bcb7363b1..1bcb7363b1 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.stderr
+++ b/testsuite/tests/deriving/should_fail/drvfail016.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.stdout b/testsuite/tests/deriving/should_fail/drvfail016.stdout
index d00491fd7e..d00491fd7e 100644
--- a/testsuite/tests/ghc-regress/deriving/should_fail/drvfail016.stdout
+++ b/testsuite/tests/deriving/should_fail/drvfail016.stdout
diff --git a/testsuite/tests/ghc-regress/ghc-api/Makefile b/testsuite/tests/deriving/should_run/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/ghc-api/Makefile
+++ b/testsuite/tests/deriving/should_run/Makefile
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T2529.hs b/testsuite/tests/deriving/should_run/T2529.hs
index d3c3a4b0a3..d3c3a4b0a3 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/T2529.hs
+++ b/testsuite/tests/deriving/should_run/T2529.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T2529.stdout b/testsuite/tests/deriving/should_run/T2529.stdout
index 6c5fe6896f..6c5fe6896f 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/T2529.stdout
+++ b/testsuite/tests/deriving/should_run/T2529.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T3087.hs b/testsuite/tests/deriving/should_run/T3087.hs
index 7cba3d9609..7cba3d9609 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/T3087.hs
+++ b/testsuite/tests/deriving/should_run/T3087.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T3087.stdout b/testsuite/tests/deriving/should_run/T3087.stdout
index 35735b4d3b..35735b4d3b 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/T3087.stdout
+++ b/testsuite/tests/deriving/should_run/T3087.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T4136.hs b/testsuite/tests/deriving/should_run/T4136.hs
index d47014bdb0..d47014bdb0 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/T4136.hs
+++ b/testsuite/tests/deriving/should_run/T4136.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T4136.stdout b/testsuite/tests/deriving/should_run/T4136.stdout
index 05a108c942..05a108c942 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/T4136.stdout
+++ b/testsuite/tests/deriving/should_run/T4136.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T4528a.hs b/testsuite/tests/deriving/should_run/T4528a.hs
index 85933671c7..85933671c7 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/T4528a.hs
+++ b/testsuite/tests/deriving/should_run/T4528a.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T4528a.stdout b/testsuite/tests/deriving/should_run/T4528a.stdout
index 070375c1da..070375c1da 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/T4528a.stdout
+++ b/testsuite/tests/deriving/should_run/T4528a.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T5041.hs b/testsuite/tests/deriving/should_run/T5041.hs
index 4b7ba557dc..4b7ba557dc 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/T5041.hs
+++ b/testsuite/tests/deriving/should_run/T5041.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/T5041.stdout b/testsuite/tests/deriving/should_run/T5041.stdout
index 7de0b728af..7de0b728af 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/T5041.stdout
+++ b/testsuite/tests/deriving/should_run/T5041.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/all.T b/testsuite/tests/deriving/should_run/all.T
index 83e041f296..83e041f296 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/all.T
+++ b/testsuite/tests/deriving/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun-foldable1.hs b/testsuite/tests/deriving/should_run/drvrun-foldable1.hs
index 2db8600389..2db8600389 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun-foldable1.hs
+++ b/testsuite/tests/deriving/should_run/drvrun-foldable1.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun-foldable1.stdout b/testsuite/tests/deriving/should_run/drvrun-foldable1.stdout
index 7f8f011eb7..7f8f011eb7 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun-foldable1.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun-foldable1.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun-functor1.hs b/testsuite/tests/deriving/should_run/drvrun-functor1.hs
index 1367e360e0..1367e360e0 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun-functor1.hs
+++ b/testsuite/tests/deriving/should_run/drvrun-functor1.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun-functor1.stdout b/testsuite/tests/deriving/should_run/drvrun-functor1.stdout
index ba70f8db7a..ba70f8db7a 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun-functor1.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun-functor1.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun001.hs b/testsuite/tests/deriving/should_run/drvrun001.hs
index b6bd259aa7..b6bd259aa7 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun001.hs
+++ b/testsuite/tests/deriving/should_run/drvrun001.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun001.stdout b/testsuite/tests/deriving/should_run/drvrun001.stdout
index bbfb2f6226..bbfb2f6226 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun001.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun001.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun002.hs b/testsuite/tests/deriving/should_run/drvrun002.hs
index 26497bd32c..26497bd32c 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun002.hs
+++ b/testsuite/tests/deriving/should_run/drvrun002.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun002.stdout b/testsuite/tests/deriving/should_run/drvrun002.stdout
index 00c70df868..00c70df868 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun002.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun002.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun003.hs b/testsuite/tests/deriving/should_run/drvrun003.hs
index bb7486159e..bb7486159e 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun003.hs
+++ b/testsuite/tests/deriving/should_run/drvrun003.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun003.stdout b/testsuite/tests/deriving/should_run/drvrun003.stdout
index 584cfcd5ce..584cfcd5ce 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun003.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun003.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun004.hs b/testsuite/tests/deriving/should_run/drvrun004.hs
index f530803835..f530803835 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun004.hs
+++ b/testsuite/tests/deriving/should_run/drvrun004.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun004.stdout b/testsuite/tests/deriving/should_run/drvrun004.stdout
index c9088b7bd6..c9088b7bd6 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun004.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun004.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun005.hs b/testsuite/tests/deriving/should_run/drvrun005.hs
index a4ef060a6a..a4ef060a6a 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun005.hs
+++ b/testsuite/tests/deriving/should_run/drvrun005.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun005.stderr b/testsuite/tests/deriving/should_run/drvrun005.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun005.stderr
+++ b/testsuite/tests/deriving/should_run/drvrun005.stderr
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun005.stdout b/testsuite/tests/deriving/should_run/drvrun005.stdout
index c90bc69dcd..c90bc69dcd 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun005.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun005.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun006.hs b/testsuite/tests/deriving/should_run/drvrun006.hs
index 3d268019bd..3d268019bd 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun006.hs
+++ b/testsuite/tests/deriving/should_run/drvrun006.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun006.stdout b/testsuite/tests/deriving/should_run/drvrun006.stdout
index fe1beeeae0..fe1beeeae0 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun006.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun006.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun007.hs b/testsuite/tests/deriving/should_run/drvrun007.hs
index 5c26c3448d..5c26c3448d 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun007.hs
+++ b/testsuite/tests/deriving/should_run/drvrun007.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun007.stdout b/testsuite/tests/deriving/should_run/drvrun007.stdout
index fe13f39338..fe13f39338 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun007.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun007.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun008.hs b/testsuite/tests/deriving/should_run/drvrun008.hs
index 7fe77992ed..7fe77992ed 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun008.hs
+++ b/testsuite/tests/deriving/should_run/drvrun008.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun008.stdout b/testsuite/tests/deriving/should_run/drvrun008.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun008.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun008.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun009.hs b/testsuite/tests/deriving/should_run/drvrun009.hs
index 0bd22ab787..0bd22ab787 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun009.hs
+++ b/testsuite/tests/deriving/should_run/drvrun009.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun009.stdout b/testsuite/tests/deriving/should_run/drvrun009.stdout
index 2a7d99bd37..2a7d99bd37 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun009.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun009.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun010.hs b/testsuite/tests/deriving/should_run/drvrun010.hs
index 0a2f3d2742..0a2f3d2742 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun010.hs
+++ b/testsuite/tests/deriving/should_run/drvrun010.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun010.stdout b/testsuite/tests/deriving/should_run/drvrun010.stdout
index 153d19401b..153d19401b 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun010.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun010.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun011.hs b/testsuite/tests/deriving/should_run/drvrun011.hs
index aad1482f2a..aad1482f2a 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun011.hs
+++ b/testsuite/tests/deriving/should_run/drvrun011.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun011.stdout b/testsuite/tests/deriving/should_run/drvrun011.stdout
index 0ddc486aad..0ddc486aad 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun011.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun011.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun012.hs b/testsuite/tests/deriving/should_run/drvrun012.hs
index 3775a3b958..3775a3b958 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun012.hs
+++ b/testsuite/tests/deriving/should_run/drvrun012.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun012.stdout b/testsuite/tests/deriving/should_run/drvrun012.stdout
index dbef9bc870..dbef9bc870 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun012.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun012.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun013.hs b/testsuite/tests/deriving/should_run/drvrun013.hs
index 2a9adae585..2a9adae585 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun013.hs
+++ b/testsuite/tests/deriving/should_run/drvrun013.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun013.stdout b/testsuite/tests/deriving/should_run/drvrun013.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun013.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun013.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun014.hs b/testsuite/tests/deriving/should_run/drvrun014.hs
index 806af8ce1c..806af8ce1c 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun014.hs
+++ b/testsuite/tests/deriving/should_run/drvrun014.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun014.stdout b/testsuite/tests/deriving/should_run/drvrun014.stdout
index bc59c12aa1..bc59c12aa1 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun014.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun014.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun015.hs b/testsuite/tests/deriving/should_run/drvrun015.hs
index b6e10394fa..b6e10394fa 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun015.hs
+++ b/testsuite/tests/deriving/should_run/drvrun015.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun015.stdout b/testsuite/tests/deriving/should_run/drvrun015.stdout
index d7059cd3ff..d7059cd3ff 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun015.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun015.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun016.hs b/testsuite/tests/deriving/should_run/drvrun016.hs
index 1d6de577ac..1d6de577ac 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun016.hs
+++ b/testsuite/tests/deriving/should_run/drvrun016.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun016.stdout b/testsuite/tests/deriving/should_run/drvrun016.stdout
index 35821117c8..35821117c8 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun016.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun016.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun017.hs b/testsuite/tests/deriving/should_run/drvrun017.hs
index e14619c1a9..e14619c1a9 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun017.hs
+++ b/testsuite/tests/deriving/should_run/drvrun017.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun017.stdout b/testsuite/tests/deriving/should_run/drvrun017.stdout
index 6f1bd8c7fa..6f1bd8c7fa 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun017.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun017.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun018.hs b/testsuite/tests/deriving/should_run/drvrun018.hs
index a0b9f24362..a0b9f24362 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun018.hs
+++ b/testsuite/tests/deriving/should_run/drvrun018.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun018.stdout b/testsuite/tests/deriving/should_run/drvrun018.stdout
index 5393fc4654..5393fc4654 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun018.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun018.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun019.hs b/testsuite/tests/deriving/should_run/drvrun019.hs
index 3fd8ccf025..3fd8ccf025 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun019.hs
+++ b/testsuite/tests/deriving/should_run/drvrun019.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun019.stdout b/testsuite/tests/deriving/should_run/drvrun019.stdout
index f165e2102f..f165e2102f 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun019.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun019.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun020.hs b/testsuite/tests/deriving/should_run/drvrun020.hs
index cf78a2a992..cf78a2a992 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun020.hs
+++ b/testsuite/tests/deriving/should_run/drvrun020.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun020.stdout b/testsuite/tests/deriving/should_run/drvrun020.stdout
index bb33aca722..bb33aca722 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun020.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun020.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun021.hs b/testsuite/tests/deriving/should_run/drvrun021.hs
index 05c7c8dbf0..05c7c8dbf0 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun021.hs
+++ b/testsuite/tests/deriving/should_run/drvrun021.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun021.stdout b/testsuite/tests/deriving/should_run/drvrun021.stdout
index ae2b8d6354..ae2b8d6354 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun021.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun021.stdout
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun022.hs b/testsuite/tests/deriving/should_run/drvrun022.hs
index fe95c3323b..fe95c3323b 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun022.hs
+++ b/testsuite/tests/deriving/should_run/drvrun022.hs
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/drvrun022.stdout b/testsuite/tests/deriving/should_run/drvrun022.stdout
index e0ea368f1a..e0ea368f1a 100644
--- a/testsuite/tests/ghc-regress/deriving/should_run/drvrun022.stdout
+++ b/testsuite/tests/deriving/should_run/drvrun022.stdout
diff --git a/testsuite/tests/dph/Makefile b/testsuite/tests/dph/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/dph/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/dph/diophantine/DiophantineVect.hs b/testsuite/tests/dph/diophantine/DiophantineVect.hs
index bef6694b3d..bef6694b3d 100644
--- a/testsuite/tests/ghc-regress/dph/diophantine/DiophantineVect.hs
+++ b/testsuite/tests/dph/diophantine/DiophantineVect.hs
diff --git a/testsuite/tests/ghc-regress/dph/diophantine/Main.hs b/testsuite/tests/dph/diophantine/Main.hs
index eb8ae7ac28..eb8ae7ac28 100644
--- a/testsuite/tests/ghc-regress/dph/diophantine/Main.hs
+++ b/testsuite/tests/dph/diophantine/Main.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/Makefile b/testsuite/tests/dph/diophantine/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/Makefile
+++ b/testsuite/tests/dph/diophantine/Makefile
diff --git a/testsuite/tests/ghc-regress/dph/diophantine/dph-diophantine-fast.stdout b/testsuite/tests/dph/diophantine/dph-diophantine-fast.stdout
index 7088d6ced3..7088d6ced3 100644
--- a/testsuite/tests/ghc-regress/dph/diophantine/dph-diophantine-fast.stdout
+++ b/testsuite/tests/dph/diophantine/dph-diophantine-fast.stdout
diff --git a/testsuite/tests/ghc-regress/dph/diophantine/dph-diophantine-opt.stdout b/testsuite/tests/dph/diophantine/dph-diophantine-opt.stdout
index 7088d6ced3..7088d6ced3 100644
--- a/testsuite/tests/ghc-regress/dph/diophantine/dph-diophantine-opt.stdout
+++ b/testsuite/tests/dph/diophantine/dph-diophantine-opt.stdout
diff --git a/testsuite/tests/ghc-regress/dph/diophantine/dph-diophantine.T b/testsuite/tests/dph/diophantine/dph-diophantine.T
index c963db9145..c963db9145 100644
--- a/testsuite/tests/ghc-regress/dph/diophantine/dph-diophantine.T
+++ b/testsuite/tests/dph/diophantine/dph-diophantine.T
diff --git a/testsuite/tests/ghc-regress/dph/dotp/DotPVect.hs b/testsuite/tests/dph/dotp/DotPVect.hs
index 5b623017d9..5b623017d9 100644
--- a/testsuite/tests/ghc-regress/dph/dotp/DotPVect.hs
+++ b/testsuite/tests/dph/dotp/DotPVect.hs
diff --git a/testsuite/tests/ghc-regress/dph/dotp/Main.hs b/testsuite/tests/dph/dotp/Main.hs
index 436beb07fd..436beb07fd 100644
--- a/testsuite/tests/ghc-regress/dph/dotp/Main.hs
+++ b/testsuite/tests/dph/dotp/Main.hs
diff --git a/testsuite/tests/ghc-regress/ghci/Makefile b/testsuite/tests/dph/dotp/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/ghci/Makefile
+++ b/testsuite/tests/dph/dotp/Makefile
diff --git a/testsuite/tests/ghc-regress/dph/dotp/dph-dotp-fast.stdout b/testsuite/tests/dph/dotp/dph-dotp-fast.stdout
index e8f012cbc6..e8f012cbc6 100644
--- a/testsuite/tests/ghc-regress/dph/dotp/dph-dotp-fast.stdout
+++ b/testsuite/tests/dph/dotp/dph-dotp-fast.stdout
diff --git a/testsuite/tests/ghc-regress/dph/dotp/dph-dotp-opt.stdout b/testsuite/tests/dph/dotp/dph-dotp-opt.stdout
index e8f012cbc6..e8f012cbc6 100644
--- a/testsuite/tests/ghc-regress/dph/dotp/dph-dotp-opt.stdout
+++ b/testsuite/tests/dph/dotp/dph-dotp-opt.stdout
diff --git a/testsuite/tests/ghc-regress/dph/dotp/dph-dotp.T b/testsuite/tests/dph/dotp/dph-dotp.T
index 2ebab9da24..2ebab9da24 100644
--- a/testsuite/tests/ghc-regress/dph/dotp/dph-dotp.T
+++ b/testsuite/tests/dph/dotp/dph-dotp.T
diff --git a/testsuite/tests/ghc-regress/dph/primespj/Main.hs b/testsuite/tests/dph/primespj/Main.hs
index 049e6a3e04..049e6a3e04 100644
--- a/testsuite/tests/ghc-regress/dph/primespj/Main.hs
+++ b/testsuite/tests/dph/primespj/Main.hs
diff --git a/testsuite/tests/ghc-regress/haddock/Makefile b/testsuite/tests/dph/primespj/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/haddock/Makefile
+++ b/testsuite/tests/dph/primespj/Makefile
diff --git a/testsuite/tests/ghc-regress/dph/primespj/PrimesVect.hs b/testsuite/tests/dph/primespj/PrimesVect.hs
index 34b3a568b7..34b3a568b7 100644
--- a/testsuite/tests/ghc-regress/dph/primespj/PrimesVect.hs
+++ b/testsuite/tests/dph/primespj/PrimesVect.hs
diff --git a/testsuite/tests/ghc-regress/dph/primespj/dph-primespj-fast.stdout b/testsuite/tests/dph/primespj/dph-primespj-fast.stdout
index d935f68b11..d935f68b11 100644
--- a/testsuite/tests/ghc-regress/dph/primespj/dph-primespj-fast.stdout
+++ b/testsuite/tests/dph/primespj/dph-primespj-fast.stdout
diff --git a/testsuite/tests/ghc-regress/dph/primespj/dph-primespj-opt.stdout b/testsuite/tests/dph/primespj/dph-primespj-opt.stdout
index d935f68b11..d935f68b11 100644
--- a/testsuite/tests/ghc-regress/dph/primespj/dph-primespj-opt.stdout
+++ b/testsuite/tests/dph/primespj/dph-primespj-opt.stdout
diff --git a/testsuite/tests/ghc-regress/dph/primespj/dph-primespj.T b/testsuite/tests/dph/primespj/dph-primespj.T
index 458490456b..458490456b 100644
--- a/testsuite/tests/ghc-regress/dph/primespj/dph-primespj.T
+++ b/testsuite/tests/dph/primespj/dph-primespj.T
diff --git a/testsuite/tests/ghc-regress/dph/quickhull/Main.hs b/testsuite/tests/dph/quickhull/Main.hs
index ec59390850..ec59390850 100644
--- a/testsuite/tests/ghc-regress/dph/quickhull/Main.hs
+++ b/testsuite/tests/dph/quickhull/Main.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/Makefile b/testsuite/tests/dph/quickhull/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/indexed-types/Makefile
+++ b/testsuite/tests/dph/quickhull/Makefile
diff --git a/testsuite/tests/ghc-regress/dph/quickhull/QuickHullVect.hs b/testsuite/tests/dph/quickhull/QuickHullVect.hs
index 29aaa4a823..29aaa4a823 100644
--- a/testsuite/tests/ghc-regress/dph/quickhull/QuickHullVect.hs
+++ b/testsuite/tests/dph/quickhull/QuickHullVect.hs
diff --git a/testsuite/tests/ghc-regress/dph/quickhull/SVG.hs b/testsuite/tests/dph/quickhull/SVG.hs
index f4183a77d6..f4183a77d6 100644
--- a/testsuite/tests/ghc-regress/dph/quickhull/SVG.hs
+++ b/testsuite/tests/dph/quickhull/SVG.hs
diff --git a/testsuite/tests/ghc-regress/dph/quickhull/TestData.hs b/testsuite/tests/dph/quickhull/TestData.hs
index 6317927259..6317927259 100644
--- a/testsuite/tests/ghc-regress/dph/quickhull/TestData.hs
+++ b/testsuite/tests/dph/quickhull/TestData.hs
diff --git a/testsuite/tests/ghc-regress/dph/quickhull/Types.hs b/testsuite/tests/dph/quickhull/Types.hs
index 162458f424..162458f424 100644
--- a/testsuite/tests/ghc-regress/dph/quickhull/Types.hs
+++ b/testsuite/tests/dph/quickhull/Types.hs
diff --git a/testsuite/tests/ghc-regress/dph/quickhull/dph-quickhull-fast.stdout b/testsuite/tests/dph/quickhull/dph-quickhull-fast.stdout
index f6b2d92e9a..f6b2d92e9a 100644
--- a/testsuite/tests/ghc-regress/dph/quickhull/dph-quickhull-fast.stdout
+++ b/testsuite/tests/dph/quickhull/dph-quickhull-fast.stdout
diff --git a/testsuite/tests/ghc-regress/dph/quickhull/dph-quickhull-opt.stdout b/testsuite/tests/dph/quickhull/dph-quickhull-opt.stdout
index f6b2d92e9a..f6b2d92e9a 100644
--- a/testsuite/tests/ghc-regress/dph/quickhull/dph-quickhull-opt.stdout
+++ b/testsuite/tests/dph/quickhull/dph-quickhull-opt.stdout
diff --git a/testsuite/tests/ghc-regress/dph/quickhull/dph-quickhull.T b/testsuite/tests/dph/quickhull/dph-quickhull.T
index f1a1debe3f..f1a1debe3f 100644
--- a/testsuite/tests/ghc-regress/dph/quickhull/dph-quickhull.T
+++ b/testsuite/tests/dph/quickhull/dph-quickhull.T
diff --git a/testsuite/tests/ghc-regress/dph/smvm/Main.hs b/testsuite/tests/dph/smvm/Main.hs
index e30938bc21..e30938bc21 100644
--- a/testsuite/tests/ghc-regress/dph/smvm/Main.hs
+++ b/testsuite/tests/dph/smvm/Main.hs
diff --git a/testsuite/tests/ghc-regress/lib/Makefile b/testsuite/tests/dph/smvm/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/lib/Makefile
+++ b/testsuite/tests/dph/smvm/Makefile
diff --git a/testsuite/tests/ghc-regress/dph/smvm/SMVMVect.hs b/testsuite/tests/dph/smvm/SMVMVect.hs
index 93f3775741..93f3775741 100644
--- a/testsuite/tests/ghc-regress/dph/smvm/SMVMVect.hs
+++ b/testsuite/tests/dph/smvm/SMVMVect.hs
diff --git a/testsuite/tests/ghc-regress/dph/smvm/dph-smvm.T b/testsuite/tests/dph/smvm/dph-smvm.T
index d0a940a7c1..d0a940a7c1 100644
--- a/testsuite/tests/ghc-regress/dph/smvm/dph-smvm.T
+++ b/testsuite/tests/dph/smvm/dph-smvm.T
diff --git a/testsuite/tests/ghc-regress/dph/smvm/dph-smvm.stdout b/testsuite/tests/dph/smvm/dph-smvm.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/dph/smvm/dph-smvm.stdout
+++ b/testsuite/tests/dph/smvm/dph-smvm.stdout
diff --git a/testsuite/tests/ghc-regress/dph/smvm/result-i386.txt b/testsuite/tests/dph/smvm/result-i386.txt
index bf279482ef..bf279482ef 100644
--- a/testsuite/tests/ghc-regress/dph/smvm/result-i386.txt
+++ b/testsuite/tests/dph/smvm/result-i386.txt
diff --git a/testsuite/tests/ghc-regress/dph/smvm/result-sparc.txt b/testsuite/tests/dph/smvm/result-sparc.txt
index 8c85795cbc..8c85795cbc 100644
--- a/testsuite/tests/ghc-regress/dph/smvm/result-sparc.txt
+++ b/testsuite/tests/dph/smvm/result-sparc.txt
diff --git a/testsuite/tests/ghc-regress/dph/smvm/result-x86_64.txt b/testsuite/tests/dph/smvm/result-x86_64.txt
index ebad60a2b0..ebad60a2b0 100644
--- a/testsuite/tests/ghc-regress/dph/smvm/result-x86_64.txt
+++ b/testsuite/tests/dph/smvm/result-x86_64.txt
diff --git a/testsuite/tests/ghc-regress/dph/smvm/test-i386.dat b/testsuite/tests/dph/smvm/test-i386.dat
index 4db8d62620..4db8d62620 100644
--- a/testsuite/tests/ghc-regress/dph/smvm/test-i386.dat
+++ b/testsuite/tests/dph/smvm/test-i386.dat
diff --git a/testsuite/tests/ghc-regress/dph/smvm/test-sparc.dat b/testsuite/tests/dph/smvm/test-sparc.dat
index 73d2c201cd..73d2c201cd 100644
--- a/testsuite/tests/ghc-regress/dph/smvm/test-sparc.dat
+++ b/testsuite/tests/dph/smvm/test-sparc.dat
diff --git a/testsuite/tests/ghc-regress/dph/smvm/test-x86_64.dat b/testsuite/tests/dph/smvm/test-x86_64.dat
index 08a91f5ab1..08a91f5ab1 100644
--- a/testsuite/tests/ghc-regress/dph/smvm/test-x86_64.dat
+++ b/testsuite/tests/dph/smvm/test-x86_64.dat
diff --git a/testsuite/tests/ghc-regress/dph/sumnats/Main.hs b/testsuite/tests/dph/sumnats/Main.hs
index 9e18e335a9..9e18e335a9 100644
--- a/testsuite/tests/ghc-regress/dph/sumnats/Main.hs
+++ b/testsuite/tests/dph/sumnats/Main.hs
diff --git a/testsuite/tests/ghc-regress/mdo/Makefile b/testsuite/tests/dph/sumnats/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/mdo/Makefile
+++ b/testsuite/tests/dph/sumnats/Makefile
diff --git a/testsuite/tests/ghc-regress/dph/sumnats/SumNatsVect.hs b/testsuite/tests/dph/sumnats/SumNatsVect.hs
index f51f207d0c..f51f207d0c 100644
--- a/testsuite/tests/ghc-regress/dph/sumnats/SumNatsVect.hs
+++ b/testsuite/tests/dph/sumnats/SumNatsVect.hs
diff --git a/testsuite/tests/ghc-regress/dph/sumnats/dph-sumnats.T b/testsuite/tests/dph/sumnats/dph-sumnats.T
index f84757c5d7..f84757c5d7 100644
--- a/testsuite/tests/ghc-regress/dph/sumnats/dph-sumnats.T
+++ b/testsuite/tests/dph/sumnats/dph-sumnats.T
diff --git a/testsuite/tests/ghc-regress/dph/sumnats/dph-sumnats.stdout b/testsuite/tests/dph/sumnats/dph-sumnats.stdout
index 8858be2164..8858be2164 100644
--- a/testsuite/tests/ghc-regress/dph/sumnats/dph-sumnats.stdout
+++ b/testsuite/tests/dph/sumnats/dph-sumnats.stdout
diff --git a/testsuite/tests/ghc-regress/dph/words/Main.hs b/testsuite/tests/dph/words/Main.hs
index bc706fb751..bc706fb751 100644
--- a/testsuite/tests/ghc-regress/dph/words/Main.hs
+++ b/testsuite/tests/dph/words/Main.hs
diff --git a/testsuite/tests/ghc-regress/numeric/Makefile b/testsuite/tests/dph/words/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/numeric/Makefile
+++ b/testsuite/tests/dph/words/Makefile
diff --git a/testsuite/tests/ghc-regress/dph/words/WordsVect.hs b/testsuite/tests/dph/words/WordsVect.hs
index abf416e763..abf416e763 100644
--- a/testsuite/tests/ghc-regress/dph/words/WordsVect.hs
+++ b/testsuite/tests/dph/words/WordsVect.hs
diff --git a/testsuite/tests/ghc-regress/dph/words/dph-words-fast.stdout b/testsuite/tests/dph/words/dph-words-fast.stdout
index a7ad9be6b6..a7ad9be6b6 100644
--- a/testsuite/tests/ghc-regress/dph/words/dph-words-fast.stdout
+++ b/testsuite/tests/dph/words/dph-words-fast.stdout
diff --git a/testsuite/tests/ghc-regress/dph/words/dph-words-opt.stdout b/testsuite/tests/dph/words/dph-words-opt.stdout
index a7ad9be6b6..a7ad9be6b6 100644
--- a/testsuite/tests/ghc-regress/dph/words/dph-words-opt.stdout
+++ b/testsuite/tests/dph/words/dph-words-opt.stdout
diff --git a/testsuite/tests/ghc-regress/dph/words/dph-words.T b/testsuite/tests/dph/words/dph-words.T
index c89d01b08e..c89d01b08e 100644
--- a/testsuite/tests/ghc-regress/dph/words/dph-words.T
+++ b/testsuite/tests/dph/words/dph-words.T
diff --git a/testsuite/tests/ghc-regress/driver/1372/1372.stderr b/testsuite/tests/driver/1372/1372.stderr
index f06f294dae..f06f294dae 100644
--- a/testsuite/tests/ghc-regress/driver/1372/1372.stderr
+++ b/testsuite/tests/driver/1372/1372.stderr
diff --git a/testsuite/tests/driver/1372/Makefile b/testsuite/tests/driver/1372/Makefile
new file mode 100644
index 0000000000..f55a4a407d
--- /dev/null
+++ b/testsuite/tests/driver/1372/Makefile
@@ -0,0 +1,37 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+LOCAL_PKGCONF=local.package.conf
+
+clean:
+	rm -f p1/setup p1/Setup.o p1/Setup.hi
+	rm -f p2/setup p2/Setup.o p2/Setup.hi
+	rm -rf p1/dist p2/dist
+	rm -f *.o *.hi
+	rm -f clean.out prep.out
+	rm -f p1/A.hs
+	rm -f $(LOCAL_PKGCONF)
+
+1372:
+	$(MAKE) clean
+	$(MAKE) prep
+# This should recompile Main.hs, because A in package p1 has changed
+# and recompiling Main.hs will now fail.
+	-cd p2 && ./setup build -v0
+	$(MAKE) clean
+
+prep:
+	echo "[]" >$(LOCAL_PKGCONF)
+	cp p1/A1.hs p1/A.hs
+	$(MAKE) prep.p1
+	$(MAKE) prep.p2
+	cp p1/A2.hs p1/A.hs
+	cd p1 && ./setup build -v0
+
+prep.%:
+	cd $* && "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -o setup Setup.hs
+	cd $* && ./setup configure -v0 --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=../$(LOCAL_PKGCONF)
+	cd $* && ./setup build -v0
+	cd $* && ./setup register -v0 --inplace
+
diff --git a/testsuite/tests/ghc-regress/driver/1372/all.T b/testsuite/tests/driver/1372/all.T
index cabf3c01f8..cabf3c01f8 100644
--- a/testsuite/tests/ghc-regress/driver/1372/all.T
+++ b/testsuite/tests/driver/1372/all.T
diff --git a/testsuite/tests/ghc-regress/driver/1372/p1/A1.hs b/testsuite/tests/driver/1372/p1/A1.hs
index 6656b4bdfc..6656b4bdfc 100644
--- a/testsuite/tests/ghc-regress/driver/1372/p1/A1.hs
+++ b/testsuite/tests/driver/1372/p1/A1.hs
diff --git a/testsuite/tests/ghc-regress/driver/1372/p1/A2.hs b/testsuite/tests/driver/1372/p1/A2.hs
index aa0767c452..aa0767c452 100644
--- a/testsuite/tests/ghc-regress/driver/1372/p1/A2.hs
+++ b/testsuite/tests/driver/1372/p1/A2.hs
diff --git a/testsuite/tests/ghc-regress/driver/1372/p1/Setup.hs b/testsuite/tests/driver/1372/p1/Setup.hs
index 6fa548caf7..6fa548caf7 100644
--- a/testsuite/tests/ghc-regress/driver/1372/p1/Setup.hs
+++ b/testsuite/tests/driver/1372/p1/Setup.hs
diff --git a/testsuite/tests/ghc-regress/driver/1372/p1/p1.cabal b/testsuite/tests/driver/1372/p1/p1.cabal
index 66d4f0ec4c..66d4f0ec4c 100644
--- a/testsuite/tests/ghc-regress/driver/1372/p1/p1.cabal
+++ b/testsuite/tests/driver/1372/p1/p1.cabal
diff --git a/testsuite/tests/ghc-regress/driver/1372/p2/Main.hs b/testsuite/tests/driver/1372/p2/Main.hs
index b423120e43..b423120e43 100644
--- a/testsuite/tests/ghc-regress/driver/1372/p2/Main.hs
+++ b/testsuite/tests/driver/1372/p2/Main.hs
diff --git a/testsuite/tests/ghc-regress/driver/1372/p2/Setup.hs b/testsuite/tests/driver/1372/p2/Setup.hs
index 6fa548caf7..6fa548caf7 100644
--- a/testsuite/tests/ghc-regress/driver/1372/p2/Setup.hs
+++ b/testsuite/tests/driver/1372/p2/Setup.hs
diff --git a/testsuite/tests/ghc-regress/driver/1372/p2/p2.cabal b/testsuite/tests/driver/1372/p2/p2.cabal
index 903515e80c..903515e80c 100644
--- a/testsuite/tests/ghc-regress/driver/1372/p2/p2.cabal
+++ b/testsuite/tests/driver/1372/p2/p2.cabal
diff --git a/testsuite/tests/ghc-regress/driver/1959/1959.stdout b/testsuite/tests/driver/1959/1959.stdout
index 3db47397ee..3db47397ee 100644
--- a/testsuite/tests/ghc-regress/driver/1959/1959.stdout
+++ b/testsuite/tests/driver/1959/1959.stdout
diff --git a/testsuite/tests/ghc-regress/driver/1959/B.hs b/testsuite/tests/driver/1959/B.hs
index 8523c17bb4..8523c17bb4 100644
--- a/testsuite/tests/ghc-regress/driver/1959/B.hs
+++ b/testsuite/tests/driver/1959/B.hs
diff --git a/testsuite/tests/ghc-regress/driver/1959/C.hs b/testsuite/tests/driver/1959/C.hs
index 9106a32495..9106a32495 100644
--- a/testsuite/tests/ghc-regress/driver/1959/C.hs
+++ b/testsuite/tests/driver/1959/C.hs
diff --git a/testsuite/tests/ghc-regress/driver/1959/D.hs b/testsuite/tests/driver/1959/D.hs
index 8ff5b1397d..8ff5b1397d 100644
--- a/testsuite/tests/ghc-regress/driver/1959/D.hs
+++ b/testsuite/tests/driver/1959/D.hs
diff --git a/testsuite/tests/ghc-regress/driver/1959/E1.hs b/testsuite/tests/driver/1959/E1.hs
index 1efb41b3e4..1efb41b3e4 100644
--- a/testsuite/tests/ghc-regress/driver/1959/E1.hs
+++ b/testsuite/tests/driver/1959/E1.hs
diff --git a/testsuite/tests/ghc-regress/driver/1959/E2.hs b/testsuite/tests/driver/1959/E2.hs
index cb0ca32ad0..cb0ca32ad0 100644
--- a/testsuite/tests/ghc-regress/driver/1959/E2.hs
+++ b/testsuite/tests/driver/1959/E2.hs
diff --git a/testsuite/tests/driver/1959/Makefile b/testsuite/tests/driver/1959/Makefile
new file mode 100644
index 0000000000..844a442afa
--- /dev/null
+++ b/testsuite/tests/driver/1959/Makefile
@@ -0,0 +1,25 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+# Test recompilation bug #1959, which failed in 6.8.1 (and earlier)
+
+compile ::
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O E.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O D.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O -funfolding-use-threshold=0 C.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O B.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) E.o D.o C.o B.o -o prog
+
+clean ::
+	rm -f *.o *.hi E.hs
+
+dotest ::
+	$(MAKE) clean
+	cp E1.hs E.hs
+	$(MAKE) compile
+	./prog
+	sleep 1
+	cp E2.hs E.hs
+	$(MAKE) compile
+	./prog
diff --git a/testsuite/tests/ghc-regress/driver/1959/test.T b/testsuite/tests/driver/1959/test.T
index ff9e8f63a4..ff9e8f63a4 100644
--- a/testsuite/tests/ghc-regress/driver/1959/test.T
+++ b/testsuite/tests/driver/1959/test.T
diff --git a/testsuite/tests/ghc-regress/driver/2464.hs b/testsuite/tests/driver/2464.hs
index 3547c100fb..3547c100fb 100644
--- a/testsuite/tests/ghc-regress/driver/2464.hs
+++ b/testsuite/tests/driver/2464.hs
diff --git a/testsuite/tests/ghc-regress/driver/2464.stderr b/testsuite/tests/driver/2464.stderr
index 31e794e33c..31e794e33c 100644
--- a/testsuite/tests/ghc-regress/driver/2464.stderr
+++ b/testsuite/tests/driver/2464.stderr
diff --git a/testsuite/tests/ghc-regress/driver/2499.hs b/testsuite/tests/driver/2499.hs
index b4f48879ee..b4f48879ee 100644
--- a/testsuite/tests/ghc-regress/driver/2499.hs
+++ b/testsuite/tests/driver/2499.hs
diff --git a/testsuite/tests/ghc-regress/driver/2499.stderr b/testsuite/tests/driver/2499.stderr
index 73404befe3..73404befe3 100644
--- a/testsuite/tests/ghc-regress/driver/2499.stderr
+++ b/testsuite/tests/driver/2499.stderr
diff --git a/testsuite/tests/ghc-regress/driver/2566.stderr b/testsuite/tests/driver/2566.stderr
index 526c76a86a..526c76a86a 100644
--- a/testsuite/tests/ghc-regress/driver/2566.stderr
+++ b/testsuite/tests/driver/2566.stderr
diff --git a/testsuite/tests/ghc-regress/driver/3674.hs b/testsuite/tests/driver/3674.hs
index 2253ca12ce..2253ca12ce 100644
--- a/testsuite/tests/ghc-regress/driver/3674.hs
+++ b/testsuite/tests/driver/3674.hs
diff --git a/testsuite/tests/ghc-regress/driver/3674_pre.hs b/testsuite/tests/driver/3674_pre.hs
index aef9cef9c7..aef9cef9c7 100644
--- a/testsuite/tests/ghc-regress/driver/3674_pre.hs
+++ b/testsuite/tests/driver/3674_pre.hs
diff --git a/testsuite/tests/ghc-regress/driver/5313.hs b/testsuite/tests/driver/5313.hs
index 14b809bf7d..14b809bf7d 100644
--- a/testsuite/tests/ghc-regress/driver/5313.hs
+++ b/testsuite/tests/driver/5313.hs
diff --git a/testsuite/tests/ghc-regress/driver/A011.hs b/testsuite/tests/driver/A011.hs
index 96b88f80cc..96b88f80cc 100644
--- a/testsuite/tests/ghc-regress/driver/A011.hs
+++ b/testsuite/tests/driver/A011.hs
diff --git a/testsuite/tests/ghc-regress/driver/A012.hs b/testsuite/tests/driver/A012.hs
index 0dd79b8e05..0dd79b8e05 100644
--- a/testsuite/tests/ghc-regress/driver/A012.hs
+++ b/testsuite/tests/driver/A012.hs
diff --git a/testsuite/tests/ghc-regress/driver/A013.hs b/testsuite/tests/driver/A013.hs
index 77275572d8..77275572d8 100644
--- a/testsuite/tests/ghc-regress/driver/A013.hs
+++ b/testsuite/tests/driver/A013.hs
diff --git a/testsuite/tests/ghc-regress/driver/A014.hs b/testsuite/tests/driver/A014.hs
index 3f850104b2..3f850104b2 100644
--- a/testsuite/tests/ghc-regress/driver/A014.hs
+++ b/testsuite/tests/driver/A014.hs
diff --git a/testsuite/tests/ghc-regress/driver/A015.hs b/testsuite/tests/driver/A015.hs
index 1f354be31d..1f354be31d 100644
--- a/testsuite/tests/ghc-regress/driver/A015.hs
+++ b/testsuite/tests/driver/A015.hs
diff --git a/testsuite/tests/ghc-regress/driver/A031.hs b/testsuite/tests/driver/A031.hs
index 12936c4306..12936c4306 100644
--- a/testsuite/tests/ghc-regress/driver/A031.hs
+++ b/testsuite/tests/driver/A031.hs
diff --git a/testsuite/tests/ghc-regress/driver/A032.hs b/testsuite/tests/driver/A032.hs
index 0701b781d8..0701b781d8 100644
--- a/testsuite/tests/ghc-regress/driver/A032.hs
+++ b/testsuite/tests/driver/A032.hs
diff --git a/testsuite/tests/ghc-regress/driver/A033.hs b/testsuite/tests/driver/A033.hs
index d7be73eb49..d7be73eb49 100644
--- a/testsuite/tests/ghc-regress/driver/A033.hs
+++ b/testsuite/tests/driver/A033.hs
diff --git a/testsuite/tests/ghc-regress/driver/A061a.hs b/testsuite/tests/driver/A061a.hs
index 85230a1e3d..85230a1e3d 100644
--- a/testsuite/tests/ghc-regress/driver/A061a.hs
+++ b/testsuite/tests/driver/A061a.hs
diff --git a/testsuite/tests/ghc-regress/driver/A061b.hs b/testsuite/tests/driver/A061b.hs
index 8244ddbb27..8244ddbb27 100644
--- a/testsuite/tests/ghc-regress/driver/A061b.hs
+++ b/testsuite/tests/driver/A061b.hs
diff --git a/testsuite/tests/ghc-regress/driver/A063.hs b/testsuite/tests/driver/A063.hs
index fac8c10a34..fac8c10a34 100644
--- a/testsuite/tests/ghc-regress/driver/A063.hs
+++ b/testsuite/tests/driver/A063.hs
diff --git a/testsuite/tests/ghc-regress/driver/A064.hs b/testsuite/tests/driver/A064.hs
index 8ee13be248..8ee13be248 100644
--- a/testsuite/tests/ghc-regress/driver/A064.hs
+++ b/testsuite/tests/driver/A064.hs
diff --git a/testsuite/tests/ghc-regress/driver/A065.hs b/testsuite/tests/driver/A065.hs
index 7de1a30132..7de1a30132 100644
--- a/testsuite/tests/ghc-regress/driver/A065.hs
+++ b/testsuite/tests/driver/A065.hs
diff --git a/testsuite/tests/ghc-regress/driver/A066.hs b/testsuite/tests/driver/A066.hs
index be9b016c38..be9b016c38 100644
--- a/testsuite/tests/ghc-regress/driver/A066.hs
+++ b/testsuite/tests/driver/A066.hs
diff --git a/testsuite/tests/ghc-regress/driver/A067.hs b/testsuite/tests/driver/A067.hs
index 8b57b4dc5d..8b57b4dc5d 100644
--- a/testsuite/tests/ghc-regress/driver/A067.hs
+++ b/testsuite/tests/driver/A067.hs
diff --git a/testsuite/tests/ghc-regress/driver/A070.hs b/testsuite/tests/driver/A070.hs
index 12fa79d0e0..12fa79d0e0 100644
--- a/testsuite/tests/ghc-regress/driver/A070.hs
+++ b/testsuite/tests/driver/A070.hs
diff --git a/testsuite/tests/ghc-regress/driver/A071.hs b/testsuite/tests/driver/A071.hs
index 3d2a64cfc6..3d2a64cfc6 100644
--- a/testsuite/tests/ghc-regress/driver/A071.hs
+++ b/testsuite/tests/driver/A071.hs
diff --git a/testsuite/tests/ghc-regress/driver/A200.hs b/testsuite/tests/driver/A200.hs
index 0bc3b2f236..0bc3b2f236 100644
--- a/testsuite/tests/ghc-regress/driver/A200.hs
+++ b/testsuite/tests/driver/A200.hs
diff --git a/testsuite/tests/ghc-regress/driver/B021/C.hs b/testsuite/tests/driver/B021/C.hs
index 01ecd10813..01ecd10813 100644
--- a/testsuite/tests/ghc-regress/driver/B021/C.hs
+++ b/testsuite/tests/driver/B021/C.hs
diff --git a/testsuite/tests/ghc-regress/driver/B022/C.hs b/testsuite/tests/driver/B022/C.hs
index 230a6105f1..230a6105f1 100644
--- a/testsuite/tests/ghc-regress/driver/B022/C.hs
+++ b/testsuite/tests/driver/B022/C.hs
diff --git a/testsuite/tests/ghc-regress/driver/B023/C.hs b/testsuite/tests/driver/B023/C.hs
index e70870831b..e70870831b 100644
--- a/testsuite/tests/ghc-regress/driver/B023/C.hs
+++ b/testsuite/tests/driver/B023/C.hs
diff --git a/testsuite/tests/ghc-regress/driver/B024/C.hs b/testsuite/tests/driver/B024/C.hs
index 397b5a5a80..397b5a5a80 100644
--- a/testsuite/tests/ghc-regress/driver/B024/C.hs
+++ b/testsuite/tests/driver/B024/C.hs
diff --git a/testsuite/tests/ghc-regress/driver/B025/C.hs b/testsuite/tests/driver/B025/C.hs
index 159cadd483..159cadd483 100644
--- a/testsuite/tests/ghc-regress/driver/B025/C.hs
+++ b/testsuite/tests/driver/B025/C.hs
diff --git a/testsuite/tests/ghc-regress/driver/B027/F.hs b/testsuite/tests/driver/B027/F.hs
index 9e67706069..9e67706069 100644
--- a/testsuite/tests/ghc-regress/driver/B027/F.hs
+++ b/testsuite/tests/driver/B027/F.hs
diff --git a/testsuite/tests/ghc-regress/driver/B028/F.hs b/testsuite/tests/driver/B028/F.hs
index 8630af1124..8630af1124 100644
--- a/testsuite/tests/ghc-regress/driver/B028/F.hs
+++ b/testsuite/tests/driver/B028/F.hs
diff --git a/testsuite/tests/ghc-regress/driver/B041/C.hs b/testsuite/tests/driver/B041/C.hs
index 9d076f6aeb..9d076f6aeb 100644
--- a/testsuite/tests/ghc-regress/driver/B041/C.hs
+++ b/testsuite/tests/driver/B041/C.hs
diff --git a/testsuite/tests/ghc-regress/driver/B042/C.hs b/testsuite/tests/driver/B042/C.hs
index a91ce19f3e..a91ce19f3e 100644
--- a/testsuite/tests/ghc-regress/driver/B042/C.hs
+++ b/testsuite/tests/driver/B042/C.hs
diff --git a/testsuite/tests/ghc-regress/driver/B043/C.hs b/testsuite/tests/driver/B043/C.hs
index 320acedcd8..320acedcd8 100644
--- a/testsuite/tests/ghc-regress/driver/B043/C.hs
+++ b/testsuite/tests/driver/B043/C.hs
diff --git a/testsuite/tests/ghc-regress/driver/B044/F.hs b/testsuite/tests/driver/B044/F.hs
index d6ad4802c3..d6ad4802c3 100644
--- a/testsuite/tests/ghc-regress/driver/B044/F.hs
+++ b/testsuite/tests/driver/B044/F.hs
diff --git a/testsuite/tests/ghc-regress/driver/B045/F.hs b/testsuite/tests/driver/B045/F.hs
index c89635b3a4..c89635b3a4 100644
--- a/testsuite/tests/ghc-regress/driver/B045/F.hs
+++ b/testsuite/tests/driver/B045/F.hs
diff --git a/testsuite/tests/ghc-regress/driver/B200/C.hs b/testsuite/tests/driver/B200/C.hs
index 1927565999..1927565999 100644
--- a/testsuite/tests/ghc-regress/driver/B200/C.hs
+++ b/testsuite/tests/driver/B200/C.hs
diff --git a/testsuite/tests/ghc-regress/driver/D063.hs b/testsuite/tests/driver/D063.hs
index f62cd95ccd..f62cd95ccd 100644
--- a/testsuite/tests/ghc-regress/driver/D063.hs
+++ b/testsuite/tests/driver/D063.hs
diff --git a/testsuite/tests/ghc-regress/driver/D200.hs b/testsuite/tests/driver/D200.hs
index 4f23bedafe..4f23bedafe 100644
--- a/testsuite/tests/ghc-regress/driver/D200.hs
+++ b/testsuite/tests/driver/D200.hs
diff --git a/testsuite/tests/ghc-regress/driver/F016.hs b/testsuite/tests/driver/F016.hs
index 8cdad020ff..8cdad020ff 100644
--- a/testsuite/tests/ghc-regress/driver/F016.hs
+++ b/testsuite/tests/driver/F016.hs
diff --git a/testsuite/tests/ghc-regress/driver/F017.hs b/testsuite/tests/driver/F017.hs
index de6f93da9d..de6f93da9d 100644
--- a/testsuite/tests/ghc-regress/driver/F017.hs
+++ b/testsuite/tests/driver/F017.hs
diff --git a/testsuite/tests/ghc-regress/driver/F018.hs b/testsuite/tests/driver/F018.hs
index 613459aaa3..613459aaa3 100644
--- a/testsuite/tests/ghc-regress/driver/F018.hs
+++ b/testsuite/tests/driver/F018.hs
diff --git a/testsuite/tests/ghc-regress/driver/F018a.hs b/testsuite/tests/driver/F018a.hs
index 613459aaa3..613459aaa3 100644
--- a/testsuite/tests/ghc-regress/driver/F018a.hs
+++ b/testsuite/tests/driver/F018a.hs
diff --git a/testsuite/tests/ghc-regress/driver/F019.hs b/testsuite/tests/driver/F019.hs
index 724ee74a7c..724ee74a7c 100644
--- a/testsuite/tests/ghc-regress/driver/F019.hs
+++ b/testsuite/tests/driver/F019.hs
diff --git a/testsuite/tests/ghc-regress/driver/F034.hs b/testsuite/tests/driver/F034.hs
index e48d9a8faf..e48d9a8faf 100644
--- a/testsuite/tests/ghc-regress/driver/F034.hs
+++ b/testsuite/tests/driver/F034.hs
diff --git a/testsuite/tests/ghc-regress/driver/F035.hs b/testsuite/tests/driver/F035.hs
index 445c742070..445c742070 100644
--- a/testsuite/tests/ghc-regress/driver/F035.hs
+++ b/testsuite/tests/driver/F035.hs
diff --git a/testsuite/tests/driver/Makefile b/testsuite/tests/driver/Makefile
new file mode 100644
index 0000000000..e407fd80de
--- /dev/null
+++ b/testsuite/tests/driver/Makefile
@@ -0,0 +1,487 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+# A set of driver tests
+
+# Things to test:
+#
+#  - one-shot vs. --make
+#  - hierarchical vs. flat
+#  - -odir vs. no -odir
+#  - -hidir vs. no -hidir
+#  - root module vs. found modules
+
+OBJSUFFIX = .o
+
+# -----------------------------------------------------------------------------
+# One-shot compilations, non-hierarchical modules
+
+test011:
+	$(RM) A011.hi
+	$(RM) A011$(OBJSUFFIX)
+	"$(TEST_HC)" $(TEST_HC_OPTS) $(TEST_HC_OPTS) -c A011.hs
+	test -f A011.hi
+	test -f A011$(OBJSUFFIX)
+
+# test -o
+test012:
+	$(RM) A012.hi
+	$(RM) A012$(OBJSUFFIX)oo
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c A012.hs -o A012$(OBJSUFFIX)oo
+	test -f A012$(OBJSUFFIX)oo
+
+# test -ohi
+test013:
+	$(RM) A013.xhi
+	$(RM) A013$(OBJSUFFIX)
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c A013.hs -ohi A013.xhi
+	test -f A013.xhi
+
+# test -odir
+test014:
+	$(RM) -f A014.hi
+	$(RM) -rf obj014
+	mkdir obj014
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c A014.hs -odir obj014
+	test -f obj014/A014$(OBJSUFFIX)
+	test -f A014.hi
+
+# test -hidir
+test015:
+	$(RM) -f A015$(OBJSUFFIX)
+	$(RM) -rf hi015
+	mkdir hi015
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c A015.hs -hidir hi015
+	test -f A015$(OBJSUFFIX)
+	test -f hi015/A015.hi
+
+# test stub generation
+test016:
+	$(RM) F016.hi F016$(OBJSUFFIX) F016_stub.h
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c F016.hs
+	test -f F016_stub.h
+
+# test -stubdir (filename differs from module name)
+test017:
+	$(RM) F017.hi F017$(OBJSUFFIX)
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c F017.hs -stubdir stub017
+	test -f stub017/TestStub017_stub.h
+
+# test -odir with stubs (filename differs from module name)
+test018:
+	$(RM) -f F018.hi F018$(OBJSUFFIX) F018_stub.h
+	$(RM) -rf obj018
+	mkdir obj018
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c F018.hs -odir obj018
+
+# test for bug #3093
+test018a:
+	$(RM) -f F018a.hi F018a_stub.h *.obj.018
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c F018a.hs -osuf obj.018
+	test -f F018a.obj.018
+
+# test -outputdir
+test019:
+	$(RM) -rf out019
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c F019.hs -outputdir out019
+	test -f out019/TestStub019.hi
+	test -f out019/TestStub019_stub.h
+
+# -----------------------------------------------------------------------------
+# One-shot compilation, hierarchical modules
+
+test021:
+	$(RM) B021/C.hi
+	$(RM) B021/C$(OBJSUFFIX)
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c B021/C.hs
+	test -f B021/C.hi
+	test -f B021/C$(OBJSUFFIX)
+
+# test -o
+test022:
+	$(RM) B022/C.hi
+	$(RM) B022/C$(OBJSUFFIX)oo
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c B022/C.hs -o B022/C$(OBJSUFFIX)oo
+	test -f B022/C$(OBJSUFFIX)oo
+
+# test -ohi
+test023:
+	$(RM) B023/C.xhi
+	$(RM) B023/C$(OBJSUFFIX)
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c B023/C.hs -ohi B023/C.xhi
+	test -f B023/C.xhi
+
+# test -odir
+test024:
+	$(RM) -f B024/C.hi
+	$(RM) -rf obj024
+	mkdir obj024
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c B024/C.hs -odir obj024
+	test -f obj024/B024/C$(OBJSUFFIX)
+
+# test -odir with non-Haskell compilation
+test024a:
+	$(RM) -rf B024a
+	$(RM) -rf obj024a
+	mkdir B024a
+	mkdir obj024a
+	echo >B024a/stub.c
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c B024a/stub.c -odir obj024a
+	test -f obj024a/B024a/stub$(OBJSUFFIX)
+
+# test -hidir
+test025:
+	$(RM) -rf hi025
+	mkdir hi025
+	$(RM) B025/C$(OBJSUFFIX)
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c B025/C.hs -hidir hi025
+	test -f hi025/B025/C.hi
+
+# This is a hierarchical module that lives in a subdirectory.
+test026:
+	$(RM) d026/P/Q.hi
+	$(RM) d026/P/Q$(OBJSUFFIX)
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c d026/P/Q.hs
+	test -f d026/P/Q.hi
+	test -f d026/P/Q$(OBJSUFFIX)
+
+# test stub generation
+# -fvia-C, because we want to check that the .hc file can #include the stub.h
+test027:
+	$(RM) B027/F.hi B027/F$(OBJSUFFIX) B027/F_stub.h
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c B027/F.hs -fno-warn-deprecated-flags -fvia-C
+	test -f B027/F_stub.h
+
+# test -stubdir
+# -fvia-C, because we want to check that the .hc file can #include the stub.h
+test028:
+	$(RM) B028/F.hi B028/F$(OBJSUFFIX)
+	$(RM) stub028/B028/F_stub.h
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c B028/F.hs -stubdir stub028 -fno-warn-deprecated-flags -fvia-C
+	test -f stub028/B028/F_stub.h
+
+# -----------------------------------------------------------------------------
+# Compilation-manager compilations, flat modules
+
+test031:
+	$(RM) A031.hi
+	$(RM) A031$(OBJSUFFIX)
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make A031.hs
+	test -f A031.hi
+	test -f A031$(OBJSUFFIX)
+
+# test -odir
+test032:
+	$(RM) A032.hi
+	$(RM) -rf obj032
+	mkdir obj032
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make A032.hs -odir obj032
+	test -f obj032/A032$(OBJSUFFIX)
+
+# test -hidir
+test033:
+	$(RM) -rf hi033
+	$(RM) A033$(OBJSUFFIX)
+	mkdir hi033
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make A033.hs -hidir hi033
+	test -f hi033/A033.hi
+
+# test stub generation
+test034:
+	$(RM) F034.hi F034$(OBJSUFFIX) F034_stub.h
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make F034.hs
+	test -f F034_stub.h
+
+# test -stubdir (filename differs from module name)
+test035:
+	$(RM) F035.hi F$(OBJSUFFIX) stub035/Stubs_stub.h
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make F035.hs -stubdir stub035
+	test -f stub035/TestStub035_stub.h
+
+# -----------------------------------------------------------------------------
+# Compilation-manager compilations, hierarchical modules
+
+test041:
+	$(RM) B041/C.hi
+	$(RM) B041/C$(OBJSUFFIX)
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make B041/C.hs
+	test -f B041/C.hi
+	test -f B041/C$(OBJSUFFIX)
+
+# test -odir
+test042:
+	$(RM) -rf obj042
+	mkdir obj042
+	$(RM) B042/C.hi
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make B042/C.hs -odir obj042
+	test -f obj042/B042/C$(OBJSUFFIX)
+
+# test -hidir
+test043:
+	$(RM) -f B043/C$(OBJSUFFIX)
+	$(RM) -rf hi043
+	mkdir hi043
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make B043/C.hs -hidir hi043
+	test -f hi043/B043/C.hi
+
+# test stub generation
+test044:
+	$(RM) B044/F.hi B044/F$(OBJSUFFIX) B044/F_stub.h
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make B044/F.hs
+	test -f B044/F_stub.h
+
+# test -stubdir
+test045:
+	$(RM) B045/F.hi B045/F$(OBJSUFFIX)
+	$(RM) stub045/B045/F_stub.h
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make B045/F.hs -stubdir stub045
+	test -f stub045/B045/F_stub.h
+
+# -----------------------------------------------------------------------------
+# Compilation-manager compilations, hierarchical modules, non-root modules
+
+test051:
+	$(RM) d051_2/R/S.hi
+	$(RM) d051_2/R/S$(OBJSUFFIX)
+	$(RM) d051_1/P/Q.hi
+	$(RM) d051_1/P/Q$(OBJSUFFIX)
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -id051_1 -id051_2 R.S
+	test -f d051_2/R/S.hi
+	test -f d051_2/R/S$(OBJSUFFIX)
+	test -f d051_1/P/Q.hi
+	test -f d051_1/P/Q$(OBJSUFFIX)
+
+# test -odir
+test052:
+	$(RM) d052_2/R/S.hi
+	$(RM) d052_1/P/Q.hi
+	$(RM) -rf obj052
+	mkdir obj052
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -id052_1 -id052_2 -odir obj052 R.S
+	test -f d052_2/R/S.hi
+	test -f obj052/R/S$(OBJSUFFIX)
+	test -f d052_1/P/Q.hi
+	test -f obj052/P/Q$(OBJSUFFIX)
+
+# test -hidir
+test053:
+	$(RM) hi053/R/S.hi
+	$(RM) d053_2/R/S$(OBJSUFFIX)
+	$(RM) hi053/P/Q.hi
+	$(RM) d053_1/P/Q$(OBJSUFFIX)
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -id053_1 -id053_2 -hidir hi053 R.S
+	test -f hi053/R/S.hi
+	test -f d053_2/R/S$(OBJSUFFIX)
+	test -f hi053/P/Q.hi
+	test -f d053_1/P/Q$(OBJSUFFIX)
+
+# -----------------------------------------------------------------------------
+# Other tests
+
+# Test that -keep-s-files works with --make and -fvia-C
+test061a:
+	$(RM) A061a.hi A061a$(OBJSUFFIX) A061a.s
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -keep-s-files -fno-warn-deprecated-flags -fvia-C A061a.hs
+	test -f A061a.s
+
+# Test that -keep-s-files works without --make
+test061b:
+	$(RM) A061b.hi A061b$(OBJSUFFIX) A061b.s
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c -keep-s-files -fno-warn-deprecated-flags -fvia-C A061b.hs
+	test -f A061b.s
+
+# Test that -main-is works with --make
+test062a:
+	$(RM) Hello062a.hs Hello062a.hi Hello062a$(OBJSUFFIX) Hello062a.hc hello062a
+	echo "module Hello062a where { hello062a = putStrLn \"ok\" }" >Hello062a.hs
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -main-is Hello062a.hello062a Hello062a -o hello062a
+	./hello062a
+test062b:
+	$(RM) Hello062b.hs Hello062b.hi Hello062b$(OBJSUFFIX) Hello062b.hc hello062b
+	echo "module Hello062b where { main = putStrLn \"ok\" }" >Hello062b.hs
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -main-is Hello062b Hello062b -o hello062b
+	./hello062b
+test062c:
+	$(RM) Hello062c.hs Hello062c.hi Hello062c$(OBJSUFFIX) Hello062c.hc hello062c
+	echo "module Main (hello062c) where { hello062c = putStrLn \"ok\" }" >Hello062c.hs
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -main-is hello062c Hello062c.hs -o hello062c
+	./hello062c
+test062d:
+	$(RM) -rf B062d
+	$(RM) hello062d
+	mkdir B062d
+	echo "module B062d.Hello062d (hello062d) where { hello062d = putStrLn \"ok\" }" >B062d/Hello062d.hs
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -main-is B062d.Hello062d.hello062d B062d/Hello062d.hs -o hello062d
+	./hello062d
+test062e:
+	$(RM) -rf B062e
+	$(RM) Hello062e.hc hello062e
+	mkdir B062e
+	echo "module B062e.Hello062e (main) where { main = putStrLn \"ok\" }" >B062e/Hello062e.hs
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -main-is B062e.Hello062e B062e/Hello062e.hs -o hello062e
+	./hello062e
+
+# Test that -i deletes the list of search paths.
+# The compilation will fail, but we ignore the failure and just
+# compare the output, because make might give us a different exit code.
+test063:
+	$(RM) A063.hi A063$(OBJSUFFIX) A063.hc D063.hi D063$(OBJSUFFIX) D063.hc
+	-"$(TEST_HC)" $(TEST_HC_OPTS) --make -i -v0 D063.hs
+
+# Test -E
+test064:
+	$(RM) A064.hi A064.hspp
+	"$(TEST_HC)" $(TEST_HC_OPTS) -E A064.hs
+	test -f A064.hspp
+
+# Test -E/-cpp
+test065:
+	$(RM) A065.hi A065.hspp
+	"$(TEST_HC)" $(TEST_HC_OPTS) -E -cpp A065.hs
+	test -f A065.hspp
+
+# Test -E/-o
+test066:
+	$(RM) A066.hi A066.tmp
+	"$(TEST_HC)" $(TEST_HC_OPTS) -E A066.hs -o A066.tmp
+	test -f A066.tmp
+
+# Test -E/-cpp/-o
+test067:
+	$(RM) A067.hi A067.tmp
+	"$(TEST_HC)" $(TEST_HC_OPTS) -cpp -E A067.hs -o A067.tmp
+	test -f A067.tmp
+
+# Test -S
+test070:
+	$(RM) A070.hi A070.s
+	"$(TEST_HC)" $(TEST_HC_OPTS) -S A070.hs
+	test -f A070.s
+
+# Test -S/-o
+test071:
+	$(RM) A071.hi A071.tmp
+	"$(TEST_HC)" $(TEST_HC_OPTS) -S A071.hs -o A071.tmp
+	test -f A071.tmp
+
+
+# Tests for #2248, -o and .exe
+
+define test081
+$(RM) $(1).hs $(1).hi $(1)$(OBJSUFFIX) $(1).hc $(1)$(exeext)
+echo "module Main where { main = putStrLn \"ok\" }" >$(1).hs
+"$(TEST_HC)" $(TEST_HC_OPTS) --make -v0 $(1).hs
+test -f $(1)$(exeext)
+endef
+
+test081a:
+	$(call test081, Test_081a)
+test081b:
+	$(call test081, Test.081b)
+
+# -----------------------------------------------------------------------------
+# --make tests
+
+# Test for overlap between home module and package module
+test100:
+	$(RM) overlap/List.hi overlap/List.o
+	$(RM) overlap/Overlap.hi overlap/Overlap.o
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -ioverlap Overlap
+
+# -----------------------------------------------------------------------------
+# dependency-generation tests
+
+DEPFILE200 = depend200
+
+# Test that we can create a dependency file, and that we can
+# modify an existing dependency file.
+test200:
+	$(RM) $(DEPFILE200)
+	"$(TEST_HC)" $(TEST_HC_OPTS) -M -dep-makefile $(DEPFILE200) D200
+	test -f $(DEPFILE200)
+	"$(TEST_HC)" $(TEST_HC_OPTS) -M -dep-makefile $(DEPFILE200) D200 B200.C A200
+	test -f $(DEPFILE200)
+	"$(TEST_HC)" $(TEST_HC_OPTS) -M -dep-makefile $(DEPFILE200) D200.hs B200/C.hs A200.hs
+	test -f $(DEPFILE200)
+
+# -----------------------------------------------------------------------------
+
+2566::
+	if "$(TEST_HC)" $(TEST_HC_OPTS) -c foo2566.bar; then false else true; fi
+
+.PHONY: mode001
+# We use
+#     sed '2,$$d'
+# rather than
+#     head -1
+# as the latter gives
+#     ghc: <stdout>: hFlush: resource vanished (Broken pipe)
+# on OS X
+mode001:
+	"$(TEST_HC)" $(TEST_HC_OPTS) --make --help        | sed '2,$$d'
+	"$(TEST_HC)" $(TEST_HC_OPTS) --help --make        | sed '2,$$d'
+	"$(TEST_HC)" $(TEST_HC_OPTS) --interactive --help | sed '2,$$d'
+	"$(TEST_HC)" $(TEST_HC_OPTS) --help --interactive | sed '2,$$d'
+	"$(TEST_HC)" $(TEST_HC_OPTS) --version --help     | sed "s/, version.*//"
+	"$(TEST_HC)" $(TEST_HC_OPTS) --help --version        | sed '2,$$d'
+	"$(TEST_HC)" $(TEST_HC_OPTS) --interactive --version | sed "s/, version.*//"
+	"$(TEST_HC)" $(TEST_HC_OPTS) --version --interactive | sed "s/, version.*//"
+
+# Test for building DLLs with ghc -shared, see #2745
+shared001:
+	$(RM) Shared001.hi Shared001.o HSdll.dll.a HSdll.dll Shared001_stub.*
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 -shared Shared001.hs
+
+# -----------------------------------------------------------------------------
+
+3674:
+	$(RM) 3674*.o 3674*.hi 3674_pre
+	"$(TEST_HC)" $(TEST_HC_OPTS) --make 3674_pre.hs
+	"$(TEST_HC)" $(TEST_HC_OPTS) --make 3674.hs
+
+.PHONY: rtsopts001
+rtsopts001:
+	$(RM) rtsOpts$(exeext) rtsOpts.hi rtsOpts.o
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make rtsOpts -rtsopts
+	echo "Normal"
+	-./rtsOpts +RTS -C0 2>&1
+	$(RM) rtsOpts$(exeext) rtsOpts.hi rtsOpts.o
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make rtsOpts
+	echo "No RTS opts"
+	-./rtsOpts +RTS -C0 2>&1
+
+.PHONY: rtsopts002
+rtsopts002:
+	$(RM) rtsopts002$(exeext) rtsopts002.hi rtsopts002.o
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make rtsopts002 -rtsopts=some
+	./rtsopts002
+	./rtsopts002 +RTS --info >/dev/null
+	if ./rtsopts002 +RTS -C0; then exit 1; else exit 0; fi
+	GHCRTS= ./rtsopts002
+	GHCRTS=--info ./rtsopts002 >/dev/null
+	if GHCRTS=-C0 ./rtsopts002; then exit 1; else exit 0; fi
+
+.PHONY: withRtsOpts
+withRtsOpts:
+	$(RM) withRtsOpts$(exeext) withRtsOpts.hi withRtsOpts.o withRtsOpts.out
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make withRtsOpts -with-rtsopts=--info
+	./withRtsOpts | head -1
+	# Also test for non-safe RTS opts, these should be allowed too,
+	# since the author has explicitly requested them. (#5114)
+	$(RM) withRtsOpts$(exeext) withRtsOpts.hi withRtsOpts.o withRtsOpts.out
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make withRtsOpts -with-rtsopts=-twithRtsOpts.out
+	./withRtsOpts | head -1
+	test -f withRtsOpts.out
+
+.PHONY: T3364
+T3364:
+	-"$(TEST_HC)" $(TEST_HC_OPTS) -H
+
+.PHONY: T706
+T706:
+	cp T706a.hs T706.hs
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c T706.hs
+	cp T706b.hs T706.hs
+	"$(TEST_HC)" $(TEST_HC_OPTS) -c T706.hs
+	echo "test" | "$(TEST_HC)" $(TEST_HC_OPTS) --interactive -ignore-dot-ghci -v0 T706
diff --git a/testsuite/tests/ghc-regress/driver/Shared001.hs b/testsuite/tests/driver/Shared001.hs
index 4f6a3d9c3d..4f6a3d9c3d 100644
--- a/testsuite/tests/ghc-regress/driver/Shared001.hs
+++ b/testsuite/tests/driver/Shared001.hs
diff --git a/testsuite/tests/ghc-regress/driver/T3007/A/A.cabal b/testsuite/tests/driver/T3007/A/A.cabal
index 86b3bb013e..86b3bb013e 100644
--- a/testsuite/tests/ghc-regress/driver/T3007/A/A.cabal
+++ b/testsuite/tests/driver/T3007/A/A.cabal
diff --git a/testsuite/tests/ghc-regress/driver/T3007/A/A.hs b/testsuite/tests/driver/T3007/A/A.hs
index 83e99f555f..83e99f555f 100644
--- a/testsuite/tests/ghc-regress/driver/T3007/A/A.hs
+++ b/testsuite/tests/driver/T3007/A/A.hs
diff --git a/testsuite/tests/ghc-regress/driver/T3007/A/Internal.hs b/testsuite/tests/driver/T3007/A/Internal.hs
index 761480dece..761480dece 100644
--- a/testsuite/tests/ghc-regress/driver/T3007/A/Internal.hs
+++ b/testsuite/tests/driver/T3007/A/Internal.hs
diff --git a/testsuite/tests/ghc-regress/driver/T3007/A/Setup.hs b/testsuite/tests/driver/T3007/A/Setup.hs
index 9a994af677..9a994af677 100644
--- a/testsuite/tests/ghc-regress/driver/T3007/A/Setup.hs
+++ b/testsuite/tests/driver/T3007/A/Setup.hs
diff --git a/testsuite/tests/ghc-regress/driver/T3007/B/B.cabal b/testsuite/tests/driver/T3007/B/B.cabal
index dbccfffbe9..dbccfffbe9 100644
--- a/testsuite/tests/ghc-regress/driver/T3007/B/B.cabal
+++ b/testsuite/tests/driver/T3007/B/B.cabal
diff --git a/testsuite/tests/ghc-regress/driver/T3007/B/B.hs b/testsuite/tests/driver/T3007/B/B.hs
index 9bd13bbaec..9bd13bbaec 100644
--- a/testsuite/tests/ghc-regress/driver/T3007/B/B.hs
+++ b/testsuite/tests/driver/T3007/B/B.hs
diff --git a/testsuite/tests/ghc-regress/driver/T3007/B/Internal.hs b/testsuite/tests/driver/T3007/B/Internal.hs
index ccb9cd4b23..ccb9cd4b23 100644
--- a/testsuite/tests/ghc-regress/driver/T3007/B/Internal.hs
+++ b/testsuite/tests/driver/T3007/B/Internal.hs
diff --git a/testsuite/tests/ghc-regress/driver/T3007/B/Internal.hs-boot b/testsuite/tests/driver/T3007/B/Internal.hs-boot
index d066bb085e..d066bb085e 100644
--- a/testsuite/tests/ghc-regress/driver/T3007/B/Internal.hs-boot
+++ b/testsuite/tests/driver/T3007/B/Internal.hs-boot
diff --git a/testsuite/tests/ghc-regress/driver/T3007/B/Setup.hs b/testsuite/tests/driver/T3007/B/Setup.hs
index 9a994af677..9a994af677 100644
--- a/testsuite/tests/ghc-regress/driver/T3007/B/Setup.hs
+++ b/testsuite/tests/driver/T3007/B/Setup.hs
diff --git a/testsuite/tests/driver/T3007/Makefile b/testsuite/tests/driver/T3007/Makefile
new file mode 100644
index 0000000000..8c81bff205
--- /dev/null
+++ b/testsuite/tests/driver/T3007/Makefile
@@ -0,0 +1,21 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+clean:
+	rm -f A/Setup A/Setup.o A/Setup.hi
+	rm -f B/Setup B/Setup.o B/Setup.hi
+	rm -rf A/dist B/dist
+	rm -f package.conf
+
+T3007:
+	$(MAKE) clean
+	echo '[]' > package.conf
+	cd A && '$(TEST_HC)' -v0 --make Setup
+	cd A && ./Setup configure -v0 --with-compiler='$(TEST_HC)' --ghc-pkg-option=--global-conf=../package.conf --ghc-option=-package-conf../package.conf
+	cd A && ./Setup build -v0
+	cd A && ./Setup register --inplace -v0
+	cd B && '$(TEST_HC)' -v0 --make Setup
+	cd B && ./Setup configure -v0 --with-compiler='$(TEST_HC)' --ghc-pkg-option=--global-conf=../package.conf --ghc-option=-package-conf../package.conf
+	cd B && ./Setup build -v0
+
diff --git a/testsuite/tests/ghc-regress/driver/T3007/all.T b/testsuite/tests/driver/T3007/all.T
index 194097335d..194097335d 100644
--- a/testsuite/tests/ghc-regress/driver/T3007/all.T
+++ b/testsuite/tests/driver/T3007/all.T
diff --git a/testsuite/tests/ghc-regress/driver/T3364.stderr b/testsuite/tests/driver/T3364.stderr
index 852893facc..852893facc 100644
--- a/testsuite/tests/ghc-regress/driver/T3364.stderr
+++ b/testsuite/tests/driver/T3364.stderr
diff --git a/testsuite/tests/ghc-regress/driver/T3389.hs b/testsuite/tests/driver/T3389.hs
index e068611460..e068611460 100644
--- a/testsuite/tests/ghc-regress/driver/T3389.hs
+++ b/testsuite/tests/driver/T3389.hs
diff --git a/testsuite/tests/ghc-regress/driver/T3389.stdout b/testsuite/tests/driver/T3389.stdout
index 8baef1b4ab..8baef1b4ab 100644
--- a/testsuite/tests/ghc-regress/driver/T3389.stdout
+++ b/testsuite/tests/driver/T3389.stdout
diff --git a/testsuite/tests/ghc-regress/driver/T4437.hs b/testsuite/tests/driver/T4437.hs
index 64634a9c74..64634a9c74 100644
--- a/testsuite/tests/ghc-regress/driver/T4437.hs
+++ b/testsuite/tests/driver/T4437.hs
diff --git a/testsuite/tests/ghc-regress/driver/T706.stdout b/testsuite/tests/driver/T706.stdout
index fadc068c40..fadc068c40 100644
--- a/testsuite/tests/ghc-regress/driver/T706.stdout
+++ b/testsuite/tests/driver/T706.stdout
diff --git a/testsuite/tests/ghc-regress/driver/T706a.hs b/testsuite/tests/driver/T706a.hs
index 04f5bf53e9..04f5bf53e9 100644
--- a/testsuite/tests/ghc-regress/driver/T706a.hs
+++ b/testsuite/tests/driver/T706a.hs
diff --git a/testsuite/tests/ghc-regress/driver/T706b.hs b/testsuite/tests/driver/T706b.hs
index 1d14e97a19..1d14e97a19 100644
--- a/testsuite/tests/ghc-regress/driver/T706b.hs
+++ b/testsuite/tests/driver/T706b.hs
diff --git a/testsuite/tests/ghc-regress/driver/all.T b/testsuite/tests/driver/all.T
index 1907087a5a..1907087a5a 100644
--- a/testsuite/tests/ghc-regress/driver/all.T
+++ b/testsuite/tests/driver/all.T
diff --git a/testsuite/tests/ghc-regress/driver/bug1677/Bar.hs b/testsuite/tests/driver/bug1677/Bar.hs
index e29f867394..e29f867394 100644
--- a/testsuite/tests/ghc-regress/driver/bug1677/Bar.hs
+++ b/testsuite/tests/driver/bug1677/Bar.hs
diff --git a/testsuite/tests/ghc-regress/driver/bug1677/Foo.hs b/testsuite/tests/driver/bug1677/Foo.hs
index df56d8c261..df56d8c261 100644
--- a/testsuite/tests/ghc-regress/driver/bug1677/Foo.hs
+++ b/testsuite/tests/driver/bug1677/Foo.hs
diff --git a/testsuite/tests/driver/bug1677/Makefile b/testsuite/tests/driver/bug1677/Makefile
new file mode 100644
index 0000000000..3c6f0c8293
--- /dev/null
+++ b/testsuite/tests/driver/bug1677/Makefile
@@ -0,0 +1,7 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+bug1677 :
+	'$(TEST_HC)' $(TEST_HC_OPTS) -M Foo.hs Bar.hs || true
+
diff --git a/testsuite/tests/ghc-regress/driver/bug1677/all.T b/testsuite/tests/driver/bug1677/all.T
index d2bd077a4e..d2bd077a4e 100644
--- a/testsuite/tests/ghc-regress/driver/bug1677/all.T
+++ b/testsuite/tests/driver/bug1677/all.T
diff --git a/testsuite/tests/ghc-regress/driver/bug1677/bug1677.stderr b/testsuite/tests/driver/bug1677/bug1677.stderr
index bc55b86c2f..bc55b86c2f 100644
--- a/testsuite/tests/ghc-regress/driver/bug1677/bug1677.stderr
+++ b/testsuite/tests/driver/bug1677/bug1677.stderr
diff --git a/testsuite/tests/driver/conflicting_flags/Makefile b/testsuite/tests/driver/conflicting_flags/Makefile
new file mode 100644
index 0000000000..5cb4fbf945
--- /dev/null
+++ b/testsuite/tests/driver/conflicting_flags/Makefile
@@ -0,0 +1,7 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+conflicting_flags:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -V --print-libdir 2>&1 | sed "s/, version.*//"
+
diff --git a/testsuite/tests/ghc-regress/driver/conflicting_flags/conflicting_flags.stdout b/testsuite/tests/driver/conflicting_flags/conflicting_flags.stdout
index 31ce6b16c6..31ce6b16c6 100644
--- a/testsuite/tests/ghc-regress/driver/conflicting_flags/conflicting_flags.stdout
+++ b/testsuite/tests/driver/conflicting_flags/conflicting_flags.stdout
diff --git a/testsuite/tests/ghc-regress/driver/conflicting_flags/test.T b/testsuite/tests/driver/conflicting_flags/test.T
index 0a6769a77a..0a6769a77a 100644
--- a/testsuite/tests/ghc-regress/driver/conflicting_flags/test.T
+++ b/testsuite/tests/driver/conflicting_flags/test.T
diff --git a/testsuite/tests/ghc-regress/driver/d026/P/Q.hs b/testsuite/tests/driver/d026/P/Q.hs
index 2466766bb0..2466766bb0 100644
--- a/testsuite/tests/ghc-regress/driver/d026/P/Q.hs
+++ b/testsuite/tests/driver/d026/P/Q.hs
diff --git a/testsuite/tests/ghc-regress/driver/d051_1/P/Q.hs b/testsuite/tests/driver/d051_1/P/Q.hs
index 2466766bb0..2466766bb0 100644
--- a/testsuite/tests/ghc-regress/driver/d051_1/P/Q.hs
+++ b/testsuite/tests/driver/d051_1/P/Q.hs
diff --git a/testsuite/tests/ghc-regress/driver/d051_2/R/S.hs b/testsuite/tests/driver/d051_2/R/S.hs
index b5c46f3179..b5c46f3179 100644
--- a/testsuite/tests/ghc-regress/driver/d051_2/R/S.hs
+++ b/testsuite/tests/driver/d051_2/R/S.hs
diff --git a/testsuite/tests/ghc-regress/driver/d052_1/P/Q.hs b/testsuite/tests/driver/d052_1/P/Q.hs
index 2466766bb0..2466766bb0 100644
--- a/testsuite/tests/ghc-regress/driver/d052_1/P/Q.hs
+++ b/testsuite/tests/driver/d052_1/P/Q.hs
diff --git a/testsuite/tests/ghc-regress/driver/d052_2/R/S.hs b/testsuite/tests/driver/d052_2/R/S.hs
index b5c46f3179..b5c46f3179 100644
--- a/testsuite/tests/ghc-regress/driver/d052_2/R/S.hs
+++ b/testsuite/tests/driver/d052_2/R/S.hs
diff --git a/testsuite/tests/ghc-regress/driver/d053_1/P/Q.hs b/testsuite/tests/driver/d053_1/P/Q.hs
index 2466766bb0..2466766bb0 100644
--- a/testsuite/tests/ghc-regress/driver/d053_1/P/Q.hs
+++ b/testsuite/tests/driver/d053_1/P/Q.hs
diff --git a/testsuite/tests/ghc-regress/driver/d053_2/R/S.hs b/testsuite/tests/driver/d053_2/R/S.hs
index b5c46f3179..b5c46f3179 100644
--- a/testsuite/tests/ghc-regress/driver/d053_2/R/S.hs
+++ b/testsuite/tests/driver/d053_2/R/S.hs
diff --git a/testsuite/tests/ghc-regress/driver/driver062a.stdout b/testsuite/tests/driver/driver062a.stdout
index 9766475a41..9766475a41 100644
--- a/testsuite/tests/ghc-regress/driver/driver062a.stdout
+++ b/testsuite/tests/driver/driver062a.stdout
diff --git a/testsuite/tests/ghc-regress/driver/driver062b.stdout b/testsuite/tests/driver/driver062b.stdout
index 9766475a41..9766475a41 100644
--- a/testsuite/tests/ghc-regress/driver/driver062b.stdout
+++ b/testsuite/tests/driver/driver062b.stdout
diff --git a/testsuite/tests/ghc-regress/driver/driver062c.stdout b/testsuite/tests/driver/driver062c.stdout
index 9766475a41..9766475a41 100644
--- a/testsuite/tests/ghc-regress/driver/driver062c.stdout
+++ b/testsuite/tests/driver/driver062c.stdout
diff --git a/testsuite/tests/ghc-regress/driver/driver062d.stdout b/testsuite/tests/driver/driver062d.stdout
index 9766475a41..9766475a41 100644
--- a/testsuite/tests/ghc-regress/driver/driver062d.stdout
+++ b/testsuite/tests/driver/driver062d.stdout
diff --git a/testsuite/tests/ghc-regress/driver/driver062e.stdout b/testsuite/tests/driver/driver062e.stdout
index 9766475a41..9766475a41 100644
--- a/testsuite/tests/ghc-regress/driver/driver062e.stdout
+++ b/testsuite/tests/driver/driver062e.stdout
diff --git a/testsuite/tests/ghc-regress/driver/driver063.stderr b/testsuite/tests/driver/driver063.stderr
index 0a6801537e..0a6801537e 100644
--- a/testsuite/tests/ghc-regress/driver/driver063.stderr
+++ b/testsuite/tests/driver/driver063.stderr
diff --git a/testsuite/tests/ghc-regress/driver/dynHelloWorld.hs b/testsuite/tests/driver/dynHelloWorld.hs
index 5c96396ae1..5c96396ae1 100644
--- a/testsuite/tests/ghc-regress/driver/dynHelloWorld.hs
+++ b/testsuite/tests/driver/dynHelloWorld.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynHelloWorld.stdout b/testsuite/tests/driver/dynHelloWorld.stdout
index 557db03de9..557db03de9 100644
--- a/testsuite/tests/ghc-regress/driver/dynHelloWorld.stdout
+++ b/testsuite/tests/driver/dynHelloWorld.stdout
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_001/A.hs b/testsuite/tests/driver/dynamic_flags_001/A.hs
index 50c518be7e..50c518be7e 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_001/A.hs
+++ b/testsuite/tests/driver/dynamic_flags_001/A.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_001/B.hs b/testsuite/tests/driver/dynamic_flags_001/B.hs
index f3f82dff98..f3f82dff98 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_001/B.hs
+++ b/testsuite/tests/driver/dynamic_flags_001/B.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_001/C.hs b/testsuite/tests/driver/dynamic_flags_001/C.hs
index ac7ff06b95..ac7ff06b95 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_001/C.hs
+++ b/testsuite/tests/driver/dynamic_flags_001/C.hs
diff --git a/testsuite/tests/driver/dynamic_flags_001/Makefile b/testsuite/tests/driver/dynamic_flags_001/Makefile
new file mode 100644
index 0000000000..ed03b16315
--- /dev/null
+++ b/testsuite/tests/driver/dynamic_flags_001/Makefile
@@ -0,0 +1,14 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+# Dynamic flags tests
+
+clean:
+	rm -f *.o *.hi
+
+# 001: Flags turned on in one module's OPTIONS_GHC pragma shouldn't
+#      be on in when compiling other modules
+
+dynamic_flags_001: clean
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make -Werror -v0 C.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_001/all.T b/testsuite/tests/driver/dynamic_flags_001/all.T
index c487a0cb75..c487a0cb75 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_001/all.T
+++ b/testsuite/tests/driver/dynamic_flags_001/all.T
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/A_First.hs b/testsuite/tests/driver/dynamic_flags_002/A_First.hs
index 94b0986dbd..94b0986dbd 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/A_First.hs
+++ b/testsuite/tests/driver/dynamic_flags_002/A_First.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/A_Main.hs b/testsuite/tests/driver/dynamic_flags_002/A_Main.hs
index 19486af9cc..19486af9cc 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/A_Main.hs
+++ b/testsuite/tests/driver/dynamic_flags_002/A_Main.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/A_Second.hs b/testsuite/tests/driver/dynamic_flags_002/A_Second.hs
index 6543b6b4cf..6543b6b4cf 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/A_Second.hs
+++ b/testsuite/tests/driver/dynamic_flags_002/A_Second.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/B_First.hs b/testsuite/tests/driver/dynamic_flags_002/B_First.hs
index ef944f57f8..ef944f57f8 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/B_First.hs
+++ b/testsuite/tests/driver/dynamic_flags_002/B_First.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/B_Main.hs b/testsuite/tests/driver/dynamic_flags_002/B_Main.hs
index ed1367f0b4..ed1367f0b4 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/B_Main.hs
+++ b/testsuite/tests/driver/dynamic_flags_002/B_Main.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/B_Second.hs b/testsuite/tests/driver/dynamic_flags_002/B_Second.hs
index a3efdb491c..a3efdb491c 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/B_Second.hs
+++ b/testsuite/tests/driver/dynamic_flags_002/B_Second.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/C_Child.hs b/testsuite/tests/driver/dynamic_flags_002/C_Child.hs
index 86241fb3e4..86241fb3e4 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/C_Child.hs
+++ b/testsuite/tests/driver/dynamic_flags_002/C_Child.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/C_Main.hs b/testsuite/tests/driver/dynamic_flags_002/C_Main.hs
index c7decbc546..c7decbc546 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/C_Main.hs
+++ b/testsuite/tests/driver/dynamic_flags_002/C_Main.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/D_Child.hs b/testsuite/tests/driver/dynamic_flags_002/D_Child.hs
index bfe4d4a42d..bfe4d4a42d 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/D_Child.hs
+++ b/testsuite/tests/driver/dynamic_flags_002/D_Child.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/D_Main.hs b/testsuite/tests/driver/dynamic_flags_002/D_Main.hs
index 2b69a8ce4c..2b69a8ce4c 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/D_Main.hs
+++ b/testsuite/tests/driver/dynamic_flags_002/D_Main.hs
diff --git a/testsuite/tests/driver/dynamic_flags_002/Makefile b/testsuite/tests/driver/dynamic_flags_002/Makefile
new file mode 100644
index 0000000000..4a268530f1
--- /dev/null
+++ b/testsuite/tests/driver/dynamic_flags_002/Makefile
@@ -0,0 +1,4 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/ManyFirst.hs b/testsuite/tests/driver/dynamic_flags_002/ManyFirst.hs
index 0ecb0c2d42..0ecb0c2d42 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/ManyFirst.hs
+++ b/testsuite/tests/driver/dynamic_flags_002/ManyFirst.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/ManySecond.hs b/testsuite/tests/driver/dynamic_flags_002/ManySecond.hs
index ac67a3be2b..ac67a3be2b 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/ManySecond.hs
+++ b/testsuite/tests/driver/dynamic_flags_002/ManySecond.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/ManyThird.hs b/testsuite/tests/driver/dynamic_flags_002/ManyThird.hs
index 2f3df77398..2f3df77398 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/ManyThird.hs
+++ b/testsuite/tests/driver/dynamic_flags_002/ManyThird.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/all.T b/testsuite/tests/driver/dynamic_flags_002/all.T
index 3b0072ba6b..3b0072ba6b 100644
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/all.T
+++ b/testsuite/tests/driver/dynamic_flags_002/all.T
diff --git a/testsuite/tests/ghc-regress/driver/mode001.stdout b/testsuite/tests/driver/mode001.stdout
index 462d836f55..462d836f55 100644
--- a/testsuite/tests/ghc-regress/driver/mode001.stdout
+++ b/testsuite/tests/driver/mode001.stdout
diff --git a/testsuite/tests/driver/objc/Makefile b/testsuite/tests/driver/objc/Makefile
new file mode 100644
index 0000000000..4a268530f1
--- /dev/null
+++ b/testsuite/tests/driver/objc/Makefile
@@ -0,0 +1,4 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
diff --git a/testsuite/tests/ghc-regress/driver/objc/all.T b/testsuite/tests/driver/objc/all.T
index ee22934399..ee22934399 100644
--- a/testsuite/tests/ghc-regress/driver/objc/all.T
+++ b/testsuite/tests/driver/objc/all.T
diff --git a/testsuite/tests/ghc-regress/driver/objc/objc-hi.m b/testsuite/tests/driver/objc/objc-hi.m
index 4580bd2dfb..4580bd2dfb 100644
--- a/testsuite/tests/ghc-regress/driver/objc/objc-hi.m
+++ b/testsuite/tests/driver/objc/objc-hi.m
diff --git a/testsuite/tests/ghc-regress/driver/objc/objc-hi.stdout b/testsuite/tests/driver/objc/objc-hi.stdout
index 802992c422..802992c422 100644
--- a/testsuite/tests/ghc-regress/driver/objc/objc-hi.stdout
+++ b/testsuite/tests/driver/objc/objc-hi.stdout
diff --git a/testsuite/tests/ghc-regress/driver/overlap/List.hs b/testsuite/tests/driver/overlap/List.hs
index 8a6e4262dc..8a6e4262dc 100644
--- a/testsuite/tests/ghc-regress/driver/overlap/List.hs
+++ b/testsuite/tests/driver/overlap/List.hs
diff --git a/testsuite/tests/ghc-regress/driver/overlap/Overlap.hs b/testsuite/tests/driver/overlap/Overlap.hs
index b82364f7cc..b82364f7cc 100644
--- a/testsuite/tests/ghc-regress/driver/overlap/Overlap.hs
+++ b/testsuite/tests/driver/overlap/Overlap.hs
diff --git a/testsuite/tests/ghc-regress/driver/pragma001.hs b/testsuite/tests/driver/pragma001.hs
index 8c1b7aac94..8c1b7aac94 100644
--- a/testsuite/tests/ghc-regress/driver/pragma001.hs
+++ b/testsuite/tests/driver/pragma001.hs
diff --git a/testsuite/tests/ghc-regress/driver/pragma002.hs b/testsuite/tests/driver/pragma002.hs
index 48c66101bc..48c66101bc 100644
--- a/testsuite/tests/ghc-regress/driver/pragma002.hs
+++ b/testsuite/tests/driver/pragma002.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp001/A.hs b/testsuite/tests/driver/recomp001/A.hs
index d7fc96e70e..d7fc96e70e 100644
--- a/testsuite/tests/ghc-regress/driver/recomp001/A.hs
+++ b/testsuite/tests/driver/recomp001/A.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp001/B1.hs b/testsuite/tests/driver/recomp001/B1.hs
index d0efd79bf0..d0efd79bf0 100644
--- a/testsuite/tests/ghc-regress/driver/recomp001/B1.hs
+++ b/testsuite/tests/driver/recomp001/B1.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp001/B2.hs b/testsuite/tests/driver/recomp001/B2.hs
index 213d77d5eb..213d77d5eb 100644
--- a/testsuite/tests/ghc-regress/driver/recomp001/B2.hs
+++ b/testsuite/tests/driver/recomp001/B2.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp001/C.hs b/testsuite/tests/driver/recomp001/C.hs
index d38b2ff51c..d38b2ff51c 100644
--- a/testsuite/tests/ghc-regress/driver/recomp001/C.hs
+++ b/testsuite/tests/driver/recomp001/C.hs
diff --git a/testsuite/tests/driver/recomp001/Makefile b/testsuite/tests/driver/recomp001/Makefile
new file mode 100644
index 0000000000..a5bff9936d
--- /dev/null
+++ b/testsuite/tests/driver/recomp001/Makefile
@@ -0,0 +1,19 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+# Recompilation tests
+
+clean:
+	rm -f *.o *.hi
+	rm -f B.hs C
+
+# 001: removing an export should force a recompile of dependent modules.
+# failed in GHC 6.4.
+
+recomp001: clean
+	cp B1.hs B.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 C.hs
+	sleep 1
+	cp B2.hs B.hs
+	-'$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 C.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp001/all.T b/testsuite/tests/driver/recomp001/all.T
index f3672fa2f8..f3672fa2f8 100644
--- a/testsuite/tests/ghc-regress/driver/recomp001/all.T
+++ b/testsuite/tests/driver/recomp001/all.T
diff --git a/testsuite/tests/ghc-regress/driver/recomp001/recomp001.stderr b/testsuite/tests/driver/recomp001/recomp001.stderr
index 4b95415c89..4b95415c89 100644
--- a/testsuite/tests/ghc-regress/driver/recomp001/recomp001.stderr
+++ b/testsuite/tests/driver/recomp001/recomp001.stderr
diff --git a/testsuite/tests/driver/recomp002/Makefile b/testsuite/tests/driver/recomp002/Makefile
new file mode 100644
index 0000000000..0dd8f47ca4
--- /dev/null
+++ b/testsuite/tests/driver/recomp002/Makefile
@@ -0,0 +1,16 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+# Recompilation tests
+
+clean:
+	rm -f *.o*
+	rm -f *.hi*
+
+# Only the first invocation should print any "Compiling" messages
+
+recomp002: clean
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make Q.hs
+	echo Middle >&2
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make Q.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp002/Q.hs b/testsuite/tests/driver/recomp002/Q.hs
index bdca9402bd..bdca9402bd 100644
--- a/testsuite/tests/ghc-regress/driver/recomp002/Q.hs
+++ b/testsuite/tests/driver/recomp002/Q.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp002/W.hs b/testsuite/tests/driver/recomp002/W.hs
index 0e2392d6c9..0e2392d6c9 100644
--- a/testsuite/tests/ghc-regress/driver/recomp002/W.hs
+++ b/testsuite/tests/driver/recomp002/W.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp002/W.hs-boot b/testsuite/tests/driver/recomp002/W.hs-boot
index 62be698970..62be698970 100644
--- a/testsuite/tests/ghc-regress/driver/recomp002/W.hs-boot
+++ b/testsuite/tests/driver/recomp002/W.hs-boot
diff --git a/testsuite/tests/ghc-regress/driver/recomp002/all.T b/testsuite/tests/driver/recomp002/all.T
index 5f8ddf5f1b..5f8ddf5f1b 100644
--- a/testsuite/tests/ghc-regress/driver/recomp002/all.T
+++ b/testsuite/tests/driver/recomp002/all.T
diff --git a/testsuite/tests/ghc-regress/driver/recomp002/recomp002.stderr b/testsuite/tests/driver/recomp002/recomp002.stderr
index 56cdd85e1d..56cdd85e1d 100644
--- a/testsuite/tests/ghc-regress/driver/recomp002/recomp002.stderr
+++ b/testsuite/tests/driver/recomp002/recomp002.stderr
diff --git a/testsuite/tests/ghc-regress/driver/recomp002/recomp002.stdout b/testsuite/tests/driver/recomp002/recomp002.stdout
index d9ddb2523a..d9ddb2523a 100644
--- a/testsuite/tests/ghc-regress/driver/recomp002/recomp002.stdout
+++ b/testsuite/tests/driver/recomp002/recomp002.stdout
diff --git a/testsuite/tests/ghc-regress/driver/recomp003/A.hs b/testsuite/tests/driver/recomp003/A.hs
index 7fa4516161..7fa4516161 100644
--- a/testsuite/tests/ghc-regress/driver/recomp003/A.hs
+++ b/testsuite/tests/driver/recomp003/A.hs
diff --git a/testsuite/tests/driver/recomp003/Makefile b/testsuite/tests/driver/recomp003/Makefile
new file mode 100644
index 0000000000..7f6bfc2e48
--- /dev/null
+++ b/testsuite/tests/driver/recomp003/Makefile
@@ -0,0 +1,18 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+OBJSUFFIX = .o
+
+# Test that adding a new module that shadows a package module causes
+# recompilation.  Part of bug #1372.
+recomp003:
+	$(RM) A.hi A$(OBJSUFFIX) out
+	$(RM) -rf Data
+	mkdir Data
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c A.hs
+	echo "module Data.Char where" > Data/Char.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c Data/Char.hs
+	# Should now recompile A.hs, because Char is now a home module:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c A.hs 2>err
+	@if grep NOT err; then false; fi
diff --git a/testsuite/tests/ghc-regress/driver/recomp003/all.T b/testsuite/tests/driver/recomp003/all.T
index c6653c2723..c6653c2723 100644
--- a/testsuite/tests/ghc-regress/driver/recomp003/all.T
+++ b/testsuite/tests/driver/recomp003/all.T
diff --git a/testsuite/tests/ghc-regress/driver/recomp004/Main.hs b/testsuite/tests/driver/recomp004/Main.hs
index cbb16d21d3..cbb16d21d3 100644
--- a/testsuite/tests/ghc-regress/driver/recomp004/Main.hs
+++ b/testsuite/tests/driver/recomp004/Main.hs
diff --git a/testsuite/tests/driver/recomp004/Makefile b/testsuite/tests/driver/recomp004/Makefile
new file mode 100644
index 0000000000..41b93b169d
--- /dev/null
+++ b/testsuite/tests/driver/recomp004/Makefile
@@ -0,0 +1,24 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+EXECUTABLE = Main$(exeext)
+CLEAN_FILES = c.c c.o Main.o Main.hi $(EXECUTABLE)
+
+clean:
+	$(RM) $(CLEAN_FILES)
+
+# Test that updates to C modules are noticed
+recomp004:
+	$(RM) $(CLEAN_FILES)
+	$(CP) c1.c c.c
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c c.c -o c.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Main.hs c.o -o $(EXECUTABLE)
+	./$(EXECUTABLE)
+	$(CP) c2.c c.c
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c c.c -o c.o
+	# Hack to make sure c.o is really newer
+	touch -t 01010000 Main.hs Main.hi Main.o c.c $(EXECUTABLE)
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Main.hs c.o -o $(EXECUTABLE)
+	./$(EXECUTABLE)
+
diff --git a/testsuite/tests/ghc-regress/driver/recomp004/all.T b/testsuite/tests/driver/recomp004/all.T
index 54d190d83a..54d190d83a 100644
--- a/testsuite/tests/ghc-regress/driver/recomp004/all.T
+++ b/testsuite/tests/driver/recomp004/all.T
diff --git a/testsuite/tests/ghc-regress/driver/recomp004/c.h b/testsuite/tests/driver/recomp004/c.h
index 12c941119c..12c941119c 100644
--- a/testsuite/tests/ghc-regress/driver/recomp004/c.h
+++ b/testsuite/tests/driver/recomp004/c.h
diff --git a/testsuite/tests/ghc-regress/driver/recomp004/c1.c b/testsuite/tests/driver/recomp004/c1.c
index 0b2101a826..0b2101a826 100644
--- a/testsuite/tests/ghc-regress/driver/recomp004/c1.c
+++ b/testsuite/tests/driver/recomp004/c1.c
diff --git a/testsuite/tests/ghc-regress/driver/recomp004/c2.c b/testsuite/tests/driver/recomp004/c2.c
index decb52617a..decb52617a 100644
--- a/testsuite/tests/ghc-regress/driver/recomp004/c2.c
+++ b/testsuite/tests/driver/recomp004/c2.c
diff --git a/testsuite/tests/ghc-regress/driver/recomp004/recomp004.stdout b/testsuite/tests/driver/recomp004/recomp004.stdout
index 3b71d5be87..3b71d5be87 100644
--- a/testsuite/tests/ghc-regress/driver/recomp004/recomp004.stdout
+++ b/testsuite/tests/driver/recomp004/recomp004.stdout
diff --git a/testsuite/tests/ghc-regress/driver/recomp005/A.hs b/testsuite/tests/driver/recomp005/A.hs
index 4cf81d9c9f..4cf81d9c9f 100644
--- a/testsuite/tests/ghc-regress/driver/recomp005/A.hs
+++ b/testsuite/tests/driver/recomp005/A.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp005/B.hs b/testsuite/tests/driver/recomp005/B.hs
index 84ef616bba..84ef616bba 100644
--- a/testsuite/tests/ghc-regress/driver/recomp005/B.hs
+++ b/testsuite/tests/driver/recomp005/B.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp005/C1.hs b/testsuite/tests/driver/recomp005/C1.hs
index 8141245535..8141245535 100644
--- a/testsuite/tests/ghc-regress/driver/recomp005/C1.hs
+++ b/testsuite/tests/driver/recomp005/C1.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp005/C2.hs b/testsuite/tests/driver/recomp005/C2.hs
index 7764ed861b..7764ed861b 100644
--- a/testsuite/tests/ghc-regress/driver/recomp005/C2.hs
+++ b/testsuite/tests/driver/recomp005/C2.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp005/D.hs b/testsuite/tests/driver/recomp005/D.hs
index c8cd790be1..c8cd790be1 100644
--- a/testsuite/tests/ghc-regress/driver/recomp005/D.hs
+++ b/testsuite/tests/driver/recomp005/D.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp005/E.hs b/testsuite/tests/driver/recomp005/E.hs
index e6e2e6b784..e6e2e6b784 100644
--- a/testsuite/tests/ghc-regress/driver/recomp005/E.hs
+++ b/testsuite/tests/driver/recomp005/E.hs
diff --git a/testsuite/tests/driver/recomp005/Makefile b/testsuite/tests/driver/recomp005/Makefile
new file mode 100644
index 0000000000..e1bda204b7
--- /dev/null
+++ b/testsuite/tests/driver/recomp005/Makefile
@@ -0,0 +1,16 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+clean:
+	rm -f *.o*
+	rm -f *.hi*
+	rm -f C.hs
+
+recomp005: clean
+	cp C1.hs C.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make E.hs -O
+	sleep 1
+	cp C2.hs C.hs
+	# Should recompile E, because C is now an orphan
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make E.hs -O
diff --git a/testsuite/tests/ghc-regress/driver/recomp005/all.T b/testsuite/tests/driver/recomp005/all.T
index d5d89b1712..d5d89b1712 100644
--- a/testsuite/tests/ghc-regress/driver/recomp005/all.T
+++ b/testsuite/tests/driver/recomp005/all.T
diff --git a/testsuite/tests/ghc-regress/driver/recomp005/recomp005.stderr b/testsuite/tests/driver/recomp005/recomp005.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/driver/recomp005/recomp005.stderr
+++ b/testsuite/tests/driver/recomp005/recomp005.stderr
diff --git a/testsuite/tests/ghc-regress/driver/recomp005/recomp005.stdout b/testsuite/tests/driver/recomp005/recomp005.stdout
index 720a1ea74f..720a1ea74f 100644
--- a/testsuite/tests/ghc-regress/driver/recomp005/recomp005.stdout
+++ b/testsuite/tests/driver/recomp005/recomp005.stdout
diff --git a/testsuite/tests/ghc-regress/driver/recomp006/A.hs b/testsuite/tests/driver/recomp006/A.hs
index a658ba6e3c..a658ba6e3c 100644
--- a/testsuite/tests/ghc-regress/driver/recomp006/A.hs
+++ b/testsuite/tests/driver/recomp006/A.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp006/B1.hs b/testsuite/tests/driver/recomp006/B1.hs
index aed449262f..aed449262f 100644
--- a/testsuite/tests/ghc-regress/driver/recomp006/B1.hs
+++ b/testsuite/tests/driver/recomp006/B1.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp006/B2.hs b/testsuite/tests/driver/recomp006/B2.hs
index 905b6dbd9a..905b6dbd9a 100644
--- a/testsuite/tests/ghc-regress/driver/recomp006/B2.hs
+++ b/testsuite/tests/driver/recomp006/B2.hs
diff --git a/testsuite/tests/driver/recomp006/Makefile b/testsuite/tests/driver/recomp006/Makefile
new file mode 100644
index 0000000000..a0f55d636d
--- /dev/null
+++ b/testsuite/tests/driver/recomp006/Makefile
@@ -0,0 +1,16 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+OBJSUFFIX = .o
+
+# Test that changing the fixity of a type synonym operator forces recompilation
+# (see #3166).
+recomp006:
+	$(RM) A.hi A$(OBJSUFFIX)
+	cp B1.hs B.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make A.hs 1>out 2>err
+	sleep 1
+	cp B2.hs B.hs
+	# This should fail
+	if '$(TEST_HC)' $(TEST_HC_OPTS) --make A.hs; then false; fi
diff --git a/testsuite/tests/ghc-regress/driver/recomp006/all.T b/testsuite/tests/driver/recomp006/all.T
index bc4f915bad..bc4f915bad 100644
--- a/testsuite/tests/ghc-regress/driver/recomp006/all.T
+++ b/testsuite/tests/driver/recomp006/all.T
diff --git a/testsuite/tests/ghc-regress/driver/recomp006/recomp006.stderr b/testsuite/tests/driver/recomp006/recomp006.stderr
index c449b5cd2d..c449b5cd2d 100644
--- a/testsuite/tests/ghc-regress/driver/recomp006/recomp006.stderr
+++ b/testsuite/tests/driver/recomp006/recomp006.stderr
diff --git a/testsuite/tests/ghc-regress/driver/recomp006/recomp006.stdout b/testsuite/tests/driver/recomp006/recomp006.stdout
index f403e40d1a..f403e40d1a 100644
--- a/testsuite/tests/ghc-regress/driver/recomp006/recomp006.stdout
+++ b/testsuite/tests/driver/recomp006/recomp006.stdout
diff --git a/testsuite/tests/driver/recomp007/Makefile b/testsuite/tests/driver/recomp007/Makefile
new file mode 100644
index 0000000000..94d46e8242
--- /dev/null
+++ b/testsuite/tests/driver/recomp007/Makefile
@@ -0,0 +1,28 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+LOCAL_PKGCONF=local.package.conf
+
+clean:
+	rm -f Setup$(exeext)
+	rm -rf a1/dist a2/dist b/dist
+	rm -f *.o *.hi
+	rm -f clean.out prep.out
+	rm -rf $(LOCAL_PKGCONF)
+
+recomp007:
+	$(MAKE) clean
+	"$(GHC_PKG)" init $(LOCAL_PKGCONF)
+	"$(TEST_HC)" -v0 --make Setup.hs
+	$(MAKE) prep.a1
+	$(MAKE) prep.b
+	"$(GHC_PKG)" unregister --package-conf=$(LOCAL_PKGCONF) a-1.0
+	$(MAKE) prep.a2
+	cd b && ../Setup configure -v0 --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=../$(LOCAL_PKGCONF)
+	cd b && ../Setup build
+
+prep.%:
+	cd $* && ../Setup configure -v0 --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=../$(LOCAL_PKGCONF)
+	cd $* && ../Setup build -v0
+	cd $* && ../Setup register -v0 --inplace
diff --git a/testsuite/tests/ghc-regress/driver/recomp007/Setup.hs b/testsuite/tests/driver/recomp007/Setup.hs
index 9a994af677..9a994af677 100644
--- a/testsuite/tests/ghc-regress/driver/recomp007/Setup.hs
+++ b/testsuite/tests/driver/recomp007/Setup.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp007/a1/A.hs b/testsuite/tests/driver/recomp007/a1/A.hs
index 8e028dcab8..8e028dcab8 100644
--- a/testsuite/tests/ghc-regress/driver/recomp007/a1/A.hs
+++ b/testsuite/tests/driver/recomp007/a1/A.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp007/a1/a.cabal b/testsuite/tests/driver/recomp007/a1/a.cabal
index cb6d3c01b9..cb6d3c01b9 100644
--- a/testsuite/tests/ghc-regress/driver/recomp007/a1/a.cabal
+++ b/testsuite/tests/driver/recomp007/a1/a.cabal
diff --git a/testsuite/tests/ghc-regress/driver/recomp007/a2/A.hs b/testsuite/tests/driver/recomp007/a2/A.hs
index 273896245c..273896245c 100644
--- a/testsuite/tests/ghc-regress/driver/recomp007/a2/A.hs
+++ b/testsuite/tests/driver/recomp007/a2/A.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp007/a2/a.cabal b/testsuite/tests/driver/recomp007/a2/a.cabal
index 5c3ae6a74d..5c3ae6a74d 100644
--- a/testsuite/tests/ghc-regress/driver/recomp007/a2/a.cabal
+++ b/testsuite/tests/driver/recomp007/a2/a.cabal
diff --git a/testsuite/tests/ghc-regress/driver/recomp007/all.T b/testsuite/tests/driver/recomp007/all.T
index 5a93a12d68..5a93a12d68 100644
--- a/testsuite/tests/ghc-regress/driver/recomp007/all.T
+++ b/testsuite/tests/driver/recomp007/all.T
diff --git a/testsuite/tests/ghc-regress/driver/recomp007/b/B.hs b/testsuite/tests/driver/recomp007/b/B.hs
index 742c5d3a3f..742c5d3a3f 100644
--- a/testsuite/tests/ghc-regress/driver/recomp007/b/B.hs
+++ b/testsuite/tests/driver/recomp007/b/B.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp007/b/Main.hs b/testsuite/tests/driver/recomp007/b/Main.hs
index ca60a5902b..ca60a5902b 100644
--- a/testsuite/tests/ghc-regress/driver/recomp007/b/Main.hs
+++ b/testsuite/tests/driver/recomp007/b/Main.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp007/b/b.cabal b/testsuite/tests/driver/recomp007/b/b.cabal
index 988ef871a2..988ef871a2 100644
--- a/testsuite/tests/ghc-regress/driver/recomp007/b/b.cabal
+++ b/testsuite/tests/driver/recomp007/b/b.cabal
diff --git a/testsuite/tests/ghc-regress/driver/recomp007/recomp007.stderr b/testsuite/tests/driver/recomp007/recomp007.stderr
index 290be5f14d..290be5f14d 100644
--- a/testsuite/tests/ghc-regress/driver/recomp007/recomp007.stderr
+++ b/testsuite/tests/driver/recomp007/recomp007.stderr
diff --git a/testsuite/tests/ghc-regress/driver/recomp007/recomp007.stdout b/testsuite/tests/driver/recomp007/recomp007.stdout
index b956b8f9a3..b956b8f9a3 100644
--- a/testsuite/tests/ghc-regress/driver/recomp007/recomp007.stdout
+++ b/testsuite/tests/driver/recomp007/recomp007.stdout
diff --git a/testsuite/tests/ghc-regress/driver/recomp008/A1.hs b/testsuite/tests/driver/recomp008/A1.hs
index 224258034a..224258034a 100644
--- a/testsuite/tests/ghc-regress/driver/recomp008/A1.hs
+++ b/testsuite/tests/driver/recomp008/A1.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp008/A2.hs b/testsuite/tests/driver/recomp008/A2.hs
index efc9207399..efc9207399 100644
--- a/testsuite/tests/ghc-regress/driver/recomp008/A2.hs
+++ b/testsuite/tests/driver/recomp008/A2.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp008/B.hs b/testsuite/tests/driver/recomp008/B.hs
index b1b7491b07..b1b7491b07 100644
--- a/testsuite/tests/ghc-regress/driver/recomp008/B.hs
+++ b/testsuite/tests/driver/recomp008/B.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp008/Main.hs b/testsuite/tests/driver/recomp008/Main.hs
index df246a3303..df246a3303 100644
--- a/testsuite/tests/ghc-regress/driver/recomp008/Main.hs
+++ b/testsuite/tests/driver/recomp008/Main.hs
diff --git a/testsuite/tests/driver/recomp008/Makefile b/testsuite/tests/driver/recomp008/Makefile
new file mode 100644
index 0000000000..3e598ae9f1
--- /dev/null
+++ b/testsuite/tests/driver/recomp008/Makefile
@@ -0,0 +1,28 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+Main.o : B.hi
+B.o : A.hi
+
+%.o : %.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c $< -o $@
+
+# magic .hi rule: see rules/hi-rule.mk in the GHC source tree
+%.hi : %.o ;
+
+prog : A.o B.o Main.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -o prog A.o B.o Main.o
+
+clean :
+	$(RM) *.hi *.o prog
+
+recomp008 : 
+	$(MAKE) clean
+	cp A1.hs A.hs
+	$(MAKE) prog
+	./prog
+	sleep 1
+	cp A2.hs A.hs
+	$(MAKE) prog
+	./prog
diff --git a/testsuite/tests/ghc-regress/driver/recomp008/all.T b/testsuite/tests/driver/recomp008/all.T
index a59b1512e0..a59b1512e0 100644
--- a/testsuite/tests/ghc-regress/driver/recomp008/all.T
+++ b/testsuite/tests/driver/recomp008/all.T
diff --git a/testsuite/tests/ghc-regress/driver/recomp008/recomp008.stdout b/testsuite/tests/driver/recomp008/recomp008.stdout
index 1cc8b5e10d..1cc8b5e10d 100644
--- a/testsuite/tests/ghc-regress/driver/recomp008/recomp008.stdout
+++ b/testsuite/tests/driver/recomp008/recomp008.stdout
diff --git a/testsuite/tests/ghc-regress/driver/recomp009/Main.hs b/testsuite/tests/driver/recomp009/Main.hs
index b5e5424f9b..b5e5424f9b 100644
--- a/testsuite/tests/ghc-regress/driver/recomp009/Main.hs
+++ b/testsuite/tests/driver/recomp009/Main.hs
diff --git a/testsuite/tests/driver/recomp009/Makefile b/testsuite/tests/driver/recomp009/Makefile
new file mode 100644
index 0000000000..f343534bb3
--- /dev/null
+++ b/testsuite/tests/driver/recomp009/Makefile
@@ -0,0 +1,20 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+# Recompilation tests
+
+clean:
+	rm -f *.o *.hi
+	rm -f B.hs C
+
+# bug #481
+
+recomp009: clean
+	cp Sub1.hs Sub.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Main.hs
+	./Main
+	sleep 1
+	cp Sub2.hs Sub.hs
+	-'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Main.hs
+	./Main
diff --git a/testsuite/tests/ghc-regress/driver/recomp009/Sub1.hs b/testsuite/tests/driver/recomp009/Sub1.hs
index 25ea7552e4..25ea7552e4 100644
--- a/testsuite/tests/ghc-regress/driver/recomp009/Sub1.hs
+++ b/testsuite/tests/driver/recomp009/Sub1.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp009/Sub2.hs b/testsuite/tests/driver/recomp009/Sub2.hs
index 7ca8b12c33..7ca8b12c33 100644
--- a/testsuite/tests/ghc-regress/driver/recomp009/Sub2.hs
+++ b/testsuite/tests/driver/recomp009/Sub2.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp009/all.T b/testsuite/tests/driver/recomp009/all.T
index 368f6cf2f8..368f6cf2f8 100644
--- a/testsuite/tests/ghc-regress/driver/recomp009/all.T
+++ b/testsuite/tests/driver/recomp009/all.T
diff --git a/testsuite/tests/ghc-regress/driver/recomp009/recomp009.stdout b/testsuite/tests/driver/recomp009/recomp009.stdout
index 1191247b6d..1191247b6d 100644
--- a/testsuite/tests/ghc-regress/driver/recomp009/recomp009.stdout
+++ b/testsuite/tests/driver/recomp009/recomp009.stdout
diff --git a/testsuite/tests/ghc-regress/driver/rtsOpts.hs b/testsuite/tests/driver/rtsOpts.hs
index 0634af001e..0634af001e 100644
--- a/testsuite/tests/ghc-regress/driver/rtsOpts.hs
+++ b/testsuite/tests/driver/rtsOpts.hs
diff --git a/testsuite/tests/ghc-regress/driver/rtsopts001.stdout b/testsuite/tests/driver/rtsopts001.stdout
index b9f151026d..b9f151026d 100644
--- a/testsuite/tests/ghc-regress/driver/rtsopts001.stdout
+++ b/testsuite/tests/driver/rtsopts001.stdout
diff --git a/testsuite/tests/ghc-regress/driver/rtsopts002.hs b/testsuite/tests/driver/rtsopts002.hs
index 473bb8a252..473bb8a252 100644
--- a/testsuite/tests/ghc-regress/driver/rtsopts002.hs
+++ b/testsuite/tests/driver/rtsopts002.hs
diff --git a/testsuite/tests/ghc-regress/driver/rtsopts002.stderr b/testsuite/tests/driver/rtsopts002.stderr
index a92deb2b05..a92deb2b05 100644
--- a/testsuite/tests/ghc-regress/driver/rtsopts002.stderr
+++ b/testsuite/tests/driver/rtsopts002.stderr
diff --git a/testsuite/tests/ghc-regress/driver/rtsopts002.stdout b/testsuite/tests/driver/rtsopts002.stdout
index ac8108a43d..ac8108a43d 100644
--- a/testsuite/tests/ghc-regress/driver/rtsopts002.stdout
+++ b/testsuite/tests/driver/rtsopts002.stdout
diff --git a/testsuite/tests/ghc-regress/driver/shared001.stderr b/testsuite/tests/driver/shared001.stderr
index 26204ba300..26204ba300 100644
--- a/testsuite/tests/ghc-regress/driver/shared001.stderr
+++ b/testsuite/tests/driver/shared001.stderr
diff --git a/testsuite/tests/ghc-regress/driver/werror.hs b/testsuite/tests/driver/werror.hs
index ddfa8449d6..ddfa8449d6 100644
--- a/testsuite/tests/ghc-regress/driver/werror.hs
+++ b/testsuite/tests/driver/werror.hs
diff --git a/testsuite/tests/ghc-regress/driver/werror.stderr b/testsuite/tests/driver/werror.stderr
index c8e7894085..c8e7894085 100644
--- a/testsuite/tests/ghc-regress/driver/werror.stderr
+++ b/testsuite/tests/driver/werror.stderr
diff --git a/testsuite/tests/ghc-regress/driver/withRtsOpts.hs b/testsuite/tests/driver/withRtsOpts.hs
index 0634af001e..0634af001e 100644
--- a/testsuite/tests/ghc-regress/driver/withRtsOpts.hs
+++ b/testsuite/tests/driver/withRtsOpts.hs
diff --git a/testsuite/tests/ghc-regress/driver/withRtsOpts.stdout b/testsuite/tests/driver/withRtsOpts.stdout
index 0a21aace86..0a21aace86 100644
--- a/testsuite/tests/ghc-regress/driver/withRtsOpts.stdout
+++ b/testsuite/tests/driver/withRtsOpts.stdout
diff --git a/testsuite/tests/dynlibs/Makefile b/testsuite/tests/dynlibs/Makefile
new file mode 100644
index 0000000000..b746326062
--- /dev/null
+++ b/testsuite/tests/dynlibs/Makefile
@@ -0,0 +1,32 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+.PHONY: T3807
+T3807:
+	$(RM) T3807Export_stub.c T3807Export_stub.h T3807Export_stub.o
+	$(RM) T3807Export.o T3807Export.hi
+	$(RM) T3807-export.o T3807-load.o
+	$(RM) T3807test.so
+	$(RM) T3807-load
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -dynamic -fPIC -shared T3807Export.hs T3807-export.c -o T3807test.so -lHSrts-ghc`'$(TEST_HC)' $(TEST_HC_OPTS) --numeric-version`
+	'$(TEST_HC)' $(TEST_HC_OPTS) T3807-load.c -o T3807-load -ldl
+	./T3807-load
+
+.PHONY: T4464
+T4464:
+	$(RM) T4464B.o T4464C.o T4464H.hi T4464H.o
+	$(RM) T4464H_stub.c T4464H_stub.h T4464H_stub.o
+	$(RM) HS4464.dll HS4464.dll.a t4464.exe
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -shared T4464H.hs T4464B.c -o HS4464.dll
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 T4464C.c HS4464.dll.a -o t4464.exe
+	-./t4464.exe
+	echo "====="
+	echo "=====" >&2
+	$(RM) T4464B.o T4464C.o T4464H.hi T4464H.o
+	$(RM) T4464H_stub.c T4464H_stub.h T4464H_stub.o
+	$(RM) HS4464.dll HS4464.dll.a t4464.exe
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -shared T4464H.hs T4464B.c -o HS4464.dll -rtsopts
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 T4464C.c HS4464.dll.a -o t4464.exe
+	./t4464.exe
+
diff --git a/testsuite/tests/ghc-regress/dynlibs/T3807-export.c b/testsuite/tests/dynlibs/T3807-export.c
index aba129e944..aba129e944 100644
--- a/testsuite/tests/ghc-regress/dynlibs/T3807-export.c
+++ b/testsuite/tests/dynlibs/T3807-export.c
diff --git a/testsuite/tests/ghc-regress/dynlibs/T3807-load.c b/testsuite/tests/dynlibs/T3807-load.c
index 8c6f252c5f..8c6f252c5f 100644
--- a/testsuite/tests/ghc-regress/dynlibs/T3807-load.c
+++ b/testsuite/tests/dynlibs/T3807-load.c
diff --git a/testsuite/tests/ghc-regress/dynlibs/T3807.stdout b/testsuite/tests/dynlibs/T3807.stdout
index 05d58b6eb5..05d58b6eb5 100644
--- a/testsuite/tests/ghc-regress/dynlibs/T3807.stdout
+++ b/testsuite/tests/dynlibs/T3807.stdout
diff --git a/testsuite/tests/ghc-regress/dynlibs/T3807Export.hs b/testsuite/tests/dynlibs/T3807Export.hs
index 70d9e9b5fb..70d9e9b5fb 100644
--- a/testsuite/tests/ghc-regress/dynlibs/T3807Export.hs
+++ b/testsuite/tests/dynlibs/T3807Export.hs
diff --git a/testsuite/tests/ghc-regress/dynlibs/T4464.stderr b/testsuite/tests/dynlibs/T4464.stderr
index 0ec9bb989d..0ec9bb989d 100644
--- a/testsuite/tests/ghc-regress/dynlibs/T4464.stderr
+++ b/testsuite/tests/dynlibs/T4464.stderr
diff --git a/testsuite/tests/ghc-regress/dynlibs/T4464.stdout b/testsuite/tests/dynlibs/T4464.stdout
index 68a1093c21..68a1093c21 100644
--- a/testsuite/tests/ghc-regress/dynlibs/T4464.stdout
+++ b/testsuite/tests/dynlibs/T4464.stdout
diff --git a/testsuite/tests/ghc-regress/dynlibs/T4464B.c b/testsuite/tests/dynlibs/T4464B.c
index 0cd2845895..0cd2845895 100644
--- a/testsuite/tests/ghc-regress/dynlibs/T4464B.c
+++ b/testsuite/tests/dynlibs/T4464B.c
diff --git a/testsuite/tests/ghc-regress/dynlibs/T4464C.c b/testsuite/tests/dynlibs/T4464C.c
index d013b99684..d013b99684 100644
--- a/testsuite/tests/ghc-regress/dynlibs/T4464C.c
+++ b/testsuite/tests/dynlibs/T4464C.c
diff --git a/testsuite/tests/ghc-regress/dynlibs/T4464H.hs b/testsuite/tests/dynlibs/T4464H.hs
index f620866c86..f620866c86 100644
--- a/testsuite/tests/ghc-regress/dynlibs/T4464H.hs
+++ b/testsuite/tests/dynlibs/T4464H.hs
diff --git a/testsuite/tests/ghc-regress/dynlibs/all.T b/testsuite/tests/dynlibs/all.T
index 2ed477255b..2ed477255b 100644
--- a/testsuite/tests/ghc-regress/dynlibs/all.T
+++ b/testsuite/tests/dynlibs/all.T
diff --git a/testsuite/tests/ghc-regress/esc/F123.hs b/testsuite/tests/esc/F123.hs
index 6aaad164cf..6aaad164cf 100644
--- a/testsuite/tests/ghc-regress/esc/F123.hs
+++ b/testsuite/tests/esc/F123.hs
diff --git a/testsuite/tests/esc/Makefile b/testsuite/tests/esc/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/esc/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/esc/Sum.hs b/testsuite/tests/esc/Sum.hs
index 2b9ee29688..2b9ee29688 100644
--- a/testsuite/tests/ghc-regress/esc/Sum.hs
+++ b/testsuite/tests/esc/Sum.hs
diff --git a/testsuite/tests/ghc-regress/esc/TestData.hs b/testsuite/tests/esc/TestData.hs
index 045f3c96c0..045f3c96c0 100644
--- a/testsuite/tests/ghc-regress/esc/TestData.hs
+++ b/testsuite/tests/esc/TestData.hs
diff --git a/testsuite/tests/ghc-regress/esc/TestDataCon.hs b/testsuite/tests/esc/TestDataCon.hs
index e5b66eb094..e5b66eb094 100644
--- a/testsuite/tests/ghc-regress/esc/TestDataCon.hs
+++ b/testsuite/tests/esc/TestDataCon.hs
diff --git a/testsuite/tests/ghc-regress/esc/TestImport.hs b/testsuite/tests/esc/TestImport.hs
index bf91eafb63..bf91eafb63 100644
--- a/testsuite/tests/ghc-regress/esc/TestImport.hs
+++ b/testsuite/tests/esc/TestImport.hs
diff --git a/testsuite/tests/ghc-regress/esc/TestList.hs b/testsuite/tests/esc/TestList.hs
index 66f9df2263..66f9df2263 100644
--- a/testsuite/tests/ghc-regress/esc/TestList.hs
+++ b/testsuite/tests/esc/TestList.hs
diff --git a/testsuite/tests/ghc-regress/esc/all.T b/testsuite/tests/esc/all.T
index 55b21ee2a3..55b21ee2a3 100644
--- a/testsuite/tests/ghc-regress/esc/all.T
+++ b/testsuite/tests/esc/all.T
diff --git a/testsuite/tests/ghc-regress/esc/synonym.hs b/testsuite/tests/esc/synonym.hs
index 24b035ccc1..24b035ccc1 100644
--- a/testsuite/tests/ghc-regress/esc/synonym.hs
+++ b/testsuite/tests/esc/synonym.hs
diff --git a/testsuite/tests/ghc-regress/eyeball/IOList.lhs b/testsuite/tests/eyeball/IOList.lhs
index 59c282ce9b..59c282ce9b 100644
--- a/testsuite/tests/ghc-regress/eyeball/IOList.lhs
+++ b/testsuite/tests/eyeball/IOList.lhs
diff --git a/testsuite/tests/eyeball/Makefile b/testsuite/tests/eyeball/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/eyeball/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/eyeball/README b/testsuite/tests/eyeball/README
index 14516604f6..14516604f6 100644
--- a/testsuite/tests/ghc-regress/eyeball/README
+++ b/testsuite/tests/eyeball/README
diff --git a/testsuite/tests/ghc-regress/eyeball/T3116.hs b/testsuite/tests/eyeball/T3116.hs
index ba2439c897..ba2439c897 100644
--- a/testsuite/tests/ghc-regress/eyeball/T3116.hs
+++ b/testsuite/tests/eyeball/T3116.hs
diff --git a/testsuite/tests/ghc-regress/eyeball/dead1.hs b/testsuite/tests/eyeball/dead1.hs
index 108dc8491b..108dc8491b 100644
--- a/testsuite/tests/ghc-regress/eyeball/dead1.hs
+++ b/testsuite/tests/eyeball/dead1.hs
diff --git a/testsuite/tests/ghc-regress/eyeball/dmd-on-polymorphic-floatouts.hs b/testsuite/tests/eyeball/dmd-on-polymorphic-floatouts.hs
index fa411e23f2..fa411e23f2 100644
--- a/testsuite/tests/ghc-regress/eyeball/dmd-on-polymorphic-floatouts.hs
+++ b/testsuite/tests/eyeball/dmd-on-polymorphic-floatouts.hs
diff --git a/testsuite/tests/ghc-regress/eyeball/inline1.hs b/testsuite/tests/eyeball/inline1.hs
index 8e58652db6..8e58652db6 100644
--- a/testsuite/tests/ghc-regress/eyeball/inline1.hs
+++ b/testsuite/tests/eyeball/inline1.hs
diff --git a/testsuite/tests/ghc-regress/eyeball/inline2.hs b/testsuite/tests/eyeball/inline2.hs
index 45bb04bf8b..45bb04bf8b 100644
--- a/testsuite/tests/ghc-regress/eyeball/inline2.hs
+++ b/testsuite/tests/eyeball/inline2.hs
diff --git a/testsuite/tests/ghc-regress/eyeball/inline3.hs b/testsuite/tests/eyeball/inline3.hs
index 1bde5f722a..1bde5f722a 100644
--- a/testsuite/tests/ghc-regress/eyeball/inline3.hs
+++ b/testsuite/tests/eyeball/inline3.hs
diff --git a/testsuite/tests/ghc-regress/eyeball/inline4.hs b/testsuite/tests/eyeball/inline4.hs
index 2648c9e039..2648c9e039 100644
--- a/testsuite/tests/ghc-regress/eyeball/inline4.hs
+++ b/testsuite/tests/eyeball/inline4.hs
diff --git a/testsuite/tests/ghc-regress/eyeball/record1.hs b/testsuite/tests/eyeball/record1.hs
index 1f9084b7a6..1f9084b7a6 100644
--- a/testsuite/tests/ghc-regress/eyeball/record1.hs
+++ b/testsuite/tests/eyeball/record1.hs
diff --git a/testsuite/tests/ghc-regress/eyeball/spec-constr1.hs b/testsuite/tests/eyeball/spec-constr1.hs
index a14442035b..a14442035b 100644
--- a/testsuite/tests/ghc-regress/eyeball/spec-constr1.hs
+++ b/testsuite/tests/eyeball/spec-constr1.hs
diff --git a/testsuite/tests/ghc-regress/eyeball/state-hack.hs b/testsuite/tests/eyeball/state-hack.hs
index 439bf78202..439bf78202 100644
--- a/testsuite/tests/ghc-regress/eyeball/state-hack.hs
+++ b/testsuite/tests/eyeball/state-hack.hs
diff --git a/testsuite/tests/ffi/Makefile b/testsuite/tests/ffi/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/ffi/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/1357.hs b/testsuite/tests/ffi/should_compile/1357.hs
index 1f5479bc1c..1f5479bc1c 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/1357.hs
+++ b/testsuite/tests/ffi/should_compile/1357.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/1357.stderr b/testsuite/tests/ffi/should_compile/1357.stderr
index cd1cb7031a..cd1cb7031a 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/1357.stderr
+++ b/testsuite/tests/ffi/should_compile/1357.stderr
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/3624.hs b/testsuite/tests/ffi/should_compile/3624.hs
index 8f42efc055..8f42efc055 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/3624.hs
+++ b/testsuite/tests/ffi/should_compile/3624.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/3742.hs b/testsuite/tests/ffi/should_compile/3742.hs
index c16b6009eb..c16b6009eb 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/3742.hs
+++ b/testsuite/tests/ffi/should_compile/3742.hs
diff --git a/testsuite/tests/ghc-regress/parser/Makefile b/testsuite/tests/ffi/should_compile/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/parser/Makefile
+++ b/testsuite/tests/ffi/should_compile/Makefile
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/all.T b/testsuite/tests/ffi/should_compile/all.T
index ff8bc64b5d..ff8bc64b5d 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/all.T
+++ b/testsuite/tests/ffi/should_compile/all.T
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/cc001.hs b/testsuite/tests/ffi/should_compile/cc001.hs
index cd7318d000..cd7318d000 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/cc001.hs
+++ b/testsuite/tests/ffi/should_compile/cc001.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/cc001.stderr b/testsuite/tests/ffi/should_compile/cc001.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/cc001.stderr
+++ b/testsuite/tests/ffi/should_compile/cc001.stderr
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/cc004.hs b/testsuite/tests/ffi/should_compile/cc004.hs
index fb754223b2..fb754223b2 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/cc004.hs
+++ b/testsuite/tests/ffi/should_compile/cc004.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/cc005.hs b/testsuite/tests/ffi/should_compile/cc005.hs
index e057cfd233..e057cfd233 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/cc005.hs
+++ b/testsuite/tests/ffi/should_compile/cc005.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/cc007.hs b/testsuite/tests/ffi/should_compile/cc007.hs
index 99337cc37f..99337cc37f 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/cc007.hs
+++ b/testsuite/tests/ffi/should_compile/cc007.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/cc008.hs b/testsuite/tests/ffi/should_compile/cc008.hs
index 2dd0bc99eb..2dd0bc99eb 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/cc008.hs
+++ b/testsuite/tests/ffi/should_compile/cc008.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/cc009.hs b/testsuite/tests/ffi/should_compile/cc009.hs
index 3ece3a9a24..3ece3a9a24 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/cc009.hs
+++ b/testsuite/tests/ffi/should_compile/cc009.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/cc009_inc.h b/testsuite/tests/ffi/should_compile/cc009_inc.h
index be2f5392f8..be2f5392f8 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/cc009_inc.h
+++ b/testsuite/tests/ffi/should_compile/cc009_inc.h
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/cc010.hs b/testsuite/tests/ffi/should_compile/cc010.hs
index dd34730d42..dd34730d42 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/cc010.hs
+++ b/testsuite/tests/ffi/should_compile/cc010.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/cc011.hs b/testsuite/tests/ffi/should_compile/cc011.hs
index 25cce84bd3..25cce84bd3 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/cc011.hs
+++ b/testsuite/tests/ffi/should_compile/cc011.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/cc011.stderr-hugs b/testsuite/tests/ffi/should_compile/cc011.stderr-hugs
index d6f9e1788c..d6f9e1788c 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/cc011.stderr-hugs
+++ b/testsuite/tests/ffi/should_compile/cc011.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/cc012.hs b/testsuite/tests/ffi/should_compile/cc012.hs
index 288f9acd02..288f9acd02 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/cc012.hs
+++ b/testsuite/tests/ffi/should_compile/cc012.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/cc013.hs b/testsuite/tests/ffi/should_compile/cc013.hs
index 09dd2ef2ef..09dd2ef2ef 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/cc013.hs
+++ b/testsuite/tests/ffi/should_compile/cc013.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/cc014.hs b/testsuite/tests/ffi/should_compile/cc014.hs
index bbf2d765ed..bbf2d765ed 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/cc014.hs
+++ b/testsuite/tests/ffi/should_compile/cc014.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/ffi-deriv1.hs b/testsuite/tests/ffi/should_compile/ffi-deriv1.hs
index 94d0df2fa4..94d0df2fa4 100644
--- a/testsuite/tests/ghc-regress/ffi/should_compile/ffi-deriv1.hs
+++ b/testsuite/tests/ffi/should_compile/ffi-deriv1.hs
diff --git a/testsuite/tests/ghc-regress/perf/Makefile b/testsuite/tests/ffi/should_fail/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/perf/Makefile
+++ b/testsuite/tests/ffi/should_fail/Makefile
diff --git a/testsuite/tests/ghc-regress/ffi/should_fail/T3066.hs b/testsuite/tests/ffi/should_fail/T3066.hs
index 2d71946843..2d71946843 100644
--- a/testsuite/tests/ghc-regress/ffi/should_fail/T3066.hs
+++ b/testsuite/tests/ffi/should_fail/T3066.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_fail/T3066.stderr b/testsuite/tests/ffi/should_fail/T3066.stderr
index ac0a07d60a..ac0a07d60a 100644
--- a/testsuite/tests/ghc-regress/ffi/should_fail/T3066.stderr
+++ b/testsuite/tests/ffi/should_fail/T3066.stderr
diff --git a/testsuite/tests/ghc-regress/ffi/should_fail/all.T b/testsuite/tests/ffi/should_fail/all.T
index bc6ee95e62..bc6ee95e62 100644
--- a/testsuite/tests/ghc-regress/ffi/should_fail/all.T
+++ b/testsuite/tests/ffi/should_fail/all.T
diff --git a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail001.hs b/testsuite/tests/ffi/should_fail/ccfail001.hs
index cd8eb83665..cd8eb83665 100644
--- a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail001.hs
+++ b/testsuite/tests/ffi/should_fail/ccfail001.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail001.stderr b/testsuite/tests/ffi/should_fail/ccfail001.stderr
index 813c5d187c..813c5d187c 100644
--- a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail001.stderr
+++ b/testsuite/tests/ffi/should_fail/ccfail001.stderr
diff --git a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail002.hs b/testsuite/tests/ffi/should_fail/ccfail002.hs
index 977faa2f7c..977faa2f7c 100644
--- a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail002.hs
+++ b/testsuite/tests/ffi/should_fail/ccfail002.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail002.stderr b/testsuite/tests/ffi/should_fail/ccfail002.stderr
index dfff4272cd..dfff4272cd 100644
--- a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail002.stderr
+++ b/testsuite/tests/ffi/should_fail/ccfail002.stderr
diff --git a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail003.hs b/testsuite/tests/ffi/should_fail/ccfail003.hs
index f16556cb3f..f16556cb3f 100644
--- a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail003.hs
+++ b/testsuite/tests/ffi/should_fail/ccfail003.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail003.stderr b/testsuite/tests/ffi/should_fail/ccfail003.stderr
index 7933b8c48e..7933b8c48e 100644
--- a/testsuite/tests/ghc-regress/ffi/should_fail/ccfail003.stderr
+++ b/testsuite/tests/ffi/should_fail/ccfail003.stderr
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/1288.hs b/testsuite/tests/ffi/should_run/1288.hs
index 8b3a8f8417..8b3a8f8417 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/1288.hs
+++ b/testsuite/tests/ffi/should_run/1288.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/1288.stdout b/testsuite/tests/ffi/should_run/1288.stdout
index ef6be0406e..ef6be0406e 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/1288.stdout
+++ b/testsuite/tests/ffi/should_run/1288.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/1288_c.c b/testsuite/tests/ffi/should_run/1288_c.c
index f240d29529..f240d29529 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/1288_c.c
+++ b/testsuite/tests/ffi/should_run/1288_c.c
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/1288_ghci.hs b/testsuite/tests/ffi/should_run/1288_ghci.hs
index 8b3a8f8417..8b3a8f8417 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/1288_ghci.hs
+++ b/testsuite/tests/ffi/should_run/1288_ghci.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/1288_ghci.stdout b/testsuite/tests/ffi/should_run/1288_ghci.stdout
index ef6be0406e..ef6be0406e 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/1288_ghci.stdout
+++ b/testsuite/tests/ffi/should_run/1288_ghci.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/1288_ghci_c.c b/testsuite/tests/ffi/should_run/1288_ghci_c.c
index f240d29529..f240d29529 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/1288_ghci_c.c
+++ b/testsuite/tests/ffi/should_run/1288_ghci_c.c
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/1679.hs b/testsuite/tests/ffi/should_run/1679.hs
index 15f8630004..15f8630004 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/1679.hs
+++ b/testsuite/tests/ffi/should_run/1679.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/1679.stdout b/testsuite/tests/ffi/should_run/1679.stdout
index ad2afa7c36..ad2afa7c36 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/1679.stdout
+++ b/testsuite/tests/ffi/should_run/1679.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/2276.hs b/testsuite/tests/ffi/should_run/2276.hs
index 0ee1ee91ff..0ee1ee91ff 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/2276.hs
+++ b/testsuite/tests/ffi/should_run/2276.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/2276.stdout b/testsuite/tests/ffi/should_run/2276.stdout
index ef6be0406e..ef6be0406e 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/2276.stdout
+++ b/testsuite/tests/ffi/should_run/2276.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/2276_c.c b/testsuite/tests/ffi/should_run/2276_c.c
index f240d29529..f240d29529 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/2276_c.c
+++ b/testsuite/tests/ffi/should_run/2276_c.c
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/2276_ghci.hs b/testsuite/tests/ffi/should_run/2276_ghci.hs
index 0ee1ee91ff..0ee1ee91ff 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/2276_ghci.hs
+++ b/testsuite/tests/ffi/should_run/2276_ghci.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/2276_ghci.stdout b/testsuite/tests/ffi/should_run/2276_ghci.stdout
index ef6be0406e..ef6be0406e 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/2276_ghci.stdout
+++ b/testsuite/tests/ffi/should_run/2276_ghci.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/2276_ghci_c.c b/testsuite/tests/ffi/should_run/2276_ghci_c.c
index f240d29529..f240d29529 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/2276_ghci_c.c
+++ b/testsuite/tests/ffi/should_run/2276_ghci_c.c
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/2469.hs b/testsuite/tests/ffi/should_run/2469.hs
index dc68ad73bf..dc68ad73bf 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/2469.hs
+++ b/testsuite/tests/ffi/should_run/2469.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/2594.hs b/testsuite/tests/ffi/should_run/2594.hs
index cdfcfc71fd..cdfcfc71fd 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/2594.hs
+++ b/testsuite/tests/ffi/should_run/2594.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/2594.stdout b/testsuite/tests/ffi/should_run/2594.stdout
index bfb2cfef51..bfb2cfef51 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/2594.stdout
+++ b/testsuite/tests/ffi/should_run/2594.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/2594_c.c b/testsuite/tests/ffi/should_run/2594_c.c
index f0dd3007fa..f0dd3007fa 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/2594_c.c
+++ b/testsuite/tests/ffi/should_run/2594_c.c
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/2594_c.h b/testsuite/tests/ffi/should_run/2594_c.h
index 5847b26662..5847b26662 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/2594_c.h
+++ b/testsuite/tests/ffi/should_run/2594_c.h
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/2917a.hs b/testsuite/tests/ffi/should_run/2917a.hs
index cdfaabcd2a..cdfaabcd2a 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/2917a.hs
+++ b/testsuite/tests/ffi/should_run/2917a.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/4038.hs b/testsuite/tests/ffi/should_run/4038.hs
index 9250fb9082..9250fb9082 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/4038.hs
+++ b/testsuite/tests/ffi/should_run/4038.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/4038.stdout b/testsuite/tests/ffi/should_run/4038.stdout
index d81cc0710e..d81cc0710e 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/4038.stdout
+++ b/testsuite/tests/ffi/should_run/4038.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/4221.hs b/testsuite/tests/ffi/should_run/4221.hs
index eba782e636..eba782e636 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/4221.hs
+++ b/testsuite/tests/ffi/should_run/4221.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/4221.stdout b/testsuite/tests/ffi/should_run/4221.stdout
index 237bd7fc81..237bd7fc81 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/4221.stdout
+++ b/testsuite/tests/ffi/should_run/4221.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/4221_c.c b/testsuite/tests/ffi/should_run/4221_c.c
index 0c5ca228c1..0c5ca228c1 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/4221_c.c
+++ b/testsuite/tests/ffi/should_run/4221_c.c
diff --git a/testsuite/tests/ffi/should_run/Makefile b/testsuite/tests/ffi/should_run/Makefile
new file mode 100644
index 0000000000..c30f5565f4
--- /dev/null
+++ b/testsuite/tests/ffi/should_run/Makefile
@@ -0,0 +1,15 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+ffi018_ghci_setup :
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c ffi018_ghci_c.c
+
+1288_ghci_setup :
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c 1288_ghci_c.c
+
+2276_ghci_setup :
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c 2276_ghci_c.c
+
+ffi002_setup :
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c ffi002.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/all.T b/testsuite/tests/ffi/should_run/all.T
index 434397d065..434397d065 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/all.T
+++ b/testsuite/tests/ffi/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/fed001.hs b/testsuite/tests/ffi/should_run/fed001.hs
index a832c58ac4..a832c58ac4 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/fed001.hs
+++ b/testsuite/tests/ffi/should_run/fed001.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/fed001.stdout b/testsuite/tests/ffi/should_run/fed001.stdout
index fb5139007e..fb5139007e 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/fed001.stdout
+++ b/testsuite/tests/ffi/should_run/fed001.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi001.hs b/testsuite/tests/ffi/should_run/ffi001.hs
index 864b0bda45..864b0bda45 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi001.hs
+++ b/testsuite/tests/ffi/should_run/ffi001.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi001.stdout b/testsuite/tests/ffi/should_run/ffi001.stdout
index 695e5e77f1..695e5e77f1 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi001.stdout
+++ b/testsuite/tests/ffi/should_run/ffi001.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi002.hs b/testsuite/tests/ffi/should_run/ffi002.hs
index 0186f32700..0186f32700 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi002.hs
+++ b/testsuite/tests/ffi/should_run/ffi002.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi002.stdout b/testsuite/tests/ffi/should_run/ffi002.stdout
index 01ef0d9f4d..01ef0d9f4d 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi002.stdout
+++ b/testsuite/tests/ffi/should_run/ffi002.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi002_c.c b/testsuite/tests/ffi/should_run/ffi002_c.c
index 1e5edd2424..1e5edd2424 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi002_c.c
+++ b/testsuite/tests/ffi/should_run/ffi002_c.c
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi003.hs b/testsuite/tests/ffi/should_run/ffi003.hs
index bc291960ec..bc291960ec 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi003.hs
+++ b/testsuite/tests/ffi/should_run/ffi003.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi003.stdout b/testsuite/tests/ffi/should_run/ffi003.stdout
index e83a344363..e83a344363 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi003.stdout
+++ b/testsuite/tests/ffi/should_run/ffi003.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi004.hs b/testsuite/tests/ffi/should_run/ffi004.hs
index 546cd15068..546cd15068 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi004.hs
+++ b/testsuite/tests/ffi/should_run/ffi004.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi004.stdout b/testsuite/tests/ffi/should_run/ffi004.stdout
index 8cee3bfbb1..8cee3bfbb1 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi004.stdout
+++ b/testsuite/tests/ffi/should_run/ffi004.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi005.hs b/testsuite/tests/ffi/should_run/ffi005.hs
index 63de9558f9..63de9558f9 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi005.hs
+++ b/testsuite/tests/ffi/should_run/ffi005.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi005.stdout b/testsuite/tests/ffi/should_run/ffi005.stdout
index bc0a137514..bc0a137514 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi005.stdout
+++ b/testsuite/tests/ffi/should_run/ffi005.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi006.hs b/testsuite/tests/ffi/should_run/ffi006.hs
index 20328e1e9f..20328e1e9f 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi006.hs
+++ b/testsuite/tests/ffi/should_run/ffi006.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi006.stdout b/testsuite/tests/ffi/should_run/ffi006.stdout
index fece85f608..fece85f608 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi006.stdout
+++ b/testsuite/tests/ffi/should_run/ffi006.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi007.hs b/testsuite/tests/ffi/should_run/ffi007.hs
index 506ec57cd3..506ec57cd3 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi007.hs
+++ b/testsuite/tests/ffi/should_run/ffi007.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi007.stdout b/testsuite/tests/ffi/should_run/ffi007.stdout
index 1ca228cda4..1ca228cda4 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi007.stdout
+++ b/testsuite/tests/ffi/should_run/ffi007.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi008.hs b/testsuite/tests/ffi/should_run/ffi008.hs
index f065e49855..f065e49855 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi008.hs
+++ b/testsuite/tests/ffi/should_run/ffi008.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi008.stderr b/testsuite/tests/ffi/should_run/ffi008.stderr
index cc538ee68c..cc538ee68c 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi008.stderr
+++ b/testsuite/tests/ffi/should_run/ffi008.stderr
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi009.hs b/testsuite/tests/ffi/should_run/ffi009.hs
index 5e91843bb5..5e91843bb5 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi009.hs
+++ b/testsuite/tests/ffi/should_run/ffi009.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi009.stdout b/testsuite/tests/ffi/should_run/ffi009.stdout
index 2701fdd909..2701fdd909 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi009.stdout
+++ b/testsuite/tests/ffi/should_run/ffi009.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi010.hs b/testsuite/tests/ffi/should_run/ffi010.hs
index b02522dd1f..b02522dd1f 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi010.hs
+++ b/testsuite/tests/ffi/should_run/ffi010.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi011.hs b/testsuite/tests/ffi/should_run/ffi011.hs
index cfb0ae62a9..cfb0ae62a9 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi011.hs
+++ b/testsuite/tests/ffi/should_run/ffi011.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi011.stdout b/testsuite/tests/ffi/should_run/ffi011.stdout
index 91d6f80f27..91d6f80f27 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi011.stdout
+++ b/testsuite/tests/ffi/should_run/ffi011.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi012.hs b/testsuite/tests/ffi/should_run/ffi012.hs
index de101ea769..de101ea769 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi012.hs
+++ b/testsuite/tests/ffi/should_run/ffi012.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi012.stdout b/testsuite/tests/ffi/should_run/ffi012.stdout
index b384fe2adf..b384fe2adf 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi012.stdout
+++ b/testsuite/tests/ffi/should_run/ffi012.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi013.hs b/testsuite/tests/ffi/should_run/ffi013.hs
index ae38c71b10..ae38c71b10 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi013.hs
+++ b/testsuite/tests/ffi/should_run/ffi013.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi013.stdout b/testsuite/tests/ffi/should_run/ffi013.stdout
index fb5139007e..fb5139007e 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi013.stdout
+++ b/testsuite/tests/ffi/should_run/ffi013.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi014.hs b/testsuite/tests/ffi/should_run/ffi014.hs
index 4434bef21a..4434bef21a 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi014.hs
+++ b/testsuite/tests/ffi/should_run/ffi014.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi014.stdout b/testsuite/tests/ffi/should_run/ffi014.stdout
index e53a095ac8..e53a095ac8 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi014.stdout
+++ b/testsuite/tests/ffi/should_run/ffi014.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi014_cbits.c b/testsuite/tests/ffi/should_run/ffi014_cbits.c
index 0cf96d5dc6..0cf96d5dc6 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi014_cbits.c
+++ b/testsuite/tests/ffi/should_run/ffi014_cbits.c
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi014_cbits.h b/testsuite/tests/ffi/should_run/ffi014_cbits.h
index d0d8517ca5..d0d8517ca5 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi014_cbits.h
+++ b/testsuite/tests/ffi/should_run/ffi014_cbits.h
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi015.hs b/testsuite/tests/ffi/should_run/ffi015.hs
index c70220fa4a..c70220fa4a 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi015.hs
+++ b/testsuite/tests/ffi/should_run/ffi015.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi015.stdout b/testsuite/tests/ffi/should_run/ffi015.stdout
index d81cc0710e..d81cc0710e 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi015.stdout
+++ b/testsuite/tests/ffi/should_run/ffi015.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi015_cbits.c b/testsuite/tests/ffi/should_run/ffi015_cbits.c
index f71b82d569..f71b82d569 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi015_cbits.c
+++ b/testsuite/tests/ffi/should_run/ffi015_cbits.c
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi015_cbits.h b/testsuite/tests/ffi/should_run/ffi015_cbits.h
index bc4ad6becd..bc4ad6becd 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi015_cbits.h
+++ b/testsuite/tests/ffi/should_run/ffi015_cbits.h
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi016.hs b/testsuite/tests/ffi/should_run/ffi016.hs
index 0be6f31d7a..0be6f31d7a 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi016.hs
+++ b/testsuite/tests/ffi/should_run/ffi016.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi016.stdout b/testsuite/tests/ffi/should_run/ffi016.stdout
index 74b7c6f766..74b7c6f766 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi016.stdout
+++ b/testsuite/tests/ffi/should_run/ffi016.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi017.hs b/testsuite/tests/ffi/should_run/ffi017.hs
index de9a1c4295..de9a1c4295 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi017.hs
+++ b/testsuite/tests/ffi/should_run/ffi017.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi018.h b/testsuite/tests/ffi/should_run/ffi018.h
index 88f67c518d..88f67c518d 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi018.h
+++ b/testsuite/tests/ffi/should_run/ffi018.h
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi018.hs b/testsuite/tests/ffi/should_run/ffi018.hs
index c529ea87e6..c529ea87e6 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi018.hs
+++ b/testsuite/tests/ffi/should_run/ffi018.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi018.stdout b/testsuite/tests/ffi/should_run/ffi018.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi018.stdout
+++ b/testsuite/tests/ffi/should_run/ffi018.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi018_c.c b/testsuite/tests/ffi/should_run/ffi018_c.c
index 0d918184d5..0d918184d5 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi018_c.c
+++ b/testsuite/tests/ffi/should_run/ffi018_c.c
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi018_ghci.h b/testsuite/tests/ffi/should_run/ffi018_ghci.h
index 88f67c518d..88f67c518d 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi018_ghci.h
+++ b/testsuite/tests/ffi/should_run/ffi018_ghci.h
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi018_ghci.hs b/testsuite/tests/ffi/should_run/ffi018_ghci.hs
index c529ea87e6..c529ea87e6 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi018_ghci.hs
+++ b/testsuite/tests/ffi/should_run/ffi018_ghci.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi018_ghci.stdout b/testsuite/tests/ffi/should_run/ffi018_ghci.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi018_ghci.stdout
+++ b/testsuite/tests/ffi/should_run/ffi018_ghci.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi018_ghci_c.c b/testsuite/tests/ffi/should_run/ffi018_ghci_c.c
index 0d918184d5..0d918184d5 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi018_ghci_c.c
+++ b/testsuite/tests/ffi/should_run/ffi018_ghci_c.c
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi019.hs b/testsuite/tests/ffi/should_run/ffi019.hs
index 2b317d8e09..2b317d8e09 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi019.hs
+++ b/testsuite/tests/ffi/should_run/ffi019.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi019.stdout b/testsuite/tests/ffi/should_run/ffi019.stdout
index cfbeb15fac..cfbeb15fac 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi019.stdout
+++ b/testsuite/tests/ffi/should_run/ffi019.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi020.hs b/testsuite/tests/ffi/should_run/ffi020.hs
index d2236f5791..d2236f5791 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi020.hs
+++ b/testsuite/tests/ffi/should_run/ffi020.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi020.stderr b/testsuite/tests/ffi/should_run/ffi020.stderr
index 614dd72f8b..614dd72f8b 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi020.stderr
+++ b/testsuite/tests/ffi/should_run/ffi020.stderr
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi021.hs b/testsuite/tests/ffi/should_run/ffi021.hs
index 8f6ce1bf92..8f6ce1bf92 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi021.hs
+++ b/testsuite/tests/ffi/should_run/ffi021.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi021.stdout b/testsuite/tests/ffi/should_run/ffi021.stdout
index ce01362503..ce01362503 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi021.stdout
+++ b/testsuite/tests/ffi/should_run/ffi021.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi022.hs b/testsuite/tests/ffi/should_run/ffi022.hs
index 5313f7183e..5313f7183e 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi022.hs
+++ b/testsuite/tests/ffi/should_run/ffi022.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/ffi022.stdout b/testsuite/tests/ffi/should_run/ffi022.stdout
index fa5f27d449..fa5f27d449 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/ffi022.stdout
+++ b/testsuite/tests/ffi/should_run/ffi022.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/fptr01.h b/testsuite/tests/ffi/should_run/fptr01.h
index b50cc41776..b50cc41776 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/fptr01.h
+++ b/testsuite/tests/ffi/should_run/fptr01.h
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/fptr01.hs b/testsuite/tests/ffi/should_run/fptr01.hs
index 1d20a48e14..1d20a48e14 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/fptr01.hs
+++ b/testsuite/tests/ffi/should_run/fptr01.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/fptr01.stdout b/testsuite/tests/ffi/should_run/fptr01.stdout
index 71ba93cc9f..71ba93cc9f 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/fptr01.stdout
+++ b/testsuite/tests/ffi/should_run/fptr01.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/fptr01_c.c b/testsuite/tests/ffi/should_run/fptr01_c.c
index 0a0e1efe1c..0a0e1efe1c 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/fptr01_c.c
+++ b/testsuite/tests/ffi/should_run/fptr01_c.c
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/fptr02.hs b/testsuite/tests/ffi/should_run/fptr02.hs
index 4691427c3e..4691427c3e 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/fptr02.hs
+++ b/testsuite/tests/ffi/should_run/fptr02.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/fptrfail01.h b/testsuite/tests/ffi/should_run/fptrfail01.h
index 3e10d8bd7a..3e10d8bd7a 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/fptrfail01.h
+++ b/testsuite/tests/ffi/should_run/fptrfail01.h
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/fptrfail01.hs b/testsuite/tests/ffi/should_run/fptrfail01.hs
index 97b331e96b..97b331e96b 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/fptrfail01.hs
+++ b/testsuite/tests/ffi/should_run/fptrfail01.hs
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/fptrfail01.stderr b/testsuite/tests/ffi/should_run/fptrfail01.stderr
index db50b2e01b..db50b2e01b 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/fptrfail01.stderr
+++ b/testsuite/tests/ffi/should_run/fptrfail01.stderr
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/fptrfail01.stdout b/testsuite/tests/ffi/should_run/fptrfail01.stdout
index e396748a4e..e396748a4e 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/fptrfail01.stdout
+++ b/testsuite/tests/ffi/should_run/fptrfail01.stdout
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/fptrfail01_c.c b/testsuite/tests/ffi/should_run/fptrfail01_c.c
index 070a786e57..070a786e57 100644
--- a/testsuite/tests/ghc-regress/ffi/should_run/fptrfail01_c.c
+++ b/testsuite/tests/ffi/should_run/fptrfail01_c.c
diff --git a/testsuite/tests/ghc-regress/gadt/Arith.hs b/testsuite/tests/gadt/Arith.hs
index a98ee729a9..a98ee729a9 100644
--- a/testsuite/tests/ghc-regress/gadt/Arith.hs
+++ b/testsuite/tests/gadt/Arith.hs
diff --git a/testsuite/tests/ghc-regress/gadt/CasePrune.hs b/testsuite/tests/gadt/CasePrune.hs
index 4048c94c5f..4048c94c5f 100644
--- a/testsuite/tests/ghc-regress/gadt/CasePrune.hs
+++ b/testsuite/tests/gadt/CasePrune.hs
diff --git a/testsuite/tests/ghc-regress/gadt/CasePrune.stdout b/testsuite/tests/gadt/CasePrune.stdout
index 52c33a57c7..52c33a57c7 100644
--- a/testsuite/tests/ghc-regress/gadt/CasePrune.stdout
+++ b/testsuite/tests/gadt/CasePrune.stdout
diff --git a/testsuite/tests/ghc-regress/gadt/Gadt17_help.hs b/testsuite/tests/gadt/Gadt17_help.hs
index 30b57133d5..30b57133d5 100644
--- a/testsuite/tests/ghc-regress/gadt/Gadt17_help.hs
+++ b/testsuite/tests/gadt/Gadt17_help.hs
diff --git a/testsuite/tests/ghc-regress/gadt/Gadt23_AST.hs b/testsuite/tests/gadt/Gadt23_AST.hs
index 75b07c7611..75b07c7611 100644
--- a/testsuite/tests/ghc-regress/gadt/Gadt23_AST.hs
+++ b/testsuite/tests/gadt/Gadt23_AST.hs
diff --git a/testsuite/tests/gadt/Makefile b/testsuite/tests/gadt/Makefile
new file mode 100644
index 0000000000..7a2288f6a9
--- /dev/null
+++ b/testsuite/tests/gadt/Makefile
@@ -0,0 +1,22 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+.PHONY: gadt17 gadt23
+
+# A mulit-module test that made GHC 6.4.1 crash
+gadt17:
+	@$(RM) gadt17.hi Gadt17_help.hi
+	@$(RM) A$(OBJSUFFIX)
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c Gadt17_help.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c gadt17.hs
+
+gadt23:
+	$(RM) gadt23 gadt23.hi gadt23.o Gadt23_AST.hi Gadt23_AST.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make gadt23.hs
+	# We want to "touch gadt23.hs" really, but we then have issues with
+	# everything happening in the same second so the touch having no
+	# effect. Thus make gadt23.hi/o older instead.
+	touch -t 01010000 gadt23.hi gadt23.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make gadt23.hs
+
diff --git a/testsuite/tests/ghc-regress/gadt/Nilsson.hs b/testsuite/tests/gadt/Nilsson.hs
index bb2fa1ba20..bb2fa1ba20 100644
--- a/testsuite/tests/ghc-regress/gadt/Nilsson.hs
+++ b/testsuite/tests/gadt/Nilsson.hs
diff --git a/testsuite/tests/ghc-regress/gadt/Session.hs b/testsuite/tests/gadt/Session.hs
index 4403b6f869..4403b6f869 100644
--- a/testsuite/tests/ghc-regress/gadt/Session.hs
+++ b/testsuite/tests/gadt/Session.hs
diff --git a/testsuite/tests/ghc-regress/gadt/Session.stdout b/testsuite/tests/gadt/Session.stdout
index e07f8c1c64..e07f8c1c64 100644
--- a/testsuite/tests/ghc-regress/gadt/Session.stdout
+++ b/testsuite/tests/gadt/Session.stdout
diff --git a/testsuite/tests/ghc-regress/gadt/T1999.hs b/testsuite/tests/gadt/T1999.hs
index 70f8531d17..70f8531d17 100644
--- a/testsuite/tests/ghc-regress/gadt/T1999.hs
+++ b/testsuite/tests/gadt/T1999.hs
diff --git a/testsuite/tests/ghc-regress/gadt/T1999a.hs b/testsuite/tests/gadt/T1999a.hs
index d8dbc077b9..d8dbc077b9 100644
--- a/testsuite/tests/ghc-regress/gadt/T1999a.hs
+++ b/testsuite/tests/gadt/T1999a.hs
diff --git a/testsuite/tests/ghc-regress/gadt/T2040.hs b/testsuite/tests/gadt/T2040.hs
index 2ff4777523..2ff4777523 100644
--- a/testsuite/tests/ghc-regress/gadt/T2040.hs
+++ b/testsuite/tests/gadt/T2040.hs
diff --git a/testsuite/tests/ghc-regress/gadt/T2151.hs b/testsuite/tests/gadt/T2151.hs
index 339d231e80..339d231e80 100644
--- a/testsuite/tests/ghc-regress/gadt/T2151.hs
+++ b/testsuite/tests/gadt/T2151.hs
diff --git a/testsuite/tests/ghc-regress/gadt/T2587.hs b/testsuite/tests/gadt/T2587.hs
index bcd0a443ac..bcd0a443ac 100644
--- a/testsuite/tests/ghc-regress/gadt/T2587.hs
+++ b/testsuite/tests/gadt/T2587.hs
diff --git a/testsuite/tests/ghc-regress/gadt/T3013.hs b/testsuite/tests/gadt/T3013.hs
index 3b123a0d80..3b123a0d80 100644
--- a/testsuite/tests/ghc-regress/gadt/T3013.hs
+++ b/testsuite/tests/gadt/T3013.hs
diff --git a/testsuite/tests/ghc-regress/gadt/T3163.hs b/testsuite/tests/gadt/T3163.hs
index 13e5ff7de6..13e5ff7de6 100644
--- a/testsuite/tests/ghc-regress/gadt/T3163.hs
+++ b/testsuite/tests/gadt/T3163.hs
diff --git a/testsuite/tests/ghc-regress/gadt/T3163.stderr b/testsuite/tests/gadt/T3163.stderr
index e60ffcc47c..e60ffcc47c 100644
--- a/testsuite/tests/ghc-regress/gadt/T3163.stderr
+++ b/testsuite/tests/gadt/T3163.stderr
diff --git a/testsuite/tests/ghc-regress/gadt/T3169.hs b/testsuite/tests/gadt/T3169.hs
index b52ec2cf87..b52ec2cf87 100644
--- a/testsuite/tests/ghc-regress/gadt/T3169.hs
+++ b/testsuite/tests/gadt/T3169.hs
diff --git a/testsuite/tests/ghc-regress/gadt/T3169.stderr b/testsuite/tests/gadt/T3169.stderr
index 100077066c..100077066c 100644
--- a/testsuite/tests/ghc-regress/gadt/T3169.stderr
+++ b/testsuite/tests/gadt/T3169.stderr
diff --git a/testsuite/tests/ghc-regress/gadt/T3638.hs b/testsuite/tests/gadt/T3638.hs
index abb6a86169..abb6a86169 100644
--- a/testsuite/tests/ghc-regress/gadt/T3638.hs
+++ b/testsuite/tests/gadt/T3638.hs
diff --git a/testsuite/tests/ghc-regress/gadt/T3651.hs b/testsuite/tests/gadt/T3651.hs
index 9f671905c8..9f671905c8 100644
--- a/testsuite/tests/ghc-regress/gadt/T3651.hs
+++ b/testsuite/tests/gadt/T3651.hs
diff --git a/testsuite/tests/ghc-regress/gadt/T3651.stderr b/testsuite/tests/gadt/T3651.stderr
index d15e27aefa..d15e27aefa 100644
--- a/testsuite/tests/ghc-regress/gadt/T3651.stderr
+++ b/testsuite/tests/gadt/T3651.stderr
diff --git a/testsuite/tests/ghc-regress/gadt/all.T b/testsuite/tests/gadt/all.T
index 83f0836e55..83f0836e55 100644
--- a/testsuite/tests/ghc-regress/gadt/all.T
+++ b/testsuite/tests/gadt/all.T
diff --git a/testsuite/tests/ghc-regress/gadt/arrow.hs b/testsuite/tests/gadt/arrow.hs
index 1abc535a0b..1abc535a0b 100644
--- a/testsuite/tests/ghc-regress/gadt/arrow.hs
+++ b/testsuite/tests/gadt/arrow.hs
diff --git a/testsuite/tests/ghc-regress/gadt/data1.hs b/testsuite/tests/gadt/data1.hs
index 9dac84000e..9dac84000e 100644
--- a/testsuite/tests/ghc-regress/gadt/data1.hs
+++ b/testsuite/tests/gadt/data1.hs
diff --git a/testsuite/tests/ghc-regress/gadt/data2.hs b/testsuite/tests/gadt/data2.hs
index 5b8a009d05..5b8a009d05 100644
--- a/testsuite/tests/ghc-regress/gadt/data2.hs
+++ b/testsuite/tests/gadt/data2.hs
diff --git a/testsuite/tests/ghc-regress/gadt/doaitse.hs b/testsuite/tests/gadt/doaitse.hs
index 51525bb573..51525bb573 100644
--- a/testsuite/tests/ghc-regress/gadt/doaitse.hs
+++ b/testsuite/tests/gadt/doaitse.hs
diff --git a/testsuite/tests/ghc-regress/gadt/equal.hs b/testsuite/tests/gadt/equal.hs
index b6c0bf572e..b6c0bf572e 100644
--- a/testsuite/tests/ghc-regress/gadt/equal.hs
+++ b/testsuite/tests/gadt/equal.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt-dim1.hs b/testsuite/tests/gadt/gadt-dim1.hs
index 641f04d0e6..641f04d0e6 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt-dim1.hs
+++ b/testsuite/tests/gadt/gadt-dim1.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt-dim2.hs b/testsuite/tests/gadt/gadt-dim2.hs
index 239275b42d..239275b42d 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt-dim2.hs
+++ b/testsuite/tests/gadt/gadt-dim2.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt-dim3.hs b/testsuite/tests/gadt/gadt-dim3.hs
index ae43147c92..ae43147c92 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt-dim3.hs
+++ b/testsuite/tests/gadt/gadt-dim3.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt-dim4.hs b/testsuite/tests/gadt/gadt-dim4.hs
index feb16c7de1..feb16c7de1 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt-dim4.hs
+++ b/testsuite/tests/gadt/gadt-dim4.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt-dim5.hs b/testsuite/tests/gadt/gadt-dim5.hs
index 126cc710df..126cc710df 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt-dim5.hs
+++ b/testsuite/tests/gadt/gadt-dim5.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt-dim6.hs b/testsuite/tests/gadt/gadt-dim6.hs
index a8075e225b..a8075e225b 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt-dim6.hs
+++ b/testsuite/tests/gadt/gadt-dim6.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt-dim7.hs b/testsuite/tests/gadt/gadt-dim7.hs
index 0ea3633fa3..0ea3633fa3 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt-dim7.hs
+++ b/testsuite/tests/gadt/gadt-dim7.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt-dim8.hs b/testsuite/tests/gadt/gadt-dim8.hs
index 9735c73fdf..9735c73fdf 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt-dim8.hs
+++ b/testsuite/tests/gadt/gadt-dim8.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt-escape1.hs b/testsuite/tests/gadt/gadt-escape1.hs
index 4ff33b299b..4ff33b299b 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt-escape1.hs
+++ b/testsuite/tests/gadt/gadt-escape1.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt-escape1.stderr b/testsuite/tests/gadt/gadt-escape1.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt-escape1.stderr
+++ b/testsuite/tests/gadt/gadt-escape1.stderr
diff --git a/testsuite/tests/ghc-regress/gadt/gadt-fd.hs b/testsuite/tests/gadt/gadt-fd.hs
index 4db7b62889..4db7b62889 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt-fd.hs
+++ b/testsuite/tests/gadt/gadt-fd.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt1.hs b/testsuite/tests/gadt/gadt1.hs
index 3412d90cf2..3412d90cf2 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt1.hs
+++ b/testsuite/tests/gadt/gadt1.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt10.hs b/testsuite/tests/gadt/gadt10.hs
index 6217405a0b..6217405a0b 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt10.hs
+++ b/testsuite/tests/gadt/gadt10.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt10.stderr b/testsuite/tests/gadt/gadt10.stderr
index 100c84bab7..100c84bab7 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt10.stderr
+++ b/testsuite/tests/gadt/gadt10.stderr
diff --git a/testsuite/tests/ghc-regress/gadt/gadt11.hs b/testsuite/tests/gadt/gadt11.hs
index a5000442fa..a5000442fa 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt11.hs
+++ b/testsuite/tests/gadt/gadt11.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt11.stderr b/testsuite/tests/gadt/gadt11.stderr
index 721b148495..721b148495 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt11.stderr
+++ b/testsuite/tests/gadt/gadt11.stderr
diff --git a/testsuite/tests/ghc-regress/gadt/gadt13.hs b/testsuite/tests/gadt/gadt13.hs
index bd25262ca6..bd25262ca6 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt13.hs
+++ b/testsuite/tests/gadt/gadt13.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt13.stderr b/testsuite/tests/gadt/gadt13.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt13.stderr
+++ b/testsuite/tests/gadt/gadt13.stderr
diff --git a/testsuite/tests/ghc-regress/gadt/gadt14.hs b/testsuite/tests/gadt/gadt14.hs
index c5bdbcb5de..c5bdbcb5de 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt14.hs
+++ b/testsuite/tests/gadt/gadt14.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt15.hs b/testsuite/tests/gadt/gadt15.hs
index c6d3cc9442..c6d3cc9442 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt15.hs
+++ b/testsuite/tests/gadt/gadt15.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt16.hs b/testsuite/tests/gadt/gadt16.hs
index 133c833903..133c833903 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt16.hs
+++ b/testsuite/tests/gadt/gadt16.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt17.hs b/testsuite/tests/gadt/gadt17.hs
index acef8100dc..acef8100dc 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt17.hs
+++ b/testsuite/tests/gadt/gadt17.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt18.hs b/testsuite/tests/gadt/gadt18.hs
index 4ac12efa84..4ac12efa84 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt18.hs
+++ b/testsuite/tests/gadt/gadt18.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt19.hs b/testsuite/tests/gadt/gadt19.hs
index 34b0d291b5..34b0d291b5 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt19.hs
+++ b/testsuite/tests/gadt/gadt19.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt2.hs b/testsuite/tests/gadt/gadt2.hs
index 886b702ce7..886b702ce7 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt2.hs
+++ b/testsuite/tests/gadt/gadt2.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt2.stdout b/testsuite/tests/gadt/gadt2.stdout
index 75df5cd9a1..75df5cd9a1 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt2.stdout
+++ b/testsuite/tests/gadt/gadt2.stdout
diff --git a/testsuite/tests/ghc-regress/gadt/gadt20.hs b/testsuite/tests/gadt/gadt20.hs
index c754831ce5..c754831ce5 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt20.hs
+++ b/testsuite/tests/gadt/gadt20.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt21.hs b/testsuite/tests/gadt/gadt21.hs
index b452d083c1..b452d083c1 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt21.hs
+++ b/testsuite/tests/gadt/gadt21.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt21.stderr b/testsuite/tests/gadt/gadt21.stderr
index 061c563465..061c563465 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt21.stderr
+++ b/testsuite/tests/gadt/gadt21.stderr
diff --git a/testsuite/tests/ghc-regress/gadt/gadt22.hs b/testsuite/tests/gadt/gadt22.hs
index f456198ff1..f456198ff1 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt22.hs
+++ b/testsuite/tests/gadt/gadt22.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt23.hs b/testsuite/tests/gadt/gadt23.hs
index 95e2710292..95e2710292 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt23.hs
+++ b/testsuite/tests/gadt/gadt23.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt24.hs b/testsuite/tests/gadt/gadt24.hs
index 86cece09dd..86cece09dd 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt24.hs
+++ b/testsuite/tests/gadt/gadt24.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt25.hs b/testsuite/tests/gadt/gadt25.hs
index 99aecad3fb..99aecad3fb 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt25.hs
+++ b/testsuite/tests/gadt/gadt25.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt3.hs b/testsuite/tests/gadt/gadt3.hs
index b58301e131..b58301e131 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt3.hs
+++ b/testsuite/tests/gadt/gadt3.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt4.hs b/testsuite/tests/gadt/gadt4.hs
index 0d78135597..0d78135597 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt4.hs
+++ b/testsuite/tests/gadt/gadt4.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt4.stdout b/testsuite/tests/gadt/gadt4.stdout
index 00750edc07..00750edc07 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt4.stdout
+++ b/testsuite/tests/gadt/gadt4.stdout
diff --git a/testsuite/tests/ghc-regress/gadt/gadt5.hs b/testsuite/tests/gadt/gadt5.hs
index 5db3deef8c..5db3deef8c 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt5.hs
+++ b/testsuite/tests/gadt/gadt5.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt5.stdout b/testsuite/tests/gadt/gadt5.stdout
index 764f565258..764f565258 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt5.stdout
+++ b/testsuite/tests/gadt/gadt5.stdout
diff --git a/testsuite/tests/ghc-regress/gadt/gadt6.hs b/testsuite/tests/gadt/gadt6.hs
index 606d04e8a4..606d04e8a4 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt6.hs
+++ b/testsuite/tests/gadt/gadt6.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt7.hs b/testsuite/tests/gadt/gadt7.hs
index 9c775d2f23..9c775d2f23 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt7.hs
+++ b/testsuite/tests/gadt/gadt7.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt7.stderr b/testsuite/tests/gadt/gadt7.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt7.stderr
+++ b/testsuite/tests/gadt/gadt7.stderr
diff --git a/testsuite/tests/ghc-regress/gadt/gadt8.hs b/testsuite/tests/gadt/gadt8.hs
index 1cad8f65cc..1cad8f65cc 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt8.hs
+++ b/testsuite/tests/gadt/gadt8.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadt9.hs b/testsuite/tests/gadt/gadt9.hs
index df9e0bceb2..df9e0bceb2 100644
--- a/testsuite/tests/ghc-regress/gadt/gadt9.hs
+++ b/testsuite/tests/gadt/gadt9.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadtSyntax001.hs b/testsuite/tests/gadt/gadtSyntax001.hs
index fa6b8ce646..fa6b8ce646 100644
--- a/testsuite/tests/ghc-regress/gadt/gadtSyntax001.hs
+++ b/testsuite/tests/gadt/gadtSyntax001.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadtSyntaxFail001.hs b/testsuite/tests/gadt/gadtSyntaxFail001.hs
index 8fd8bfdf5b..8fd8bfdf5b 100644
--- a/testsuite/tests/ghc-regress/gadt/gadtSyntaxFail001.hs
+++ b/testsuite/tests/gadt/gadtSyntaxFail001.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadtSyntaxFail001.stderr b/testsuite/tests/gadt/gadtSyntaxFail001.stderr
index 363ad04d5a..363ad04d5a 100644
--- a/testsuite/tests/ghc-regress/gadt/gadtSyntaxFail001.stderr
+++ b/testsuite/tests/gadt/gadtSyntaxFail001.stderr
diff --git a/testsuite/tests/ghc-regress/gadt/gadtSyntaxFail002.hs b/testsuite/tests/gadt/gadtSyntaxFail002.hs
index cb33d6795e..cb33d6795e 100644
--- a/testsuite/tests/ghc-regress/gadt/gadtSyntaxFail002.hs
+++ b/testsuite/tests/gadt/gadtSyntaxFail002.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadtSyntaxFail002.stderr b/testsuite/tests/gadt/gadtSyntaxFail002.stderr
index c8bdbab224..c8bdbab224 100644
--- a/testsuite/tests/ghc-regress/gadt/gadtSyntaxFail002.stderr
+++ b/testsuite/tests/gadt/gadtSyntaxFail002.stderr
diff --git a/testsuite/tests/ghc-regress/gadt/gadtSyntaxFail003.hs b/testsuite/tests/gadt/gadtSyntaxFail003.hs
index 10c67200fc..10c67200fc 100644
--- a/testsuite/tests/ghc-regress/gadt/gadtSyntaxFail003.hs
+++ b/testsuite/tests/gadt/gadtSyntaxFail003.hs
diff --git a/testsuite/tests/ghc-regress/gadt/gadtSyntaxFail003.stderr b/testsuite/tests/gadt/gadtSyntaxFail003.stderr
index 436bb76ca2..436bb76ca2 100644
--- a/testsuite/tests/ghc-regress/gadt/gadtSyntaxFail003.stderr
+++ b/testsuite/tests/gadt/gadtSyntaxFail003.stderr
diff --git a/testsuite/tests/ghc-regress/gadt/josef.hs b/testsuite/tests/gadt/josef.hs
index 3be7dc28dc..3be7dc28dc 100644
--- a/testsuite/tests/ghc-regress/gadt/josef.hs
+++ b/testsuite/tests/gadt/josef.hs
diff --git a/testsuite/tests/ghc-regress/gadt/karl1.hs b/testsuite/tests/gadt/karl1.hs
index e3af7adb1d..e3af7adb1d 100644
--- a/testsuite/tests/ghc-regress/gadt/karl1.hs
+++ b/testsuite/tests/gadt/karl1.hs
diff --git a/testsuite/tests/ghc-regress/gadt/karl2.hs b/testsuite/tests/gadt/karl2.hs
index a701400689..a701400689 100644
--- a/testsuite/tests/ghc-regress/gadt/karl2.hs
+++ b/testsuite/tests/gadt/karl2.hs
diff --git a/testsuite/tests/ghc-regress/gadt/lazypat.hs b/testsuite/tests/gadt/lazypat.hs
index f16da207aa..f16da207aa 100644
--- a/testsuite/tests/ghc-regress/gadt/lazypat.hs
+++ b/testsuite/tests/gadt/lazypat.hs
diff --git a/testsuite/tests/ghc-regress/gadt/lazypat.stderr b/testsuite/tests/gadt/lazypat.stderr
index d64f40e487..d64f40e487 100644
--- a/testsuite/tests/ghc-regress/gadt/lazypat.stderr
+++ b/testsuite/tests/gadt/lazypat.stderr
diff --git a/testsuite/tests/ghc-regress/gadt/lazypatok.hs b/testsuite/tests/gadt/lazypatok.hs
index bf1282fe39..bf1282fe39 100644
--- a/testsuite/tests/ghc-regress/gadt/lazypatok.hs
+++ b/testsuite/tests/gadt/lazypatok.hs
diff --git a/testsuite/tests/ghc-regress/gadt/lazypatok.stderr b/testsuite/tests/gadt/lazypatok.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/gadt/lazypatok.stderr
+++ b/testsuite/tests/gadt/lazypatok.stderr
diff --git a/testsuite/tests/ghc-regress/gadt/nbe.hs b/testsuite/tests/gadt/nbe.hs
index 0547131df9..0547131df9 100644
--- a/testsuite/tests/ghc-regress/gadt/nbe.hs
+++ b/testsuite/tests/gadt/nbe.hs
diff --git a/testsuite/tests/ghc-regress/gadt/nbe.stdout b/testsuite/tests/gadt/nbe.stdout
index a5f190762c..a5f190762c 100644
--- a/testsuite/tests/ghc-regress/gadt/nbe.stdout
+++ b/testsuite/tests/gadt/nbe.stdout
diff --git a/testsuite/tests/ghc-regress/gadt/records-fail1.hs b/testsuite/tests/gadt/records-fail1.hs
index 8eefee51e7..8eefee51e7 100644
--- a/testsuite/tests/ghc-regress/gadt/records-fail1.hs
+++ b/testsuite/tests/gadt/records-fail1.hs
diff --git a/testsuite/tests/ghc-regress/gadt/records-fail1.stderr b/testsuite/tests/gadt/records-fail1.stderr
index 0ef628b5a6..0ef628b5a6 100644
--- a/testsuite/tests/ghc-regress/gadt/records-fail1.stderr
+++ b/testsuite/tests/gadt/records-fail1.stderr
diff --git a/testsuite/tests/ghc-regress/gadt/records.hs b/testsuite/tests/gadt/records.hs
index e28add3fb6..e28add3fb6 100644
--- a/testsuite/tests/ghc-regress/gadt/records.hs
+++ b/testsuite/tests/gadt/records.hs
diff --git a/testsuite/tests/ghc-regress/gadt/records.stdout b/testsuite/tests/gadt/records.stdout
index f224d49c08..f224d49c08 100644
--- a/testsuite/tests/ghc-regress/gadt/records.stdout
+++ b/testsuite/tests/gadt/records.stdout
diff --git a/testsuite/tests/ghc-regress/gadt/red-black.hs b/testsuite/tests/gadt/red-black.hs
index 29bb324310..29bb324310 100644
--- a/testsuite/tests/ghc-regress/gadt/red-black.hs
+++ b/testsuite/tests/gadt/red-black.hs
diff --git a/testsuite/tests/ghc-regress/gadt/rw.hs b/testsuite/tests/gadt/rw.hs
index 0d0018ac30..0d0018ac30 100644
--- a/testsuite/tests/ghc-regress/gadt/rw.hs
+++ b/testsuite/tests/gadt/rw.hs
diff --git a/testsuite/tests/ghc-regress/gadt/rw.stderr b/testsuite/tests/gadt/rw.stderr
index dbac243ab6..dbac243ab6 100644
--- a/testsuite/tests/ghc-regress/gadt/rw.stderr
+++ b/testsuite/tests/gadt/rw.stderr
diff --git a/testsuite/tests/ghc-regress/gadt/scoped.hs b/testsuite/tests/gadt/scoped.hs
index cafa738697..cafa738697 100644
--- a/testsuite/tests/ghc-regress/gadt/scoped.hs
+++ b/testsuite/tests/gadt/scoped.hs
diff --git a/testsuite/tests/ghc-regress/gadt/set.hs b/testsuite/tests/gadt/set.hs
index 3a78bbb64b..3a78bbb64b 100644
--- a/testsuite/tests/ghc-regress/gadt/set.hs
+++ b/testsuite/tests/gadt/set.hs
diff --git a/testsuite/tests/ghc-regress/gadt/tc.hs b/testsuite/tests/gadt/tc.hs
index 247b9eb615..247b9eb615 100644
--- a/testsuite/tests/ghc-regress/gadt/tc.hs
+++ b/testsuite/tests/gadt/tc.hs
diff --git a/testsuite/tests/ghc-regress/gadt/tc.stdout b/testsuite/tests/gadt/tc.stdout
index 13b3e8786a..13b3e8786a 100644
--- a/testsuite/tests/ghc-regress/gadt/tc.stdout
+++ b/testsuite/tests/gadt/tc.stdout
diff --git a/testsuite/tests/ghc-regress/gadt/tdpe.hs b/testsuite/tests/gadt/tdpe.hs
index 58a4b85094..58a4b85094 100644
--- a/testsuite/tests/ghc-regress/gadt/tdpe.hs
+++ b/testsuite/tests/gadt/tdpe.hs
diff --git a/testsuite/tests/ghc-regress/gadt/termination.hs b/testsuite/tests/gadt/termination.hs
index be2431b812..be2431b812 100644
--- a/testsuite/tests/ghc-regress/gadt/termination.hs
+++ b/testsuite/tests/gadt/termination.hs
diff --git a/testsuite/tests/ghc-regress/gadt/type-rep.hs b/testsuite/tests/gadt/type-rep.hs
index ed41c7a5cc..ed41c7a5cc 100644
--- a/testsuite/tests/ghc-regress/gadt/type-rep.hs
+++ b/testsuite/tests/gadt/type-rep.hs
diff --git a/testsuite/tests/ghc-regress/gadt/type-rep.stdout b/testsuite/tests/gadt/type-rep.stdout
index 7f8f011eb7..7f8f011eb7 100644
--- a/testsuite/tests/ghc-regress/gadt/type-rep.stdout
+++ b/testsuite/tests/gadt/type-rep.stdout
diff --git a/testsuite/tests/ghc-regress/gadt/ubx-records.hs b/testsuite/tests/gadt/ubx-records.hs
index ab21dc65fe..ab21dc65fe 100644
--- a/testsuite/tests/ghc-regress/gadt/ubx-records.hs
+++ b/testsuite/tests/gadt/ubx-records.hs
diff --git a/testsuite/tests/ghc-regress/gadt/ubx-records.stdout b/testsuite/tests/gadt/ubx-records.stdout
index bb9cc4d945..bb9cc4d945 100644
--- a/testsuite/tests/ghc-regress/gadt/ubx-records.stdout
+++ b/testsuite/tests/gadt/ubx-records.stdout
diff --git a/testsuite/tests/ghc-regress/gadt/while.hs b/testsuite/tests/gadt/while.hs
index 2040511c0f..2040511c0f 100644
--- a/testsuite/tests/ghc-regress/gadt/while.hs
+++ b/testsuite/tests/gadt/while.hs
diff --git a/testsuite/tests/ghc-regress/gadt/while.stdout b/testsuite/tests/gadt/while.stdout
index 8237a9beac..8237a9beac 100644
--- a/testsuite/tests/ghc-regress/gadt/while.stdout
+++ b/testsuite/tests/gadt/while.stdout
diff --git a/testsuite/tests/ghc-regress/generics/GEq/GEq.hs b/testsuite/tests/generics/GEq/GEq.hs
index 54caad34e5..54caad34e5 100644
--- a/testsuite/tests/ghc-regress/generics/GEq/GEq.hs
+++ b/testsuite/tests/generics/GEq/GEq.hs
diff --git a/testsuite/tests/ghc-regress/generics/GEq/GEq1.stdout b/testsuite/tests/generics/GEq/GEq1.stdout
index a7f0546170..a7f0546170 100644
--- a/testsuite/tests/ghc-regress/generics/GEq/GEq1.stdout
+++ b/testsuite/tests/generics/GEq/GEq1.stdout
diff --git a/testsuite/tests/ghc-regress/generics/GEq/GEq2.hs b/testsuite/tests/generics/GEq/GEq2.hs
index ac825aa71f..ac825aa71f 100644
--- a/testsuite/tests/ghc-regress/generics/GEq/GEq2.hs
+++ b/testsuite/tests/generics/GEq/GEq2.hs
diff --git a/testsuite/tests/ghc-regress/generics/GEq/GEq2.stdout b/testsuite/tests/generics/GEq/GEq2.stdout
index a7f0546170..a7f0546170 100644
--- a/testsuite/tests/ghc-regress/generics/GEq/GEq2.stdout
+++ b/testsuite/tests/generics/GEq/GEq2.stdout
diff --git a/testsuite/tests/ghc-regress/generics/GEq/Main.hs b/testsuite/tests/generics/GEq/Main.hs
index bc1fbd5e55..bc1fbd5e55 100644
--- a/testsuite/tests/ghc-regress/generics/GEq/Main.hs
+++ b/testsuite/tests/generics/GEq/Main.hs
diff --git a/testsuite/tests/ghc-regress/profiling/Makefile b/testsuite/tests/generics/GEq/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/profiling/Makefile
+++ b/testsuite/tests/generics/GEq/Makefile
diff --git a/testsuite/tests/ghc-regress/generics/GEq/test.T b/testsuite/tests/generics/GEq/test.T
index 363cb48212..363cb48212 100644
--- a/testsuite/tests/ghc-regress/generics/GEq/test.T
+++ b/testsuite/tests/generics/GEq/test.T
diff --git a/testsuite/tests/ghc-regress/generics/GShow/GShow.hs b/testsuite/tests/generics/GShow/GShow.hs
index 3c8f2591ef..3c8f2591ef 100644
--- a/testsuite/tests/ghc-regress/generics/GShow/GShow.hs
+++ b/testsuite/tests/generics/GShow/GShow.hs
diff --git a/testsuite/tests/ghc-regress/generics/GShow/GShow1.stdout b/testsuite/tests/generics/GShow/GShow1.stdout
index 6109e446a5..6109e446a5 100644
--- a/testsuite/tests/ghc-regress/generics/GShow/GShow1.stdout
+++ b/testsuite/tests/generics/GShow/GShow1.stdout
diff --git a/testsuite/tests/ghc-regress/generics/GShow/Main.hs b/testsuite/tests/generics/GShow/Main.hs
index 81768ed647..81768ed647 100644
--- a/testsuite/tests/ghc-regress/generics/GShow/Main.hs
+++ b/testsuite/tests/generics/GShow/Main.hs
diff --git a/testsuite/tests/ghc-regress/programs/Makefile b/testsuite/tests/generics/GShow/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/programs/Makefile
+++ b/testsuite/tests/generics/GShow/Makefile
diff --git a/testsuite/tests/ghc-regress/generics/GShow/test.T b/testsuite/tests/generics/GShow/test.T
index 68770ba884..68770ba884 100644
--- a/testsuite/tests/ghc-regress/generics/GShow/test.T
+++ b/testsuite/tests/generics/GShow/test.T
diff --git a/testsuite/tests/ghc-regress/generics/GenCanDoRep0.hs b/testsuite/tests/generics/GenCanDoRep0.hs
index a86416b052..a86416b052 100644
--- a/testsuite/tests/ghc-regress/generics/GenCanDoRep0.hs
+++ b/testsuite/tests/generics/GenCanDoRep0.hs
diff --git a/testsuite/tests/ghc-regress/generics/GenCannotDoRep0.hs b/testsuite/tests/generics/GenCannotDoRep0.hs
index 5b4f93f94f..5b4f93f94f 100644
--- a/testsuite/tests/ghc-regress/generics/GenCannotDoRep0.hs
+++ b/testsuite/tests/generics/GenCannotDoRep0.hs
diff --git a/testsuite/tests/ghc-regress/generics/GenCannotDoRep0.stderr b/testsuite/tests/generics/GenCannotDoRep0.stderr
index b5d2f01381..b5d2f01381 100644
--- a/testsuite/tests/ghc-regress/generics/GenCannotDoRep0.stderr
+++ b/testsuite/tests/generics/GenCannotDoRep0.stderr
diff --git a/testsuite/tests/ghc-regress/generics/GenCannotDoRep1.hs b/testsuite/tests/generics/GenCannotDoRep1.hs
index 98ad108dbf..98ad108dbf 100644
--- a/testsuite/tests/ghc-regress/generics/GenCannotDoRep1.hs
+++ b/testsuite/tests/generics/GenCannotDoRep1.hs
diff --git a/testsuite/tests/ghc-regress/generics/GenCannotDoRep1.stderr b/testsuite/tests/generics/GenCannotDoRep1.stderr
index 477a2955ce..477a2955ce 100644
--- a/testsuite/tests/ghc-regress/generics/GenCannotDoRep1.stderr
+++ b/testsuite/tests/generics/GenCannotDoRep1.stderr
diff --git a/testsuite/tests/ghc-regress/generics/GenCannotDoRep2.hs b/testsuite/tests/generics/GenCannotDoRep2.hs
index ad816f4ce4..ad816f4ce4 100644
--- a/testsuite/tests/ghc-regress/generics/GenCannotDoRep2.hs
+++ b/testsuite/tests/generics/GenCannotDoRep2.hs
diff --git a/testsuite/tests/ghc-regress/generics/GenCannotDoRep2.stderr b/testsuite/tests/generics/GenCannotDoRep2.stderr
index 35caf2c3b4..35caf2c3b4 100644
--- a/testsuite/tests/ghc-regress/generics/GenCannotDoRep2.stderr
+++ b/testsuite/tests/generics/GenCannotDoRep2.stderr
diff --git a/testsuite/tests/ghc-regress/generics/GenDeprecated.stderr b/testsuite/tests/generics/GenDeprecated.stderr
index d07c35d3a3..d07c35d3a3 100644
--- a/testsuite/tests/ghc-regress/generics/GenDeprecated.stderr
+++ b/testsuite/tests/generics/GenDeprecated.stderr
diff --git a/testsuite/tests/ghc-regress/generics/GenShouldFail0.hs b/testsuite/tests/generics/GenShouldFail0.hs
index cc1ef6ff42..cc1ef6ff42 100644
--- a/testsuite/tests/ghc-regress/generics/GenShouldFail0.hs
+++ b/testsuite/tests/generics/GenShouldFail0.hs
diff --git a/testsuite/tests/ghc-regress/generics/GenShouldFail0.stderr b/testsuite/tests/generics/GenShouldFail0.stderr
index 3685e67784..3685e67784 100644
--- a/testsuite/tests/ghc-regress/generics/GenShouldFail0.stderr
+++ b/testsuite/tests/generics/GenShouldFail0.stderr
diff --git a/testsuite/tests/generics/Makefile b/testsuite/tests/generics/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/generics/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/generics/Uniplate/GUniplate.hs b/testsuite/tests/generics/Uniplate/GUniplate.hs
index 76f387d636..76f387d636 100644
--- a/testsuite/tests/ghc-regress/generics/Uniplate/GUniplate.hs
+++ b/testsuite/tests/generics/Uniplate/GUniplate.hs
diff --git a/testsuite/tests/ghc-regress/generics/Uniplate/GUniplate1.stdout b/testsuite/tests/generics/Uniplate/GUniplate1.stdout
index f560e40162..f560e40162 100644
--- a/testsuite/tests/ghc-regress/generics/Uniplate/GUniplate1.stdout
+++ b/testsuite/tests/generics/Uniplate/GUniplate1.stdout
diff --git a/testsuite/tests/ghc-regress/generics/Uniplate/Main.hs b/testsuite/tests/generics/Uniplate/Main.hs
index 95d84244fa..95d84244fa 100644
--- a/testsuite/tests/ghc-regress/generics/Uniplate/Main.hs
+++ b/testsuite/tests/generics/Uniplate/Main.hs
diff --git a/testsuite/tests/ghc-regress/rebindable/Makefile b/testsuite/tests/generics/Uniplate/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/rebindable/Makefile
+++ b/testsuite/tests/generics/Uniplate/Makefile
diff --git a/testsuite/tests/ghc-regress/generics/Uniplate/test.T b/testsuite/tests/generics/Uniplate/test.T
index a1e610726e..a1e610726e 100644
--- a/testsuite/tests/ghc-regress/generics/Uniplate/test.T
+++ b/testsuite/tests/generics/Uniplate/test.T
diff --git a/testsuite/tests/ghc-regress/generics/all.T b/testsuite/tests/generics/all.T
index 5ef616c811..5ef616c811 100644
--- a/testsuite/tests/ghc-regress/generics/all.T
+++ b/testsuite/tests/generics/all.T
diff --git a/testsuite/tests/ghc-api/Makefile b/testsuite/tests/ghc-api/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/ghc-api/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-api/T4891/Makefile b/testsuite/tests/ghc-api/T4891/Makefile
new file mode 100644
index 0000000000..e19228089f
--- /dev/null
+++ b/testsuite/tests/ghc-api/T4891/Makefile
@@ -0,0 +1,13 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+clean:
+	rm -f *.o *.hi
+
+T4891: clean
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc T4891
+	./T4891 "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`"
+
+.PHONY: clean T4891
+
diff --git a/testsuite/tests/ghc-regress/ghc-api/T4891/T4891.hs b/testsuite/tests/ghc-api/T4891/T4891.hs
index 977f854e19..977f854e19 100644
--- a/testsuite/tests/ghc-regress/ghc-api/T4891/T4891.hs
+++ b/testsuite/tests/ghc-api/T4891/T4891.hs
diff --git a/testsuite/tests/ghc-regress/ghc-api/T4891/T4891.stdout b/testsuite/tests/ghc-api/T4891/T4891.stdout
index 47eb152467..47eb152467 100644
--- a/testsuite/tests/ghc-regress/ghc-api/T4891/T4891.stdout
+++ b/testsuite/tests/ghc-api/T4891/T4891.stdout
diff --git a/testsuite/tests/ghc-regress/ghc-api/T4891/X.hs b/testsuite/tests/ghc-api/T4891/X.hs
index aca63eead5..aca63eead5 100644
--- a/testsuite/tests/ghc-regress/ghc-api/T4891/X.hs
+++ b/testsuite/tests/ghc-api/T4891/X.hs
diff --git a/testsuite/tests/ghc-regress/ghc-api/T4891/all.T b/testsuite/tests/ghc-api/T4891/all.T
index 5217e5371f..5217e5371f 100644
--- a/testsuite/tests/ghc-regress/ghc-api/T4891/all.T
+++ b/testsuite/tests/ghc-api/T4891/all.T
diff --git a/testsuite/tests/ghc-regress/ghc-api/apirecomp001/A.hs b/testsuite/tests/ghc-api/apirecomp001/A.hs
index 0e65d28676..0e65d28676 100644
--- a/testsuite/tests/ghc-regress/ghc-api/apirecomp001/A.hs
+++ b/testsuite/tests/ghc-api/apirecomp001/A.hs
diff --git a/testsuite/tests/ghc-regress/ghc-api/apirecomp001/B.hs b/testsuite/tests/ghc-api/apirecomp001/B.hs
index 81b17a4404..81b17a4404 100644
--- a/testsuite/tests/ghc-regress/ghc-api/apirecomp001/B.hs
+++ b/testsuite/tests/ghc-api/apirecomp001/B.hs
diff --git a/testsuite/tests/ghc-api/apirecomp001/Makefile b/testsuite/tests/ghc-api/apirecomp001/Makefile
new file mode 100644
index 0000000000..e2b88c8e51
--- /dev/null
+++ b/testsuite/tests/ghc-api/apirecomp001/Makefile
@@ -0,0 +1,11 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+clean:
+	rm -f *.o *.hi
+
+apirecomp001: clean
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc myghc.hs
+	./myghc "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`"
+
diff --git a/testsuite/tests/ghc-regress/ghc-api/apirecomp001/all.T b/testsuite/tests/ghc-api/apirecomp001/all.T
index 0aa92874dc..0aa92874dc 100644
--- a/testsuite/tests/ghc-regress/ghc-api/apirecomp001/all.T
+++ b/testsuite/tests/ghc-api/apirecomp001/all.T
diff --git a/testsuite/tests/ghc-regress/ghc-api/apirecomp001/apirecomp001.stderr b/testsuite/tests/ghc-api/apirecomp001/apirecomp001.stderr
index dd8fa9e89e..dd8fa9e89e 100644
--- a/testsuite/tests/ghc-regress/ghc-api/apirecomp001/apirecomp001.stderr
+++ b/testsuite/tests/ghc-api/apirecomp001/apirecomp001.stderr
diff --git a/testsuite/tests/ghc-regress/ghc-api/apirecomp001/apirecomp001.stdout b/testsuite/tests/ghc-api/apirecomp001/apirecomp001.stdout
index d42bf17f3a..d42bf17f3a 100644
--- a/testsuite/tests/ghc-regress/ghc-api/apirecomp001/apirecomp001.stdout
+++ b/testsuite/tests/ghc-api/apirecomp001/apirecomp001.stdout
diff --git a/testsuite/tests/ghc-regress/ghc-api/apirecomp001/myghc.hs b/testsuite/tests/ghc-api/apirecomp001/myghc.hs
index ec2e4a78f7..ec2e4a78f7 100644
--- a/testsuite/tests/ghc-regress/ghc-api/apirecomp001/myghc.hs
+++ b/testsuite/tests/ghc-api/apirecomp001/myghc.hs
diff --git a/testsuite/tests/ghc-regress/ghc-e/should_run/2228.hs b/testsuite/tests/ghc-e/should_run/2228.hs
index 0c53c5ae13..0c53c5ae13 100644
--- a/testsuite/tests/ghc-regress/ghc-e/should_run/2228.hs
+++ b/testsuite/tests/ghc-e/should_run/2228.hs
diff --git a/testsuite/tests/ghc-regress/ghc-e/should_run/2228.stdout b/testsuite/tests/ghc-e/should_run/2228.stdout
index 07576b5a74..07576b5a74 100644
--- a/testsuite/tests/ghc-regress/ghc-e/should_run/2228.stdout
+++ b/testsuite/tests/ghc-e/should_run/2228.stdout
diff --git a/testsuite/tests/ghc-regress/ghc-e/should_run/2636.hs b/testsuite/tests/ghc-e/should_run/2636.hs
index 9c6694955a..9c6694955a 100644
--- a/testsuite/tests/ghc-regress/ghc-e/should_run/2636.hs
+++ b/testsuite/tests/ghc-e/should_run/2636.hs
diff --git a/testsuite/tests/ghc-regress/ghc-e/should_run/2636.stderr b/testsuite/tests/ghc-e/should_run/2636.stderr
index e69b54b36e..e69b54b36e 100644
--- a/testsuite/tests/ghc-regress/ghc-e/should_run/2636.stderr
+++ b/testsuite/tests/ghc-e/should_run/2636.stderr
diff --git a/testsuite/tests/ghc-regress/ghc-e/should_run/3890.hs b/testsuite/tests/ghc-e/should_run/3890.hs
index a72e5c82a0..a72e5c82a0 100644
--- a/testsuite/tests/ghc-regress/ghc-e/should_run/3890.hs
+++ b/testsuite/tests/ghc-e/should_run/3890.hs
diff --git a/testsuite/tests/ghc-regress/ghc-e/should_run/3890.stdout b/testsuite/tests/ghc-e/should_run/3890.stdout
index 7e6c303ad6..7e6c303ad6 100644
--- a/testsuite/tests/ghc-regress/ghc-e/should_run/3890.stdout
+++ b/testsuite/tests/ghc-e/should_run/3890.stdout
diff --git a/testsuite/tests/ghc-e/should_run/Makefile b/testsuite/tests/ghc-e/should_run/Makefile
new file mode 100644
index 0000000000..2a7fd0a7a8
--- /dev/null
+++ b/testsuite/tests/ghc-e/should_run/Makefile
@@ -0,0 +1,29 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+ghc-e001:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e "return ()"
+
+ghc-e002:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" ghc-e002.hs
+
+ghc-e003:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e 'putStrLn "Foo"' -e 'putStrLn "Bar"'
+
+ghc-e004:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":m + System.Exit" -e "exitWith (ExitFailure 6)"; echo $$?
+
+# This is what runghc does:
+ghc-e005:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -main-is foo ghc-e005.hs -e ":set prog ghc-e005-prog" -e ":main [\"the\",\"args\"]"; echo $$?
+
+2228:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" 2228.hs
+
+2636:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" 2636.hs; if [ "$?" != 0 ]; then true; else false; fi
+
+3890:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" 3890.hs | cat
+
diff --git a/testsuite/tests/ghc-regress/ghc-e/should_run/all.T b/testsuite/tests/ghc-e/should_run/all.T
index 6039a4088b..6039a4088b 100644
--- a/testsuite/tests/ghc-regress/ghc-e/should_run/all.T
+++ b/testsuite/tests/ghc-e/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/ghc-e/should_run/ghc-e002.hs b/testsuite/tests/ghc-e/should_run/ghc-e002.hs
index 028b1a0166..028b1a0166 100644
--- a/testsuite/tests/ghc-regress/ghc-e/should_run/ghc-e002.hs
+++ b/testsuite/tests/ghc-e/should_run/ghc-e002.hs
diff --git a/testsuite/tests/ghc-regress/ghc-e/should_run/ghc-e002.stdout b/testsuite/tests/ghc-e/should_run/ghc-e002.stdout
index 23e1ebd03b..23e1ebd03b 100644
--- a/testsuite/tests/ghc-regress/ghc-e/should_run/ghc-e002.stdout
+++ b/testsuite/tests/ghc-e/should_run/ghc-e002.stdout
diff --git a/testsuite/tests/ghc-regress/ghc-e/should_run/ghc-e003.stdout b/testsuite/tests/ghc-e/should_run/ghc-e003.stdout
index 3b71d5be87..3b71d5be87 100644
--- a/testsuite/tests/ghc-regress/ghc-e/should_run/ghc-e003.stdout
+++ b/testsuite/tests/ghc-e/should_run/ghc-e003.stdout
diff --git a/testsuite/tests/ghc-regress/ghc-e/should_run/ghc-e004.stdout b/testsuite/tests/ghc-e/should_run/ghc-e004.stdout
index 1e8b314962..1e8b314962 100644
--- a/testsuite/tests/ghc-regress/ghc-e/should_run/ghc-e004.stdout
+++ b/testsuite/tests/ghc-e/should_run/ghc-e004.stdout
diff --git a/testsuite/tests/ghc-regress/ghc-e/should_run/ghc-e005.hs b/testsuite/tests/ghc-e/should_run/ghc-e005.hs
index 4899706d77..4899706d77 100644
--- a/testsuite/tests/ghc-regress/ghc-e/should_run/ghc-e005.hs
+++ b/testsuite/tests/ghc-e/should_run/ghc-e005.hs
diff --git a/testsuite/tests/ghc-regress/ghc-e/should_run/ghc-e005.stderr b/testsuite/tests/ghc-e/should_run/ghc-e005.stderr
index 34cecca662..34cecca662 100644
--- a/testsuite/tests/ghc-regress/ghc-e/should_run/ghc-e005.stderr
+++ b/testsuite/tests/ghc-e/should_run/ghc-e005.stderr
diff --git a/testsuite/tests/ghc-regress/ghc-e/should_run/ghc-e005.stdout b/testsuite/tests/ghc-e/should_run/ghc-e005.stdout
index 57cc51465d..57cc51465d 100644
--- a/testsuite/tests/ghc-regress/ghc-e/should_run/ghc-e005.stdout
+++ b/testsuite/tests/ghc-e/should_run/ghc-e005.stdout
diff --git a/testsuite/tests/ghc-regress/Makefile b/testsuite/tests/ghc-regress/Makefile
deleted file mode 100644
index 4ec5d82c91..0000000000
--- a/testsuite/tests/ghc-regress/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-TOP=../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-# The libraries that we actually know about. We don't want to test
-# extralibs that are in our tree but which we haven't built.
-LIBRARIES := $(shell '$(GHC_PKG)' list --simple-output --names-only)
-
-ifeq "$(findstring base,$(LIBRARIES))" ""
-$(error base library does not seem to be installed)
-endif
-
-# XXX Do this better?
-# Now find the "tests" directories of those libraries, where they exist
-LIBRARY_TEST_PATHS := $(wildcard $(patsubst %, $(TOP)/../libraries/%/tests, $(LIBRARIES)))
-
-# Add tests from packages
-RUNTEST_OPTS += $(patsubst %, --rootdir=%, $(LIBRARY_TEST_PATHS))
diff --git a/testsuite/tests/ghc-regress/annotations/Makefile b/testsuite/tests/ghc-regress/annotations/Makefile
deleted file mode 100644
index bced01ff9b..0000000000
--- a/testsuite/tests/ghc-regress/annotations/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
\ No newline at end of file
diff --git a/testsuite/tests/ghc-regress/annotations/should_compile/Makefile b/testsuite/tests/ghc-regress/annotations/should_compile/Makefile
deleted file mode 100644
index 9ce1411567..0000000000
--- a/testsuite/tests/ghc-regress/annotations/should_compile/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
\ No newline at end of file
diff --git a/testsuite/tests/ghc-regress/annotations/should_fail/Makefile b/testsuite/tests/ghc-regress/annotations/should_fail/Makefile
deleted file mode 100644
index 9ce1411567..0000000000
--- a/testsuite/tests/ghc-regress/annotations/should_fail/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
\ No newline at end of file
diff --git a/testsuite/tests/ghc-regress/annotations/should_run/Makefile b/testsuite/tests/ghc-regress/annotations/should_run/Makefile
deleted file mode 100644
index b1639ecd2a..0000000000
--- a/testsuite/tests/ghc-regress/annotations/should_run/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-CONFIG_HS=Config.hs
-
-config : 
-	rm -f $(CONFIG_HS)
-	@echo "Creating $(CONFIG_HS) ... "
-	echo "module Config where" >>$(CONFIG_HS)
-	echo "cTop          :: String" >> $(CONFIG_HS)
-	echo 'cTop          = "$(subst \,\\,$(shell '$(TEST_HC)' --print-libdir))"' >> $(CONFIG_HS)
diff --git a/testsuite/tests/ghc-regress/arrows/should_fail/Makefile b/testsuite/tests/ghc-regress/arrows/should_fail/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/arrows/should_fail/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/arrows/should_run/Makefile b/testsuite/tests/ghc-regress/arrows/should_run/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/arrows/should_run/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/cabal/Makefile b/testsuite/tests/ghc-regress/cabal/Makefile
deleted file mode 100644
index a820fb3714..0000000000
--- a/testsuite/tests/ghc-regress/cabal/Makefile
+++ /dev/null
@@ -1,184 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-PKGCONF01=local01.package.conf
-LOCAL_GHC_PKG01 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF01)
-
-STRIP_PKGROOT=sed 's/^pkgroot: .*$$/pkgroot: /'
-
-# a bunch of tests for ghc-pkg
-ghcpkg01 :
-	@rm -rf $(PKGCONF01)
-	$(LOCAL_GHC_PKG01) init $(PKGCONF01)
-	$(LOCAL_GHC_PKG01) list
-	$(LOCAL_GHC_PKG01) register --force test.pkg 2>/dev/null
-	$(LOCAL_GHC_PKG01) describe testpkg         | $(STRIP_PKGROOT)
-	$(LOCAL_GHC_PKG01) describe testpkg-1.2.3.4 | $(STRIP_PKGROOT)
-	$(LOCAL_GHC_PKG01) field testpkg-1.2.3.4 import-dirs
-
-	@: # test2.pkg is a later version of testpkg-1.2.3.4
-	$(LOCAL_GHC_PKG01) register --force test2.pkg 2>/dev/null
-	$(LOCAL_GHC_PKG01) list
-	$(LOCAL_GHC_PKG01) describe testpkg-2.0 | $(STRIP_PKGROOT)
-	$(LOCAL_GHC_PKG01) describe testpkg-*   | $(STRIP_PKGROOT)
-	$(LOCAL_GHC_PKG01) field testpkg-* version
-
-	@: # test hiding/exposing
-	$(LOCAL_GHC_PKG01) hide testpkg-1.2.3.4
-	$(LOCAL_GHC_PKG01) field testpkg-1.2.3.4 exposed | grep False
-	$(LOCAL_GHC_PKG01) expose testpkg-2.0
-	$(LOCAL_GHC_PKG01) field testpkg-2.0 exposed | grep True
-	$(LOCAL_GHC_PKG01) hide testpkg-*
-	$(LOCAL_GHC_PKG01) field testpkg-* exposed
-
-	@: # test3.pkg  depends on testpkg-2.0
-	$(LOCAL_GHC_PKG01) register test3.pkg
-
-	@: # unregistering testpkg-2.0 should fail now, testpkg-3.0 depends on it
-	if $(LOCAL_GHC_PKG01) unregister testpkg-2.0; then false; else true; fi
-
-	$(LOCAL_GHC_PKG01) unregister testpkg-3.0
-
-	$(LOCAL_GHC_PKG01) unregister testpkg-2.0
-	$(LOCAL_GHC_PKG01) describe testpkg | $(STRIP_PKGROOT)
-	$(LOCAL_GHC_PKG01) unregister testpkg-*
-	$(LOCAL_GHC_PKG01) list
-
-	@: # registering test3.pkg should fail now, its dependency has gone
-	if $(LOCAL_GHC_PKG01) register test3.pkg; then false; else true; fi
-
-PKGCONF03=local03.package.conf
-LOCAL_GHC_PKG03 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF03)
-
-ghcpkg03 :
-	@rm -rf $(PKGCONF03)
-	$(LOCAL_GHC_PKG03) init $(PKGCONF03)
-	@: # update should hide conflicting packages
-	$(LOCAL_GHC_PKG03) register --force test.pkg
-	$(LOCAL_GHC_PKG03) register --force test2.pkg
-
-	@: # test4.pkg depends on testpkg-2.0, which conflicts with testpkg-1.2.3.4,
-	@: # ghc-pkg will happily register it now (it didn't in GHC 6.4)
-	$(LOCAL_GHC_PKG03) register test4.pkg
-	$(LOCAL_GHC_PKG03) update test4.pkg
-
-	@: # and another update of test.pkg will now hide dep-2.0
-	$(LOCAL_GHC_PKG03) update --force test.pkg
-
-PKGCONF04=local04.package.conf
-LOCAL_GHC_PKG04 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF04)
-
-# Test that importing a module exposed by two packages reports a conflict
-ghcpkg04 :
-	rm -rf $(PKGCONF04)
-	$(LOCAL_GHC_PKG04) init $(PKGCONF04)
-	$(LOCAL_GHC_PKG04) register --force test.pkg >/dev/null 2>&1 
-	$(LOCAL_GHC_PKG04) update --force test5.pkg >/dev/null 2>&1 
-	$(LOCAL_GHC_PKG04) expose testpkg-1.2.3.4  >/dev/null 2>&1
-	@: # testpkg-1.2.3.4 and newtestpkg-2.0 are both exposed now
-	'$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(PKGCONF04) -c ghcpkg04.hs || true
-
-# Test stacking of package.confs (also #2441)
-PKGCONF05a=local05a.package.conf
-PKGCONF05b=local05b.package.conf
-LOCAL_GHC_PKG05a = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF05a)
-LOCAL_GHC_PKG05b = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF05a) -f $(PKGCONF05b)
-
-ghcpkg05 :
-	rm -rf $(PKGCONF05a) $(PKGCONF05b)
-	$(LOCAL_GHC_PKG05a) init $(PKGCONF05a)
-	$(LOCAL_GHC_PKG05b) init $(PKGCONF05b)
-	$(LOCAL_GHC_PKG05a) register --force test2.pkg >/dev/null 2>&1 
-	$(LOCAL_GHC_PKG05b) register --force test3.pkg >/dev/null 2>&1 
-	$(LOCAL_GHC_PKG05b) check || true
-	$(LOCAL_GHC_PKG05b) list
-	$(LOCAL_GHC_PKG05b) expose testpkg-2.0
-	$(LOCAL_GHC_PKG05b) hide   testpkg-2.0
-	if $(LOCAL_GHC_PKG05b) unregister testpkg-2.0; then false; else true; fi
-	$(LOCAL_GHC_PKG05b) unregister testpkg-3.0
-	$(LOCAL_GHC_PKG05b) unregister testpkg-2.0
-
-# Test for #2330: reject duplicate dependencies
-PKGCONF06=local06.package.conf
-LOCAL_GHC_PKG06 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF06)
-
-ghcpkg06 :
-	rm -rf $(PKGCONF06)
-	$(LOCAL_GHC_PKG06) init $(PKGCONF06)
-	$(LOCAL_GHC_PKG06) register --force test.pkg >/dev/null 2>&1 
-	if $(LOCAL_GHC_PKG06) register testdup.pkg; then false else true; fi
-	$(LOCAL_GHC_PKG06) register --force testdup.pkg
-
-PKGCONF1750=local1750.package.conf
-LOCAL_GHC_PKG1750 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONF1750)
-
-1750:
-	rm -rf $(PKGCONF1750) 1750.hs 1750.o 1750.hi 1750.out
-	$(LOCAL_GHC_PKG1750) init $(PKGCONF1750)
-	$(LOCAL_GHC_PKG1750) register --force 1750A.pkg >1750.out 2>&1
-	$(LOCAL_GHC_PKG1750) register --force 1750B.pkg >1750.out 2>&1
-	GHC_PACKAGE_PATH=$(PKGCONF1750) '$(GHC_PKG)' --no-user-package-conf list
-# GHC_PACKAGE_PATH trick is to make this work with 6.8.2 which doesn't have
-# the patch "Change the command-line semantics for query commands" to
-# ghc-pkg
-	echo "main = return ()" >1750.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(PKGCONF1750) -package 1750A 1750.hs || true
-
-PKGCONFSHADOW1=localshadow1.package.conf
-PKGCONFSHADOW2=localshadow2.package.conf
-LOCAL_GHC_PKGSHADOW1 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONFSHADOW1)
-LOCAL_GHC_PKGSHADOW2 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONFSHADOW2)
-LOCAL_GHC_PKGSHADOW3 = '$(GHC_PKG)' --no-user-package-conf -f $(PKGCONFSHADOW1) -f $(PKGCONFSHADOW2)
-
-# Test package shadowing behaviour.
-#
-#     localshadow1.package.conf:  shadowdep-1-XXX <- shadow-1-XXX
-#     localshadow2.package.conf:                     shadow-1-YYY
-# 
-# shadow-1-XXX will be shadowed by shadow-1-YYY, thus invalidating
-# shadowdep-1-XXX.
-shadow:
-	rm -rf $(PKGCONFSHADOW1) $(PKGCONFSHADOW2) shadow.hs shadow.o shadow.hi shadow.out shadow.hs shadow.hi
-	$(LOCAL_GHC_PKGSHADOW1) init $(PKGCONFSHADOW1)
-	$(LOCAL_GHC_PKGSHADOW2) init $(PKGCONFSHADOW2)
-	$(LOCAL_GHC_PKGSHADOW1) register --force shadow1.pkg >shadow1.out 2>&1
-	$(LOCAL_GHC_PKGSHADOW1) register --force shadow2.pkg >shadow2.out 2>&1
-	$(LOCAL_GHC_PKGSHADOW2) register --force shadow3.pkg >shadow3.out 2>&1
-	$(LOCAL_GHC_PKGSHADOW3) list
-	echo "main = return ()" >shadow.hs
-# 
-# In this test, shadow-1-XXX is shadowed by shadow-1-YYY, which causes
-# shadowdep-1-XXX to be unavailable:
-#
-	@echo "should FAIL:"
-	'$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(PKGCONFSHADOW1) -package-conf $(PKGCONFSHADOW2) -package shadowdep -c shadow.hs -fno-code || true
-# 
-# Reversing the order of the package.conf files should fix the problem:
-#
-	@echo "should SUCCEED:"
-	'$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(PKGCONFSHADOW2) -package-conf $(PKGCONFSHADOW1) -package shadowdep -c shadow.hs -fno-code || true
-#
-# We can also fix the problem by using an explicit -package-id flag to
-# specify a package we really want to use:
-#
-	@echo "should SUCCEED:"
-	'$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(PKGCONFSHADOW1) -package-conf $(PKGCONFSHADOW2) -package-id shadowdep-1-XXX -c shadow.hs -fno-code
-
-
-# -----------------------------------------------------------------------------
-# Try piping the output of "ghc-pkg describe" into "ghc-pkg update" for
-# every package we know about.  This is for testing the pretty printing/parsing
-# of InstalledPackageInfo.
-
-PACKAGE_CONF_ghcpkg02 = package.conf.ghcpkg02
-GHC_PKG_ghcpkg02 = '$(GHC_PKG)' --no-user-package-conf --global-conf=$(PACKAGE_CONF_ghcpkg02)
-
-ghcpkg02:
-	rm -rf $(PACKAGE_CONF_ghcpkg02)
-	$(GHC_PKG_ghcpkg02) init $(PACKAGE_CONF_ghcpkg02)
-	set -e; \
-	for i in `$(GHC_PKG) list --global --simple-output -v0`; do \
-		echo Updating $$i; \
-		$(GHC_PKG) describe --global $$i | $(GHC_PKG_ghcpkg02) update --global --force -; \
-	done
diff --git a/testsuite/tests/ghc-regress/cabal/cabal01/Makefile b/testsuite/tests/ghc-regress/cabal/cabal01/Makefile
deleted file mode 100644
index 84c2f6195f..0000000000
--- a/testsuite/tests/ghc-regress/cabal/cabal01/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-clean:
-	rm -rf setup a.out dist/build/testA
-	rm -rf ,tmp dist ,tmp2
-	find . -name "*.o" |xargs rm -f
-	find . -name "*.hi" |xargs rm -f
-	rm -fr install-tmp
-	rm -fr install
-	rm -f .setup-config .installed-pkg-config
-	rm -rf local.db
-
-# We use the global package database as there's no easy way to tell
-# ghc-pkg (via Cabal) to use one in ., and the global one at least
-# won't affect the installed GHC and is more likely to work
-
-PREFIX := $(abspath install)
-$(eval $(call canonicalise,PREFIX))
-
-cabal01:
-	$(MAKE) clean
-	'$(TEST_HC)' --make -o setup Setup.lhs -v0
-
-	'$(GHC_PKG)' init local.db
-	./setup configure -v0 --prefix=$(PREFIX) --with-compiler='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --with-hc-pkg='$(GHC_PKG)' --package-db=local.db $(PROF)
-	./setup build -v0
-	./setup copy -v0
-	echo install1:
-	ls -1 install
-	rm -r install
-#	install w/ register!
-	./setup install -v0
-	echo install2:
-	ls -1 install
-	./setup sdist -v0
-	echo dist:
-	ls -1 dist
-	if [ "$(CLEANUP)" != "" ]; then $(MAKE) clean; fi
-
diff --git a/testsuite/tests/ghc-regress/cabal/cabal02/Makefile b/testsuite/tests/ghc-regress/cabal/cabal02/Makefile
deleted file mode 100644
index 578e6fa7ed..0000000000
--- a/testsuite/tests/ghc-regress/cabal/cabal02/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-CABAL_SETUP = $(FPTOOLS_TOP_ABS)/libraries/Cabal/cabal-setup/cabal-setup
-
-CONFIG_ARGS = --with-compiler=$(TEST_HC) --ghc-options='$(TEST_HC_OPTS)' --with-hc-pkg=$(GHC_PKG)
-
-# We have 3 packages, P-1.0, P-2.0, and Q.  Q depends on P-1.0.
-# We have an executable R, that depends on P-2.0 and Q, so the resulting
-# executable will link to both P-1.0 and P-2.0.
-
-cabal02 : 
-	(cd P1 && $(CABAL_SETUP) configure $(CONFIG_ARGS))
-	(cd P1 && $(CABAL_SETUP) build)
-	(cd P1 && $(CABAL_SETUP) register --inplace --user)
-	(cd P2 && $(CABAL_SETUP) configure $(CONFIG_ARGS))
-	(cd P2 && $(CABAL_SETUP) build)
-	(cd P2 && $(CABAL_SETUP) register --inplace --user)
-	(cd Q  && $(CABAL_SETUP) configure $(CONFIG_ARGS))
-	(cd Q  && $(CABAL_SETUP) build)
-	(cd Q  && $(CABAL_SETUP) register --inplace --user)
-	(cd R  && $(CABAL_SETUP) configure $(CONFIG_ARGS))
-	(cd R  && $(CABAL_SETUP) build)
-	$(MAKE) clean
-
-clean ::
-	(cd P1 && $(CABAL_SETUP) unregister --user)
-	(cd P2 && $(CABAL_SETUP) unregister --user)
-	(cd Q  && $(CABAL_SETUP) unregister --user)
-	(cd P1 && $(CABAL_SETUP) clean)
-	(cd P2 && $(CABAL_SETUP) clean)
-	(cd Q  && $(CABAL_SETUP) clean)
diff --git a/testsuite/tests/ghc-regress/cabal/cabal03/Makefile b/testsuite/tests/ghc-regress/cabal/cabal03/Makefile
deleted file mode 100644
index 641d27c7be..0000000000
--- a/testsuite/tests/ghc-regress/cabal/cabal03/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-# SETUP=../Setup
-SETUP=../Setup -v0
-
-# This test is for overlapping/shadowing packages with Cabal.  We
-#   1. install p-1.0 to the global DB
-#   2. install q-1.0 (depending on p-1.0) to a temporary DB
-#   3. install a differnet p-1.0 to the temp DB
-#   4. attempt to configure and buidl r, which depends on p-1.0 and q-1.0
-#
-# step 4 will elicit a warning from Cabal's configure step that the
-# packages are inconsistent, and will cause an error from GHC.
-# Currently the error message from GHC is swallowed by Cabal.
-
-cabal03: clean
-	$(MAKE) clean
-	'$(GHC_PKG)' init tmp.d
-	'$(TEST_HC)' -v0 --make Setup
-	cd p && $(SETUP) clean
-	cd p && $(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --disable-optimisation --ghc-pkg-option=--force
-	cd p && $(SETUP) build
-	cd p && $(SETUP) register
-	cd q && $(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --ghc-pkg-option=--force
-	cd q && $(SETUP) build
-	cd q && $(SETUP) register
-	cd p && $(SETUP) clean
-	cd p && $(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --ghc-pkg-option=--force
-	cd p && $(SETUP) build
-	cd p && $(SETUP) register
-	cd r && ! ../Setup configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --package-db=../tmp.d --ghc-pkg-option=--force
-ifneq "$(CLEANUP)" ""
-	$(MAKE) clean
-endif
-
-clean :
-	'$(GHC_PKG)' unregister --force p >/dev/null 2>&1 || true
-	'$(GHC_PKG)' unregister --force q >/dev/null 2>&1 || true
-	$(RM) -r tmp.d *.o *.hi */*.o */*.hi */Setup$(exeext) */dist Setup$(exeext)
diff --git a/testsuite/tests/ghc-regress/cabal/cabal04/Makefile b/testsuite/tests/ghc-regress/cabal/cabal04/Makefile
deleted file mode 100644
index 3c6a73cb1b..0000000000
--- a/testsuite/tests/ghc-regress/cabal/cabal04/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-SETUP=./Setup -v0
-
-# This tests that we can build a Cabal package that uses TH with both
-# profiling and dynamic linking. (#3604)
-
-cabal04:
-	$(MAKE) clean
-	'$(TEST_HC)' -v0 --make Setup
-	$(SETUP) clean
-	$(SETUP) configure --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' $(PROF) $(DYN)
-	$(SETUP) build 2> err
-	! grep -v "Creating library file" err
-ifneq "$(CLEANUP)" ""
-	$(MAKE) clean
-endif
-
-clean :
-	$(RM) -r *.o *.hi dist Setup$(exeext) err
-
diff --git a/testsuite/tests/ghc-regress/cabal/pkg02/Makefile b/testsuite/tests/ghc-regress/cabal/pkg02/Makefile
deleted file mode 100644
index 50191fd8b9..0000000000
--- a/testsuite/tests/ghc-regress/cabal/pkg02/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
diff --git a/testsuite/tests/ghc-regress/codeGen/should_compile/Makefile b/testsuite/tests/ghc-regress/codeGen/should_compile/Makefile
deleted file mode 100644
index 416e9ed6f5..0000000000
--- a/testsuite/tests/ghc-regress/codeGen/should_compile/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-2578:
-	'$(TEST_HC)' $(TEST_HC_OPTS) --make 2578 -fforce-recomp -v0
-
diff --git a/testsuite/tests/ghc-regress/codeGen/should_run/Makefile b/testsuite/tests/ghc-regress/codeGen/should_run/Makefile
deleted file mode 100644
index 50191fd8b9..0000000000
--- a/testsuite/tests/ghc-regress/codeGen/should_run/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
diff --git a/testsuite/tests/ghc-regress/concurrent/2317/Makefile b/testsuite/tests/ghc-regress/concurrent/2317/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/concurrent/2317/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/concurrent/prog001/Makefile b/testsuite/tests/ghc-regress/concurrent/prog001/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/concurrent/prog001/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/concurrent/prog002/Makefile b/testsuite/tests/ghc-regress/concurrent/prog002/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/concurrent/prog002/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/concurrent/prog003/Makefile b/testsuite/tests/ghc-regress/concurrent/prog003/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/concurrent/prog003/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/concurrent/should_run/Makefile b/testsuite/tests/ghc-regress/concurrent/should_run/Makefile
deleted file mode 100644
index 58a16cb0c6..0000000000
--- a/testsuite/tests/ghc-regress/concurrent/should_run/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-conc059_setup :
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c conc059.hs
diff --git a/testsuite/tests/ghc-regress/cpranal/should_compile/Makefile b/testsuite/tests/ghc-regress/cpranal/should_compile/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/cpranal/should_compile/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/deSugar/should_compile/Makefile b/testsuite/tests/ghc-regress/deSugar/should_compile/Makefile
deleted file mode 100644
index a03c54f2d1..0000000000
--- a/testsuite/tests/ghc-regress/deSugar/should_compile/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-TOP=../../../..

-include $(TOP)/mk/boilerplate.mk

-include $(TOP)/mk/test.mk

-

-T5252:

-	$(RM) -f T5252*.hi T5252*.o

-	'$(TEST_HC)' $(TEST_HC_OPTS) -c T5252a.hs 

-	'$(TEST_HC)' $(TEST_HC_OPTS) -c T5252.hs

diff --git a/testsuite/tests/ghc-regress/deSugar/should_run/Makefile b/testsuite/tests/ghc-regress/deSugar/should_run/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/deSugar/should_run/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/deriving/should_compile/Makefile b/testsuite/tests/ghc-regress/deriving/should_compile/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_compile/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/deriving/should_fail/Makefile b/testsuite/tests/ghc-regress/deriving/should_fail/Makefile
deleted file mode 100644
index e527b6115d..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_fail/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-drvfail016:
-	$(RM) -f drvfail016.hi-boot drvfail016.o-boot
-	'$(TEST_HC)' $(TEST_HC_OPTS) -XGeneralizedNewtypeDeriving -c drvfail016.hs-boot; echo $$?
-
diff --git a/testsuite/tests/ghc-regress/deriving/should_run/Makefile b/testsuite/tests/ghc-regress/deriving/should_run/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/deriving/should_run/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/dph/diophantine/Makefile b/testsuite/tests/ghc-regress/dph/diophantine/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/dph/diophantine/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/dph/dotp/Makefile b/testsuite/tests/ghc-regress/dph/dotp/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/dph/dotp/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/dph/primespj/Makefile b/testsuite/tests/ghc-regress/dph/primespj/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/dph/primespj/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/dph/quickhull/Makefile b/testsuite/tests/ghc-regress/dph/quickhull/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/dph/quickhull/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/dph/smvm/Makefile b/testsuite/tests/ghc-regress/dph/smvm/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/dph/smvm/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/dph/sumnats/Makefile b/testsuite/tests/ghc-regress/dph/sumnats/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/dph/sumnats/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/dph/words/Makefile b/testsuite/tests/ghc-regress/dph/words/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/dph/words/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/driver/1372/Makefile b/testsuite/tests/ghc-regress/driver/1372/Makefile
deleted file mode 100644
index 549c991b4a..0000000000
--- a/testsuite/tests/ghc-regress/driver/1372/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-LOCAL_PKGCONF=local.package.conf
-
-clean:
-	rm -f p1/setup p1/Setup.o p1/Setup.hi
-	rm -f p2/setup p2/Setup.o p2/Setup.hi
-	rm -rf p1/dist p2/dist
-	rm -f *.o *.hi
-	rm -f clean.out prep.out
-	rm -f p1/A.hs
-	rm -f $(LOCAL_PKGCONF)
-
-1372:
-	$(MAKE) clean
-	$(MAKE) prep
-# This should recompile Main.hs, because A in package p1 has changed
-# and recompiling Main.hs will now fail.
-	-cd p2 && ./setup build -v0
-	$(MAKE) clean
-
-prep:
-	echo "[]" >$(LOCAL_PKGCONF)
-	cp p1/A1.hs p1/A.hs
-	$(MAKE) prep.p1
-	$(MAKE) prep.p2
-	cp p1/A2.hs p1/A.hs
-	cd p1 && ./setup build -v0
-
-prep.%:
-	cd $* && "$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -o setup Setup.hs
-	cd $* && ./setup configure -v0 --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=../$(LOCAL_PKGCONF)
-	cd $* && ./setup build -v0
-	cd $* && ./setup register -v0 --inplace
-
diff --git a/testsuite/tests/ghc-regress/driver/1959/Makefile b/testsuite/tests/ghc-regress/driver/1959/Makefile
deleted file mode 100644
index 766a606b2b..0000000000
--- a/testsuite/tests/ghc-regress/driver/1959/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-# Test recompilation bug #1959, which failed in 6.8.1 (and earlier)
-
-compile ::
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O E.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O D.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O -funfolding-use-threshold=0 C.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O B.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) E.o D.o C.o B.o -o prog
-
-clean ::
-	rm -f *.o *.hi E.hs
-
-dotest ::
-	$(MAKE) clean
-	cp E1.hs E.hs
-	$(MAKE) compile
-	./prog
-	sleep 1
-	cp E2.hs E.hs
-	$(MAKE) compile
-	./prog
diff --git a/testsuite/tests/ghc-regress/driver/Makefile b/testsuite/tests/ghc-regress/driver/Makefile
deleted file mode 100644
index cb64ea675a..0000000000
--- a/testsuite/tests/ghc-regress/driver/Makefile
+++ /dev/null
@@ -1,487 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-# A set of driver tests
-
-# Things to test:
-#
-#  - one-shot vs. --make
-#  - hierarchical vs. flat
-#  - -odir vs. no -odir
-#  - -hidir vs. no -hidir
-#  - root module vs. found modules
-
-OBJSUFFIX = .o
-
-# -----------------------------------------------------------------------------
-# One-shot compilations, non-hierarchical modules
-
-test011:
-	$(RM) A011.hi
-	$(RM) A011$(OBJSUFFIX)
-	"$(TEST_HC)" $(TEST_HC_OPTS) $(TEST_HC_OPTS) -c A011.hs
-	test -f A011.hi
-	test -f A011$(OBJSUFFIX)
-
-# test -o
-test012:
-	$(RM) A012.hi
-	$(RM) A012$(OBJSUFFIX)oo
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c A012.hs -o A012$(OBJSUFFIX)oo
-	test -f A012$(OBJSUFFIX)oo
-
-# test -ohi
-test013:
-	$(RM) A013.xhi
-	$(RM) A013$(OBJSUFFIX)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c A013.hs -ohi A013.xhi
-	test -f A013.xhi
-
-# test -odir
-test014:
-	$(RM) -f A014.hi
-	$(RM) -rf obj014
-	mkdir obj014
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c A014.hs -odir obj014
-	test -f obj014/A014$(OBJSUFFIX)
-	test -f A014.hi
-
-# test -hidir
-test015:
-	$(RM) -f A015$(OBJSUFFIX)
-	$(RM) -rf hi015
-	mkdir hi015
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c A015.hs -hidir hi015
-	test -f A015$(OBJSUFFIX)
-	test -f hi015/A015.hi
-
-# test stub generation
-test016:
-	$(RM) F016.hi F016$(OBJSUFFIX) F016_stub.h
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c F016.hs
-	test -f F016_stub.h
-
-# test -stubdir (filename differs from module name)
-test017:
-	$(RM) F017.hi F017$(OBJSUFFIX)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c F017.hs -stubdir stub017
-	test -f stub017/TestStub017_stub.h
-
-# test -odir with stubs (filename differs from module name)
-test018:
-	$(RM) -f F018.hi F018$(OBJSUFFIX) F018_stub.h
-	$(RM) -rf obj018
-	mkdir obj018
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c F018.hs -odir obj018
-
-# test for bug #3093
-test018a:
-	$(RM) -f F018a.hi F018a_stub.h *.obj.018
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c F018a.hs -osuf obj.018
-	test -f F018a.obj.018
-
-# test -outputdir
-test019:
-	$(RM) -rf out019
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c F019.hs -outputdir out019
-	test -f out019/TestStub019.hi
-	test -f out019/TestStub019_stub.h
-
-# -----------------------------------------------------------------------------
-# One-shot compilation, hierarchical modules
-
-test021:
-	$(RM) B021/C.hi
-	$(RM) B021/C$(OBJSUFFIX)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c B021/C.hs
-	test -f B021/C.hi
-	test -f B021/C$(OBJSUFFIX)
-
-# test -o
-test022:
-	$(RM) B022/C.hi
-	$(RM) B022/C$(OBJSUFFIX)oo
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c B022/C.hs -o B022/C$(OBJSUFFIX)oo
-	test -f B022/C$(OBJSUFFIX)oo
-
-# test -ohi
-test023:
-	$(RM) B023/C.xhi
-	$(RM) B023/C$(OBJSUFFIX)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c B023/C.hs -ohi B023/C.xhi
-	test -f B023/C.xhi
-
-# test -odir
-test024:
-	$(RM) -f B024/C.hi
-	$(RM) -rf obj024
-	mkdir obj024
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c B024/C.hs -odir obj024
-	test -f obj024/B024/C$(OBJSUFFIX)
-
-# test -odir with non-Haskell compilation
-test024a:
-	$(RM) -rf B024a
-	$(RM) -rf obj024a
-	mkdir B024a
-	mkdir obj024a
-	echo >B024a/stub.c
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c B024a/stub.c -odir obj024a
-	test -f obj024a/B024a/stub$(OBJSUFFIX)
-
-# test -hidir
-test025:
-	$(RM) -rf hi025
-	mkdir hi025
-	$(RM) B025/C$(OBJSUFFIX)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c B025/C.hs -hidir hi025
-	test -f hi025/B025/C.hi
-
-# This is a hierarchical module that lives in a subdirectory.
-test026:
-	$(RM) d026/P/Q.hi
-	$(RM) d026/P/Q$(OBJSUFFIX)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c d026/P/Q.hs
-	test -f d026/P/Q.hi
-	test -f d026/P/Q$(OBJSUFFIX)
-
-# test stub generation
-# -fvia-C, because we want to check that the .hc file can #include the stub.h
-test027:
-	$(RM) B027/F.hi B027/F$(OBJSUFFIX) B027/F_stub.h
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c B027/F.hs -fno-warn-deprecated-flags -fvia-C
-	test -f B027/F_stub.h
-
-# test -stubdir
-# -fvia-C, because we want to check that the .hc file can #include the stub.h
-test028:
-	$(RM) B028/F.hi B028/F$(OBJSUFFIX)
-	$(RM) stub028/B028/F_stub.h
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c B028/F.hs -stubdir stub028 -fno-warn-deprecated-flags -fvia-C
-	test -f stub028/B028/F_stub.h
-
-# -----------------------------------------------------------------------------
-# Compilation-manager compilations, flat modules
-
-test031:
-	$(RM) A031.hi
-	$(RM) A031$(OBJSUFFIX)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make A031.hs
-	test -f A031.hi
-	test -f A031$(OBJSUFFIX)
-
-# test -odir
-test032:
-	$(RM) A032.hi
-	$(RM) -rf obj032
-	mkdir obj032
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make A032.hs -odir obj032
-	test -f obj032/A032$(OBJSUFFIX)
-
-# test -hidir
-test033:
-	$(RM) -rf hi033
-	$(RM) A033$(OBJSUFFIX)
-	mkdir hi033
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make A033.hs -hidir hi033
-	test -f hi033/A033.hi
-
-# test stub generation
-test034:
-	$(RM) F034.hi F034$(OBJSUFFIX) F034_stub.h
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make F034.hs
-	test -f F034_stub.h
-
-# test -stubdir (filename differs from module name)
-test035:
-	$(RM) F035.hi F$(OBJSUFFIX) stub035/Stubs_stub.h
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make F035.hs -stubdir stub035
-	test -f stub035/TestStub035_stub.h
-
-# -----------------------------------------------------------------------------
-# Compilation-manager compilations, hierarchical modules
-
-test041:
-	$(RM) B041/C.hi
-	$(RM) B041/C$(OBJSUFFIX)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make B041/C.hs
-	test -f B041/C.hi
-	test -f B041/C$(OBJSUFFIX)
-
-# test -odir
-test042:
-	$(RM) -rf obj042
-	mkdir obj042
-	$(RM) B042/C.hi
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make B042/C.hs -odir obj042
-	test -f obj042/B042/C$(OBJSUFFIX)
-
-# test -hidir
-test043:
-	$(RM) -f B043/C$(OBJSUFFIX)
-	$(RM) -rf hi043
-	mkdir hi043
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make B043/C.hs -hidir hi043
-	test -f hi043/B043/C.hi
-
-# test stub generation
-test044:
-	$(RM) B044/F.hi B044/F$(OBJSUFFIX) B044/F_stub.h
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make B044/F.hs
-	test -f B044/F_stub.h
-
-# test -stubdir
-test045:
-	$(RM) B045/F.hi B045/F$(OBJSUFFIX)
-	$(RM) stub045/B045/F_stub.h
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make B045/F.hs -stubdir stub045
-	test -f stub045/B045/F_stub.h
-
-# -----------------------------------------------------------------------------
-# Compilation-manager compilations, hierarchical modules, non-root modules
-
-test051:
-	$(RM) d051_2/R/S.hi
-	$(RM) d051_2/R/S$(OBJSUFFIX)
-	$(RM) d051_1/P/Q.hi
-	$(RM) d051_1/P/Q$(OBJSUFFIX)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -id051_1 -id051_2 R.S
-	test -f d051_2/R/S.hi
-	test -f d051_2/R/S$(OBJSUFFIX)
-	test -f d051_1/P/Q.hi
-	test -f d051_1/P/Q$(OBJSUFFIX)
-
-# test -odir
-test052:
-	$(RM) d052_2/R/S.hi
-	$(RM) d052_1/P/Q.hi
-	$(RM) -rf obj052
-	mkdir obj052
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -id052_1 -id052_2 -odir obj052 R.S
-	test -f d052_2/R/S.hi
-	test -f obj052/R/S$(OBJSUFFIX)
-	test -f d052_1/P/Q.hi
-	test -f obj052/P/Q$(OBJSUFFIX)
-
-# test -hidir
-test053:
-	$(RM) hi053/R/S.hi
-	$(RM) d053_2/R/S$(OBJSUFFIX)
-	$(RM) hi053/P/Q.hi
-	$(RM) d053_1/P/Q$(OBJSUFFIX)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -id053_1 -id053_2 -hidir hi053 R.S
-	test -f hi053/R/S.hi
-	test -f d053_2/R/S$(OBJSUFFIX)
-	test -f hi053/P/Q.hi
-	test -f d053_1/P/Q$(OBJSUFFIX)
-
-# -----------------------------------------------------------------------------
-# Other tests
-
-# Test that -keep-s-files works with --make and -fvia-C
-test061a:
-	$(RM) A061a.hi A061a$(OBJSUFFIX) A061a.s
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -keep-s-files -fno-warn-deprecated-flags -fvia-C A061a.hs
-	test -f A061a.s
-
-# Test that -keep-s-files works without --make
-test061b:
-	$(RM) A061b.hi A061b$(OBJSUFFIX) A061b.s
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c -keep-s-files -fno-warn-deprecated-flags -fvia-C A061b.hs
-	test -f A061b.s
-
-# Test that -main-is works with --make
-test062a:
-	$(RM) Hello062a.hs Hello062a.hi Hello062a$(OBJSUFFIX) Hello062a.hc hello062a
-	echo "module Hello062a where { hello062a = putStrLn \"ok\" }" >Hello062a.hs
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -main-is Hello062a.hello062a Hello062a -o hello062a
-	./hello062a
-test062b:
-	$(RM) Hello062b.hs Hello062b.hi Hello062b$(OBJSUFFIX) Hello062b.hc hello062b
-	echo "module Hello062b where { main = putStrLn \"ok\" }" >Hello062b.hs
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -main-is Hello062b Hello062b -o hello062b
-	./hello062b
-test062c:
-	$(RM) Hello062c.hs Hello062c.hi Hello062c$(OBJSUFFIX) Hello062c.hc hello062c
-	echo "module Main (hello062c) where { hello062c = putStrLn \"ok\" }" >Hello062c.hs
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -main-is hello062c Hello062c.hs -o hello062c
-	./hello062c
-test062d:
-	$(RM) -rf B062d
-	$(RM) hello062d
-	mkdir B062d
-	echo "module B062d.Hello062d (hello062d) where { hello062d = putStrLn \"ok\" }" >B062d/Hello062d.hs
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -main-is B062d.Hello062d.hello062d B062d/Hello062d.hs -o hello062d
-	./hello062d
-test062e:
-	$(RM) -rf B062e
-	$(RM) Hello062e.hc hello062e
-	mkdir B062e
-	echo "module B062e.Hello062e (main) where { main = putStrLn \"ok\" }" >B062e/Hello062e.hs
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -main-is B062e.Hello062e B062e/Hello062e.hs -o hello062e
-	./hello062e
-
-# Test that -i deletes the list of search paths.
-# The compilation will fail, but we ignore the failure and just
-# compare the output, because make might give us a different exit code.
-test063:
-	$(RM) A063.hi A063$(OBJSUFFIX) A063.hc D063.hi D063$(OBJSUFFIX) D063.hc
-	-"$(TEST_HC)" $(TEST_HC_OPTS) --make -i -v0 D063.hs
-
-# Test -E
-test064:
-	$(RM) A064.hi A064.hspp
-	"$(TEST_HC)" $(TEST_HC_OPTS) -E A064.hs
-	test -f A064.hspp
-
-# Test -E/-cpp
-test065:
-	$(RM) A065.hi A065.hspp
-	"$(TEST_HC)" $(TEST_HC_OPTS) -E -cpp A065.hs
-	test -f A065.hspp
-
-# Test -E/-o
-test066:
-	$(RM) A066.hi A066.tmp
-	"$(TEST_HC)" $(TEST_HC_OPTS) -E A066.hs -o A066.tmp
-	test -f A066.tmp
-
-# Test -E/-cpp/-o
-test067:
-	$(RM) A067.hi A067.tmp
-	"$(TEST_HC)" $(TEST_HC_OPTS) -cpp -E A067.hs -o A067.tmp
-	test -f A067.tmp
-
-# Test -S
-test070:
-	$(RM) A070.hi A070.s
-	"$(TEST_HC)" $(TEST_HC_OPTS) -S A070.hs
-	test -f A070.s
-
-# Test -S/-o
-test071:
-	$(RM) A071.hi A071.tmp
-	"$(TEST_HC)" $(TEST_HC_OPTS) -S A071.hs -o A071.tmp
-	test -f A071.tmp
-
-
-# Tests for #2248, -o and .exe
-
-define test081
-$(RM) $(1).hs $(1).hi $(1)$(OBJSUFFIX) $(1).hc $(1)$(exeext)
-echo "module Main where { main = putStrLn \"ok\" }" >$(1).hs
-"$(TEST_HC)" $(TEST_HC_OPTS) --make -v0 $(1).hs
-test -f $(1)$(exeext)
-endef
-
-test081a:
-	$(call test081, Test_081a)
-test081b:
-	$(call test081, Test.081b)
-
-# -----------------------------------------------------------------------------
-# --make tests
-
-# Test for overlap between home module and package module
-test100:
-	$(RM) overlap/List.hi overlap/List.o
-	$(RM) overlap/Overlap.hi overlap/Overlap.o
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make -ioverlap Overlap
-
-# -----------------------------------------------------------------------------
-# dependency-generation tests
-
-DEPFILE200 = depend200
-
-# Test that we can create a dependency file, and that we can
-# modify an existing dependency file.
-test200:
-	$(RM) $(DEPFILE200)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -M -dep-makefile $(DEPFILE200) D200
-	test -f $(DEPFILE200)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -M -dep-makefile $(DEPFILE200) D200 B200.C A200
-	test -f $(DEPFILE200)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -M -dep-makefile $(DEPFILE200) D200.hs B200/C.hs A200.hs
-	test -f $(DEPFILE200)
-
-# -----------------------------------------------------------------------------
-
-2566::
-	if "$(TEST_HC)" $(TEST_HC_OPTS) -c foo2566.bar; then false else true; fi
-
-.PHONY: mode001
-# We use
-#     sed '2,$$d'
-# rather than
-#     head -1
-# as the latter gives
-#     ghc: <stdout>: hFlush: resource vanished (Broken pipe)
-# on OS X
-mode001:
-	"$(TEST_HC)" $(TEST_HC_OPTS) --make --help        | sed '2,$$d'
-	"$(TEST_HC)" $(TEST_HC_OPTS) --help --make        | sed '2,$$d'
-	"$(TEST_HC)" $(TEST_HC_OPTS) --interactive --help | sed '2,$$d'
-	"$(TEST_HC)" $(TEST_HC_OPTS) --help --interactive | sed '2,$$d'
-	"$(TEST_HC)" $(TEST_HC_OPTS) --version --help     | sed "s/, version.*//"
-	"$(TEST_HC)" $(TEST_HC_OPTS) --help --version        | sed '2,$$d'
-	"$(TEST_HC)" $(TEST_HC_OPTS) --interactive --version | sed "s/, version.*//"
-	"$(TEST_HC)" $(TEST_HC_OPTS) --version --interactive | sed "s/, version.*//"
-
-# Test for building DLLs with ghc -shared, see #2745
-shared001:
-	$(RM) Shared001.hi Shared001.o HSdll.dll.a HSdll.dll Shared001_stub.*
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 -shared Shared001.hs
-
-# -----------------------------------------------------------------------------
-
-3674:
-	$(RM) 3674*.o 3674*.hi 3674_pre
-	"$(TEST_HC)" $(TEST_HC_OPTS) --make 3674_pre.hs
-	"$(TEST_HC)" $(TEST_HC_OPTS) --make 3674.hs
-
-.PHONY: rtsopts001
-rtsopts001:
-	$(RM) rtsOpts$(exeext) rtsOpts.hi rtsOpts.o
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make rtsOpts -rtsopts
-	echo "Normal"
-	-./rtsOpts +RTS -C0 2>&1
-	$(RM) rtsOpts$(exeext) rtsOpts.hi rtsOpts.o
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make rtsOpts
-	echo "No RTS opts"
-	-./rtsOpts +RTS -C0 2>&1
-
-.PHONY: rtsopts002
-rtsopts002:
-	$(RM) rtsopts002$(exeext) rtsopts002.hi rtsopts002.o
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make rtsopts002 -rtsopts=some
-	./rtsopts002
-	./rtsopts002 +RTS --info >/dev/null
-	if ./rtsopts002 +RTS -C0; then exit 1; else exit 0; fi
-	GHCRTS= ./rtsopts002
-	GHCRTS=--info ./rtsopts002 >/dev/null
-	if GHCRTS=-C0 ./rtsopts002; then exit 1; else exit 0; fi
-
-.PHONY: withRtsOpts
-withRtsOpts:
-	$(RM) withRtsOpts$(exeext) withRtsOpts.hi withRtsOpts.o withRtsOpts.out
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make withRtsOpts -with-rtsopts=--info
-	./withRtsOpts | head -1
-	# Also test for non-safe RTS opts, these should be allowed too,
-	# since the author has explicitly requested them. (#5114)
-	$(RM) withRtsOpts$(exeext) withRtsOpts.hi withRtsOpts.o withRtsOpts.out
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 --make withRtsOpts -with-rtsopts=-twithRtsOpts.out
-	./withRtsOpts | head -1
-	test -f withRtsOpts.out
-
-.PHONY: T3364
-T3364:
-	-"$(TEST_HC)" $(TEST_HC_OPTS) -H
-
-.PHONY: T706
-T706:
-	cp T706a.hs T706.hs
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c T706.hs
-	cp T706b.hs T706.hs
-	"$(TEST_HC)" $(TEST_HC_OPTS) -c T706.hs
-	echo "test" | "$(TEST_HC)" $(TEST_HC_OPTS) --interactive -ignore-dot-ghci -v0 T706
diff --git a/testsuite/tests/ghc-regress/driver/T3007/Makefile b/testsuite/tests/ghc-regress/driver/T3007/Makefile
deleted file mode 100644
index 516e6f30b9..0000000000
--- a/testsuite/tests/ghc-regress/driver/T3007/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-clean:
-	rm -f A/Setup A/Setup.o A/Setup.hi
-	rm -f B/Setup B/Setup.o B/Setup.hi
-	rm -rf A/dist B/dist
-	rm -f package.conf
-
-T3007:
-	$(MAKE) clean
-	echo '[]' > package.conf
-	cd A && '$(TEST_HC)' -v0 --make Setup
-	cd A && ./Setup configure -v0 --with-compiler='$(TEST_HC)' --ghc-pkg-option=--global-conf=../package.conf --ghc-option=-package-conf../package.conf
-	cd A && ./Setup build -v0
-	cd A && ./Setup register --inplace -v0
-	cd B && '$(TEST_HC)' -v0 --make Setup
-	cd B && ./Setup configure -v0 --with-compiler='$(TEST_HC)' --ghc-pkg-option=--global-conf=../package.conf --ghc-option=-package-conf../package.conf
-	cd B && ./Setup build -v0
-
diff --git a/testsuite/tests/ghc-regress/driver/bug1677/Makefile b/testsuite/tests/ghc-regress/driver/bug1677/Makefile
deleted file mode 100644
index 482562fa43..0000000000
--- a/testsuite/tests/ghc-regress/driver/bug1677/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-bug1677 :
-	'$(TEST_HC)' $(TEST_HC_OPTS) -M Foo.hs Bar.hs || true
-
diff --git a/testsuite/tests/ghc-regress/driver/conflicting_flags/Makefile b/testsuite/tests/ghc-regress/driver/conflicting_flags/Makefile
deleted file mode 100644
index ec2a7c768e..0000000000
--- a/testsuite/tests/ghc-regress/driver/conflicting_flags/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-conflicting_flags:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -V --print-libdir 2>&1 | sed "s/, version.*//"
-
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_001/Makefile b/testsuite/tests/ghc-regress/driver/dynamic_flags_001/Makefile
deleted file mode 100644
index 414f2b45b8..0000000000
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_001/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-# Dynamic flags tests
-
-clean:
-	rm -f *.o *.hi
-
-# 001: Flags turned on in one module's OPTIONS_GHC pragma shouldn't
-#      be on in when compiling other modules
-
-dynamic_flags_001: clean
-	'$(TEST_HC)' $(TEST_HC_OPTS) --make -Werror -v0 C.hs
diff --git a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/Makefile b/testsuite/tests/ghc-regress/driver/dynamic_flags_002/Makefile
deleted file mode 100644
index 50191fd8b9..0000000000
--- a/testsuite/tests/ghc-regress/driver/dynamic_flags_002/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
diff --git a/testsuite/tests/ghc-regress/driver/objc/Makefile b/testsuite/tests/ghc-regress/driver/objc/Makefile
deleted file mode 100644
index 50191fd8b9..0000000000
--- a/testsuite/tests/ghc-regress/driver/objc/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
diff --git a/testsuite/tests/ghc-regress/driver/recomp001/Makefile b/testsuite/tests/ghc-regress/driver/recomp001/Makefile
deleted file mode 100644
index f089f71ab7..0000000000
--- a/testsuite/tests/ghc-regress/driver/recomp001/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-# Recompilation tests
-
-clean:
-	rm -f *.o *.hi
-	rm -f B.hs C
-
-# 001: removing an export should force a recompile of dependent modules.
-# failed in GHC 6.4.
-
-recomp001: clean
-	cp B1.hs B.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 C.hs
-	sleep 1
-	cp B2.hs B.hs
-	-'$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 C.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp002/Makefile b/testsuite/tests/ghc-regress/driver/recomp002/Makefile
deleted file mode 100644
index d2375961d2..0000000000
--- a/testsuite/tests/ghc-regress/driver/recomp002/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-# Recompilation tests
-
-clean:
-	rm -f *.o*
-	rm -f *.hi*
-
-# Only the first invocation should print any "Compiling" messages
-
-recomp002: clean
-	'$(TEST_HC)' $(TEST_HC_OPTS) --make Q.hs
-	echo Middle >&2
-	'$(TEST_HC)' $(TEST_HC_OPTS) --make Q.hs
diff --git a/testsuite/tests/ghc-regress/driver/recomp003/Makefile b/testsuite/tests/ghc-regress/driver/recomp003/Makefile
deleted file mode 100644
index 45ae0cbbdf..0000000000
--- a/testsuite/tests/ghc-regress/driver/recomp003/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-OBJSUFFIX = .o
-
-# Test that adding a new module that shadows a package module causes
-# recompilation.  Part of bug #1372.
-recomp003:
-	$(RM) A.hi A$(OBJSUFFIX) out
-	$(RM) -rf Data
-	mkdir Data
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c A.hs
-	echo "module Data.Char where" > Data/Char.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c Data/Char.hs
-	# Should now recompile A.hs, because Char is now a home module:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c A.hs 2>err
-	@if grep NOT err; then false; fi
diff --git a/testsuite/tests/ghc-regress/driver/recomp004/Makefile b/testsuite/tests/ghc-regress/driver/recomp004/Makefile
deleted file mode 100644
index 120556827c..0000000000
--- a/testsuite/tests/ghc-regress/driver/recomp004/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-EXECUTABLE = Main$(exeext)
-CLEAN_FILES = c.c c.o Main.o Main.hi $(EXECUTABLE)
-
-clean:
-	$(RM) $(CLEAN_FILES)
-
-# Test that updates to C modules are noticed
-recomp004:
-	$(RM) $(CLEAN_FILES)
-	$(CP) c1.c c.c
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c c.c -o c.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Main.hs c.o -o $(EXECUTABLE)
-	./$(EXECUTABLE)
-	$(CP) c2.c c.c
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c c.c -o c.o
-	# Hack to make sure c.o is really newer
-	touch -t 01010000 Main.hs Main.hi Main.o c.c $(EXECUTABLE)
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Main.hs c.o -o $(EXECUTABLE)
-	./$(EXECUTABLE)
-
diff --git a/testsuite/tests/ghc-regress/driver/recomp005/Makefile b/testsuite/tests/ghc-regress/driver/recomp005/Makefile
deleted file mode 100644
index a588cff176..0000000000
--- a/testsuite/tests/ghc-regress/driver/recomp005/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-clean:
-	rm -f *.o*
-	rm -f *.hi*
-	rm -f C.hs
-
-recomp005: clean
-	cp C1.hs C.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) --make E.hs -O
-	sleep 1
-	cp C2.hs C.hs
-	# Should recompile E, because C is now an orphan
-	'$(TEST_HC)' $(TEST_HC_OPTS) --make E.hs -O
diff --git a/testsuite/tests/ghc-regress/driver/recomp006/Makefile b/testsuite/tests/ghc-regress/driver/recomp006/Makefile
deleted file mode 100644
index c71f5ec405..0000000000
--- a/testsuite/tests/ghc-regress/driver/recomp006/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-OBJSUFFIX = .o
-
-# Test that changing the fixity of a type synonym operator forces recompilation
-# (see #3166).
-recomp006:
-	$(RM) A.hi A$(OBJSUFFIX)
-	cp B1.hs B.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) --make A.hs 1>out 2>err
-	sleep 1
-	cp B2.hs B.hs
-	# This should fail
-	if '$(TEST_HC)' $(TEST_HC_OPTS) --make A.hs; then false; fi
diff --git a/testsuite/tests/ghc-regress/driver/recomp007/Makefile b/testsuite/tests/ghc-regress/driver/recomp007/Makefile
deleted file mode 100644
index 074be35b37..0000000000
--- a/testsuite/tests/ghc-regress/driver/recomp007/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-LOCAL_PKGCONF=local.package.conf
-
-clean:
-	rm -f Setup$(exeext)
-	rm -rf a1/dist a2/dist b/dist
-	rm -f *.o *.hi
-	rm -f clean.out prep.out
-	rm -rf $(LOCAL_PKGCONF)
-
-recomp007:
-	$(MAKE) clean
-	"$(GHC_PKG)" init $(LOCAL_PKGCONF)
-	"$(TEST_HC)" -v0 --make Setup.hs
-	$(MAKE) prep.a1
-	$(MAKE) prep.b
-	"$(GHC_PKG)" unregister --package-conf=$(LOCAL_PKGCONF) a-1.0
-	$(MAKE) prep.a2
-	cd b && ../Setup configure -v0 --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=../$(LOCAL_PKGCONF)
-	cd b && ../Setup build
-
-prep.%:
-	cd $* && ../Setup configure -v0 --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=../$(LOCAL_PKGCONF)
-	cd $* && ../Setup build -v0
-	cd $* && ../Setup register -v0 --inplace
diff --git a/testsuite/tests/ghc-regress/driver/recomp008/Makefile b/testsuite/tests/ghc-regress/driver/recomp008/Makefile
deleted file mode 100644
index 16392f5dd0..0000000000
--- a/testsuite/tests/ghc-regress/driver/recomp008/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-Main.o : B.hi
-B.o : A.hi
-
-%.o : %.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c $< -o $@
-
-# magic .hi rule: see rules/hi-rule.mk in the GHC source tree
-%.hi : %.o ;
-
-prog : A.o B.o Main.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -o prog A.o B.o Main.o
-
-clean :
-	$(RM) *.hi *.o prog
-
-recomp008 : 
-	$(MAKE) clean
-	cp A1.hs A.hs
-	$(MAKE) prog
-	./prog
-	sleep 1
-	cp A2.hs A.hs
-	$(MAKE) prog
-	./prog
diff --git a/testsuite/tests/ghc-regress/driver/recomp009/Makefile b/testsuite/tests/ghc-regress/driver/recomp009/Makefile
deleted file mode 100644
index 7ebcae66af..0000000000
--- a/testsuite/tests/ghc-regress/driver/recomp009/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-# Recompilation tests
-
-clean:
-	rm -f *.o *.hi
-	rm -f B.hs C
-
-# bug #481
-
-recomp009: clean
-	cp Sub1.hs Sub.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Main.hs
-	./Main
-	sleep 1
-	cp Sub2.hs Sub.hs
-	-'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make Main.hs
-	./Main
diff --git a/testsuite/tests/ghc-regress/dynlibs/Makefile b/testsuite/tests/ghc-regress/dynlibs/Makefile
deleted file mode 100644
index 439b0e626d..0000000000
--- a/testsuite/tests/ghc-regress/dynlibs/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-.PHONY: T3807
-T3807:
-	$(RM) T3807Export_stub.c T3807Export_stub.h T3807Export_stub.o
-	$(RM) T3807Export.o T3807Export.hi
-	$(RM) T3807-export.o T3807-load.o
-	$(RM) T3807test.so
-	$(RM) T3807-load
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -dynamic -fPIC -shared T3807Export.hs T3807-export.c -o T3807test.so -lHSrts-ghc`'$(TEST_HC)' $(TEST_HC_OPTS) --numeric-version`
-	'$(TEST_HC)' $(TEST_HC_OPTS) T3807-load.c -o T3807-load -ldl
-	./T3807-load
-
-.PHONY: T4464
-T4464:
-	$(RM) T4464B.o T4464C.o T4464H.hi T4464H.o
-	$(RM) T4464H_stub.c T4464H_stub.h T4464H_stub.o
-	$(RM) HS4464.dll HS4464.dll.a t4464.exe
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -shared T4464H.hs T4464B.c -o HS4464.dll
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 T4464C.c HS4464.dll.a -o t4464.exe
-	-./t4464.exe
-	echo "====="
-	echo "=====" >&2
-	$(RM) T4464B.o T4464C.o T4464H.hi T4464H.o
-	$(RM) T4464H_stub.c T4464H_stub.h T4464H_stub.o
-	$(RM) HS4464.dll HS4464.dll.a t4464.exe
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -shared T4464H.hs T4464B.c -o HS4464.dll -rtsopts
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 T4464C.c HS4464.dll.a -o t4464.exe
-	./t4464.exe
-
diff --git a/testsuite/tests/ghc-regress/ffi/should_compile/Makefile b/testsuite/tests/ghc-regress/ffi/should_compile/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/ffi/should_compile/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ffi/should_fail/Makefile b/testsuite/tests/ghc-regress/ffi/should_fail/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/ffi/should_fail/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ffi/should_run/Makefile b/testsuite/tests/ghc-regress/ffi/should_run/Makefile
deleted file mode 100644
index 238e751be6..0000000000
--- a/testsuite/tests/ghc-regress/ffi/should_run/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-ffi018_ghci_setup :
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c ffi018_ghci_c.c
-
-1288_ghci_setup :
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c 1288_ghci_c.c
-
-2276_ghci_setup :
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c 2276_ghci_c.c
-
-ffi002_setup :
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c ffi002.hs
diff --git a/testsuite/tests/ghc-regress/gadt/Makefile b/testsuite/tests/ghc-regress/gadt/Makefile
deleted file mode 100644
index c2dff37de1..0000000000
--- a/testsuite/tests/ghc-regress/gadt/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-.PHONY: gadt17 gadt23
-
-# A mulit-module test that made GHC 6.4.1 crash
-gadt17:
-	@$(RM) gadt17.hi Gadt17_help.hi
-	@$(RM) A$(OBJSUFFIX)
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c Gadt17_help.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c gadt17.hs
-
-gadt23:
-	$(RM) gadt23 gadt23.hi gadt23.o Gadt23_AST.hi Gadt23_AST.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make gadt23.hs
-	# We want to "touch gadt23.hs" really, but we then have issues with
-	# everything happening in the same second so the touch having no
-	# effect. Thus make gadt23.hi/o older instead.
-	touch -t 01010000 gadt23.hi gadt23.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make gadt23.hs
-
diff --git a/testsuite/tests/ghc-regress/generics/GEq/Makefile b/testsuite/tests/ghc-regress/generics/GEq/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/generics/GEq/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/generics/GShow/Makefile b/testsuite/tests/ghc-regress/generics/GShow/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/generics/GShow/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/generics/Uniplate/Makefile b/testsuite/tests/ghc-regress/generics/Uniplate/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/generics/Uniplate/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghc-api/T4891/Makefile b/testsuite/tests/ghc-regress/ghc-api/T4891/Makefile
deleted file mode 100644
index 179109b49e..0000000000
--- a/testsuite/tests/ghc-regress/ghc-api/T4891/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-clean:
-	rm -f *.o *.hi
-
-T4891: clean
-	'$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc T4891
-	./T4891 "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`"
-
-.PHONY: clean T4891
-
diff --git a/testsuite/tests/ghc-regress/ghc-api/apirecomp001/Makefile b/testsuite/tests/ghc-regress/ghc-api/apirecomp001/Makefile
deleted file mode 100644
index c6a2dc70d8..0000000000
--- a/testsuite/tests/ghc-regress/ghc-api/apirecomp001/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-clean:
-	rm -f *.o *.hi
-
-apirecomp001: clean
-	'$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc myghc.hs
-	./myghc "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`"
-
diff --git a/testsuite/tests/ghc-regress/ghc-e/should_run/Makefile b/testsuite/tests/ghc-regress/ghc-e/should_run/Makefile
deleted file mode 100644
index 844363959b..0000000000
--- a/testsuite/tests/ghc-regress/ghc-e/should_run/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-ghc-e001:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e "return ()"
-
-ghc-e002:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" ghc-e002.hs
-
-ghc-e003:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e 'putStrLn "Foo"' -e 'putStrLn "Bar"'
-
-ghc-e004:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":m + System.Exit" -e "exitWith (ExitFailure 6)"; echo $$?
-
-# This is what runghc does:
-ghc-e005:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -main-is foo ghc-e005.hs -e ":set prog ghc-e005-prog" -e ":main [\"the\",\"args\"]"; echo $$?
-
-2228:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" 2228.hs
-
-2636:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" 2636.hs; if [ "$?" != 0 ]; then true; else false; fi
-
-3890:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" 3890.hs | cat
-
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/Makefile b/testsuite/tests/ghc-regress/ghci.debugger/scripts/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/Makefile b/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/Makefile
deleted file mode 100644
index 35fe99a9cf..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/Makefile b/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/Makefile
deleted file mode 100644
index 35fe99a9cf..0000000000
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci/prog001/Makefile b/testsuite/tests/ghc-regress/ghci/prog001/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/ghci/prog001/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci/prog002/Makefile b/testsuite/tests/ghc-regress/ghci/prog002/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/ghci/prog002/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci/prog003/Makefile b/testsuite/tests/ghc-regress/ghci/prog003/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/ghci/prog003/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci/prog004/Makefile b/testsuite/tests/ghc-regress/ghci/prog004/Makefile
deleted file mode 100644
index 9ee437437a..0000000000
--- a/testsuite/tests/ghc-regress/ghci/prog004/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-# Test that we can load a C object compiled with -g into GHCi.
-# (sourceforge bug #1073501).
-ghciprog004:
-	rm -f ctest.o
-	echo "int foo(){}" >ctest.c
-	'$(TEST_HC)' $(TEST_HC_OPTS) -optc-g -c ctest.c
-	echo ":q" | '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --interactive -ignore-dot-ghci ctest.o
diff --git a/testsuite/tests/ghc-regress/ghci/prog005/Makefile b/testsuite/tests/ghc-regress/ghci/prog005/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/ghci/prog005/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci/prog006/Makefile b/testsuite/tests/ghc-regress/ghci/prog006/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/ghci/prog006/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci/prog009/Makefile b/testsuite/tests/ghc-regress/ghci/prog009/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/ghci/prog009/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci/prog011/Makefile b/testsuite/tests/ghc-regress/ghci/prog011/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/ghci/prog011/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/Makefile b/testsuite/tests/ghc-regress/ghci/scripts/Makefile
deleted file mode 100644
index 4d012898e0..0000000000
--- a/testsuite/tests/ghc-regress/ghci/scripts/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-ghci024:
-	@echo "~~~~~~~~~~ Testing :set"
-	printf ":set\n" \
-	    | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \
-	    | grep -E "^([^ ]|  -fno-print-explicit-foralls|  -fno-warn-implicit-prelude)"
-	@echo "~~~~~~~~~~ Testing :show languages"
-	printf ":show languages\n" \
-	    | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \
-	    | grep -E "^([^ ]|  -XImplicitPrelude|  -XMagicHash)"
-	@echo "~~~~~~~~~~ Testing :show languages, with -XMagicHash"
-	printf ":set -XMagicHash\n:show languages\n" \
-	    | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \
-	    | grep -E "^([^ ]|  -XImplicitPrelude|  -XMagicHash)"
-	@echo "~~~~~~~~~~ Testing :show packages"
-	printf ":show packages\n" \
-	    | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \
-	    | grep -E "^([^ ]|  -package|base|ghc-prim|integer|rts|Cabal)" \
-	    | sed "s/Cabal-[0-9.]*/Cabal-VERSION/"
-	@echo "~~~~~~~~~~ Testing :show packages, including the ghc package"
-	printf ":set -package ghc\n:show packages\n" \
-	    | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \
-	    | grep -E "^([^ ]|  -package|base|ghc-prim|integer|rts|Cabal)" \
-	    | sed "s/Cabal-[0-9.]*/Cabal-VERSION/"
-
-.PHONY: ghci037
-ghci037:
-	'$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci                   < ghci037.script
-	'$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci -fno-ghci-sandbox < ghci037.script
-
diff --git a/testsuite/tests/ghc-regress/ghci/should_run/Makefile b/testsuite/tests/ghc-regress/ghci/should_run/Makefile
deleted file mode 100644
index f2d6ad7070..0000000000
--- a/testsuite/tests/ghc-regress/ghci/should_run/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-# Test that threadDelay can be interrupted by ^C.
-3171:
-	echo "do Control.Concurrent.threadDelay 3000000; putStrLn \"threadDelay was not interrupted\"" | \
-	"$(TEST_HC)" $(TEST_HC_OPTS) -ignore-dot-ghci -v0 --interactive 2>3171.err & \
-	sleep 2; kill -INT $$!; wait
diff --git a/testsuite/tests/ghc-regress/haddock/haddock_examples/Makefile b/testsuite/tests/ghc-regress/haddock/haddock_examples/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/haddock/haddock_examples/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/Makefile b/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/Makefile b/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/Makefile b/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/Makefile b/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/Makefile b/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE001.comp.stderr b/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE001.comp.stderr
deleted file mode 100644
index e69de29bb2..0000000000
--- a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE001.comp.stderr
+++ /dev/null
diff --git a/testsuite/tests/ghc-regress/hsc2hs/Makefile b/testsuite/tests/ghc-regress/hsc2hs/Makefile
deleted file mode 100644
index 7b2dcdef12..0000000000
--- a/testsuite/tests/ghc-regress/hsc2hs/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-ALL_TESTS = hsc2hs001 hsc2hs002
-
-.PHONY: $(TESTS)
-
-$(ALL_TESTS):
-	'$(HSC2HS)' $@.hsc
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c $@.hs
-
-.PHONY: 3837
-3837:
-	LANG=C '$(HSC2HS)' $@.hsc
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c $@.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Makefile b/testsuite/tests/ghc-regress/indexed-types/should_compile/Makefile
deleted file mode 100644
index b91348f154..0000000000
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-NewTyCo:
-	$(RM) NewTyCo1.o NewTyCo1.hi NewTyCo2.o NewTyCo2.hi
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c NewTyCo1.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c NewTyCo2.hs
-
-.PHONY: IndTypesPerf
-IndTypesPerf:
-	$(RM) IndTypesPerf.o IndTypesPerf.hi
-	$(RM) IndTypesPerfMerge.o IndTypesPerfMerge.hi
-	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c IndTypesPerfMerge.hs +RTS -M20M
-	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c IndTypesPerf.hs      +RTS -M20M
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/Makefile b/testsuite/tests/ghc-regress/indexed-types/should_fail/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_run/Makefile b/testsuite/tests/ghc-regress/indexed-types/should_run/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/indexed-types/should_run/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/layout/Makefile b/testsuite/tests/ghc-regress/layout/Makefile
deleted file mode 100644
index 87e467fd85..0000000000
--- a/testsuite/tests/ghc-regress/layout/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-layout001 layout002 layout003 layout004 layout005 layout006 layout007 layout008 layout009: %:
-	$(RM) $*.hi $*.o
-	echo Running with -XNoAlternativeLayoutRule
-	-"$(TEST_HC)" $(TEST_HC_OPTS) -v0 -XNoAlternativeLayoutRule -c $*.hs 2>&1
-	$(RM) $*.hi $*.o
-	echo Running with -XAlternativeLayoutRule
-	-"$(TEST_HC)" $(TEST_HC_OPTS) -v0 -XAlternativeLayoutRule -c $*.hs 2>&1
-	$(RM) $*.hi $*.o
-	echo Running with -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional
-	-"$(TEST_HC)" $(TEST_HC_OPTS) -v0 -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional -c $*.hs 2>&1
-
diff --git a/testsuite/tests/ghc-regress/lib/CPUTime/Makefile b/testsuite/tests/ghc-regress/lib/CPUTime/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/CPUTime/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Char/Makefile b/testsuite/tests/ghc-regress/lib/Char/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/Char/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Concurrent/Makefile b/testsuite/tests/ghc-regress/lib/Concurrent/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/Concurrent/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Data.ByteString/Makefile b/testsuite/tests/ghc-regress/lib/Data.ByteString/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/Data.ByteString/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Data.Fixed/Makefile b/testsuite/tests/ghc-regress/lib/Data.Fixed/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/Data.Fixed/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Data.HashTable/Makefile b/testsuite/tests/ghc-regress/lib/Data.HashTable/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/Data.HashTable/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Data.Ix/Makefile b/testsuite/tests/ghc-regress/lib/Data.Ix/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/Data.Ix/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Data.List/Makefile b/testsuite/tests/ghc-regress/lib/Data.List/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/Data.List/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/IO/Makefile b/testsuite/tests/ghc-regress/lib/IO/Makefile
deleted file mode 100644
index cc9d060c31..0000000000
--- a/testsuite/tests/ghc-regress/lib/IO/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-test.concio001:
-	$(TEST_HC) $(TEST_HC_OPTS) --make -fforce-recomp -v0 concio001 -o concio001 
-	(sleep 1; echo x) | ./concio001
-
-test.concio001.thr:
-	$(TEST_HC) $(TEST_HC_OPTS) --make -fforce-recomp -v0 -threaded concio001 -o concio001 
-	(sleep 1; echo x) | ./concio001
-
-# NB. utf8-test should *not* have a final newline.  The last char should be 'X'.
-utf16-test: utf8-test
-	iconv -f UTF-8 -t UTF-16 <utf8-test >utf16-test
-
-utf16le-test: utf8-test
-	iconv -f UTF-8 -t UTF-16LE <utf8-test >utf16le-test
-
-utf16be-test: utf8-test
-	iconv -f UTF-8 -t UTF-16BE <utf8-test >utf16be-test
-
-utf32-test: utf8-test
-	iconv -f UTF-8 -t UTF-32 <utf8-test >utf32-test
-
-utf32le-test: utf8-test
-	iconv -f UTF-8 -t UTF-32LE <utf8-test >utf32le-test
-
-utf32be-test: utf8-test
-	iconv -f UTF-8 -t UTF-32BE <utf8-test >utf32be-test
-
-utf8-bom-test: utf16-test
-	iconv -f UTF-16LE -t UTF-8 <utf16-test >utf8-bom-test
-
-hSetEncoding001.in : latin1 utf8-test utf16le-test utf16be-test utf16-test utf32le-test utf32be-test utf32-test utf8-bom-test
-	cat >$@ latin1 utf8-test utf16le-test utf16be-test utf16-test utf32-test utf32le-test utf32be-test utf8-bom-test
-
-environment001-test:
-	"$(TEST_HC)" --make -fforce-recomp -v0 environment001.hs -o environment001 
-	GHC_TEST=马克斯 ./environment001 说
-
-3307-test:
-	"$(TEST_HC)" --make -fforce-recomp -v0 3307.hs -o 3307
-	echo Ni hao > chinese-file-小说
-	echo chinese-file-小说 > chinese-name
-	# The tests are run in whatever the default locale is. This is almost always UTF-8,
-	# but in cmd on Windows it will be the non-Unicode CP850 locale.
-	./3307 chinese-file-小说
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/Makefile b/testsuite/tests/ghc-regress/lib/IOExts/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/IOExts/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/IORef/Makefile b/testsuite/tests/ghc-regress/lib/IORef/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/IORef/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Lex/Makefile b/testsuite/tests/ghc-regress/lib/Lex/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/Lex/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/Makefile b/testsuite/tests/ghc-regress/lib/Numeric/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/Numeric/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/OldException/Makefile b/testsuite/tests/ghc-regress/lib/OldException/Makefile
deleted file mode 100644
index 50191fd8b9..0000000000
--- a/testsuite/tests/ghc-regress/lib/OldException/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
diff --git a/testsuite/tests/ghc-regress/lib/PrettyPrint/Makefile b/testsuite/tests/ghc-regress/lib/PrettyPrint/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/PrettyPrint/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Regex/Makefile b/testsuite/tests/ghc-regress/lib/Regex/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/Regex/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Show/Makefile b/testsuite/tests/ghc-regress/lib/Show/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/Show/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/System/Makefile b/testsuite/tests/ghc-regress/lib/System/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/System/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Text.Printf/Makefile b/testsuite/tests/ghc-regress/lib/Text.Printf/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/Text.Printf/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Time/Makefile b/testsuite/tests/ghc-regress/lib/Time/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/Time/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/exceptions/Makefile b/testsuite/tests/ghc-regress/lib/exceptions/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/exceptions/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/haskell98/Makefile b/testsuite/tests/ghc-regress/lib/haskell98/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/haskell98/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/integer/Makefile b/testsuite/tests/ghc-regress/lib/integer/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/integer/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/libposix/Makefile b/testsuite/tests/ghc-regress/lib/libposix/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/libposix/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/should_run/Makefile b/testsuite/tests/ghc-regress/lib/should_run/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/should_run/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/socket/Makefile b/testsuite/tests/ghc-regress/lib/socket/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/lib/socket/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/win32/Makefile b/testsuite/tests/ghc-regress/lib/win32/Makefile
deleted file mode 100644
index a0ded392fa..0000000000
--- a/testsuite/tests/ghc-regress/lib/win32/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..

-include $(TOP)/mk/boilerplate.mk

-include $(TOP)/mk/test.mk

diff --git a/testsuite/tests/ghc-regress/mdo/should_compile/Makefile b/testsuite/tests/ghc-regress/mdo/should_compile/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/mdo/should_compile/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/Makefile b/testsuite/tests/ghc-regress/mdo/should_fail/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/mdo/should_fail/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/mdo/should_run/Makefile b/testsuite/tests/ghc-regress/mdo/should_run/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/mdo/should_run/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/module/Makefile b/testsuite/tests/ghc-regress/module/Makefile
deleted file mode 100644
index 1b85f61c62..0000000000
--- a/testsuite/tests/ghc-regress/module/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-# We don't want make to fail here, because it emits an unpredictable
-# error message.  Instead we really want to test the exit code of GHC,
-# hence the 
-#    echo "exit($$?)" 1>&2
-# which emits GHC's exit code to stderr so the test driver can compare it.
-
-mod144::
-	rm -f Mod144_A.o Mod144_A.hi mod144.o mod144.hi mod144
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c Mod144_A.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c mod144.hs || echo "exit($$?)" 1>&2
-
-# These tests share some source files, so to avoid clashing when
-# using multiple threads we direct the outputs to different files
-# depending on the test name.
-AUX_O  = $@_o
-AUX_HI = $@_hi
-AUX_OPTS = -osuf $(AUX_O) -hisuf $(AUX_HI)
-
-mod146::
-	rm -f Mod145_A.$(AUX_O) Mod145_A.$(AUX_HI) mod146.$(AUX_O) mod146.$(AUX_HI) mod146
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod145_A.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c mod146.hs || echo "exit($$?)" 1>&2
-
-mod158::
-	rm -f Mod157_*.$(AUX_O) Mod157_*.$(AUX_HI)
-	rm -f mod158.$(AUX_O) mod158.$(AUX_HI) mod158
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod157_A.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod157_B.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod157_C.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod157_D.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c mod158.hs || echo "exit($$?)" 1>&2
-
-mod160::
-	rm -f Mod159_*.$(AUX_O)
-	rm -f Mod159_*.$(AUX_HI)
-	rm -f mod160.$(AUX_O) mod160.$(AUX_HI) mod160
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod159_A.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod159_B.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod159_C.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod159_D.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c mod160.hs || echo "exit($$?)" 1>&2
-
-mod165::
-	rm -f Mod164_*.$(AUX_O)
-	rm -f Mod164_*.$(AUX_HI)
-	rm -f mod165.$(AUX_O) mod165.$(AUX_HI) mod165
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod164_A.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod164_B.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c mod165.hs || echo "exit($$?)" 1>&2
-
-mod166::
-	rm -f Mod164_*.$(AUX_O)
-	rm -f Mod164_*.$(AUX_HI)
-	rm -f mod166.$(AUX_O) mod166.$(AUX_HI) mod166
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod164_A.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod164_B.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c mod166.hs || echo "exit($$?)" 1>&2
-
-mod167::
-	rm -f Mod164_*.$(AUX_O)
-	rm -f Mod164_*.$(AUX_HI)
-	rm -f mod167.$(AUX_O) mod167.$(AUX_HI) mod167
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod164_A.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod164_B.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c mod167.hs || echo "exit($$?)" 1>&2
-
diff --git a/testsuite/tests/ghc-regress/module/base01/Makefile b/testsuite/tests/ghc-regress/module/base01/Makefile
deleted file mode 100644
index 1f6273c330..0000000000
--- a/testsuite/tests/ghc-regress/module/base01/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-clean:
-	rm -f GHC/*.o
-	rm -f GHC/*.hi
-
-base01:
-	rm -f GHC/*.o
-	rm -f GHC/*.hi
-	'$(TEST_HC)' $(TEST_HC_OPTS) -XNoImplicitPrelude -package-name base -c GHC/Base.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -XNoImplicitPrelude -package-name base --make GHC.Foo
-
diff --git a/testsuite/tests/ghc-regress/module/mod175/Makefile b/testsuite/tests/ghc-regress/module/mod175/Makefile
deleted file mode 100644
index 7bba7d2026..0000000000
--- a/testsuite/tests/ghc-regress/module/mod175/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-clean:
-	rm -f *.o
-	rm -f *.hi
-	rm -f test test2
-
-# Test for trac bug #437 (Test2 needs to be recompiled in the second GHC
-# invocation as the main-is flag now applies to it).
-
-mod175:
-	$(MAKE) clean
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -main-is Test.main  Test.hs  -o test
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -main-is Test2.main Test2.hs -o test2
-	./test
-	./test2
-
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/Makefile b/testsuite/tests/ghc-regress/numeric/should_run/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/numeric/should_run/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/parser/prog001/Makefile b/testsuite/tests/ghc-regress/parser/prog001/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/parser/prog001/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/Makefile b/testsuite/tests/ghc-regress/parser/should_compile/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/parser/should_compile/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/Makefile b/testsuite/tests/ghc-regress/parser/should_fail/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/parser/should_fail/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/parser/should_run/Makefile b/testsuite/tests/ghc-regress/parser/should_run/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/parser/should_run/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/parser/unicode/Makefile b/testsuite/tests/ghc-regress/parser/unicode/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/parser/unicode/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/perf/compiler/Makefile b/testsuite/tests/ghc-regress/perf/compiler/Makefile
deleted file mode 100644
index b0c937b230..0000000000
--- a/testsuite/tests/ghc-regress/perf/compiler/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-.PHONY: T4007
-T4007:
-	$(RM) -f T4007.hi T4007.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O -ddump-rule-firings T4007.hs
-
diff --git a/testsuite/tests/ghc-regress/perf/should_run/Makefile b/testsuite/tests/ghc-regress/perf/should_run/Makefile
deleted file mode 100644
index 67a9432a52..0000000000
--- a/testsuite/tests/ghc-regress/perf/should_run/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-define runT3736
-./T3736 $1 +RTS -t --machine-readable 2>&1 | grep '"bytes allocated"' | sed -e 's/.*, "//' -e 's/".*//'
-endef
-.PHONY: T3736
-T3736:
-	$(RM) -f T3736.hi T3736.o T3736
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -O --make T3736 -rtsopts
-# Check ALLOC1 is > 100 just to check with have sane results, and if so,
-# the test passes if the two numbers are equal. We could check that the
-# actual numbers are in the range we expect too (on the various
-# platforms), but we don't currently.
-	ALLOC1=`$(call runT3736,1)`; ALLOC2=`$(call runT3736,2)`; if [ "$$ALLOC1" -gt 100 ] && [ "$$ALLOC1" -eq "$$ALLOC2" ]; then echo Match; else echo "Mismatch: $$ALLOC1 $$ALLOC2"; fi
-
-.PHONY: T2902
-T2902:
-	$(RM) -f T2902_A    T2902_B
-	$(RM) -f T2902_A.hi T2902_B.hi
-	$(RM) -f T2902_A.o  T2902_B.o
-	$(RM) -f T2902_A_PairingSum.hi T2902_B_PairingSum.hi T2902_Sum.hi
-	$(RM) -f T2902_A_PairingSum.o  T2902_B_PairingSum.o  T2902_Sum.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -O --make T2902_A -rtsopts
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -O --make T2902_B -rtsopts
-	BAA=`./T2902_A +RTS -t --machine-readable 2>&1 | grep '"bytes allocated"' | sed -e 's/.*, "//' -e 's/")//'`; BAB=`./T2902_B +RTS -t --machine-readable 2>&1 | grep '"bytes allocated"' | sed -e 's/.*, "//' -e 's/")//'`; [ "$$BAA" = "" ] && echo 'T2902_A: No "bytes allocated"'; [ "$$BAA" = "$$BAB" ] || echo "T2902: Mismatch in \"bytes allocated\": $$BAA $$BAB"
-
-.PHONY: T149
-T149:
-	$(RM) -f T149_A T149_A.hi T149_A.o
-	$(RM) -f T149_B T149_B.hi T149_B.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -O --make T149_A -rtsopts
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -O --make T149_B -rtsopts
-	BAA=`./T149_A +RTS -t --machine-readable 2>&1 | grep '"bytes allocated"' | sed -e 's/.*, "//' -e 's/")//'`; BAB=`./T149_B +RTS -t --machine-readable 2>&1 | grep '"bytes allocated"' | sed -e 's/.*, "//' -e 's/")//'`; [ "$$BAA" = "" ] && echo 'T149_A: No "bytes allocated"'; [ "$$BAA" = "$$BAB" ] || echo "T149: Mismatch in \"bytes allocated\": $$BAA $$BAB"
-
diff --git a/testsuite/tests/ghc-regress/perf/space_leaks/Makefile b/testsuite/tests/ghc-regress/perf/space_leaks/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/perf/space_leaks/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/plugins/Makefile b/testsuite/tests/ghc-regress/plugins/Makefile
deleted file mode 100644
index 48cfb25727..0000000000
--- a/testsuite/tests/ghc-regress/plugins/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-.PHONY: plugins01 clean
-
-plugins01:
-	# This test is extremely fragile because any change in the output of the following
-	# commands invalidates the output of the run.  In fact, we really want to ignore the
-	# output resulting from building the simple-plugin, and only look at a few lines of
-	# the output of the call to the TEST_HC (probably just the last 2).
-	#
-	# Suggestions to make this better gratefully recieved.
-	(cd simple-plugin; make package)
-	@$(RM) plugins01.hi plugins01.o
-	"$(TEST_HC)" $(HC_OPTS) --make -v0 plugins01.hs -package-conf simple-plugin/local.package.conf -fplugin Simple.Plugin -fplugin-opt Simple.Plugin:Irrelevant_Option -package simple-plugin
-	./plugins01
-
-clean:
-	cd simple-plugin && make clean
diff --git a/testsuite/tests/ghc-regress/plugins/simple-plugin/Makefile b/testsuite/tests/ghc-regress/plugins/simple-plugin/Makefile
deleted file mode 100644
index 3142902bf0..0000000000
--- a/testsuite/tests/ghc-regress/plugins/simple-plugin/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-LOCAL_PKGCONF=local.package.conf
-PKG_NAME=simple-plugin
-
-clean:
-	rm -f $(LOCAL_PKGCONF)
-	rm -rf dist
-	rm -rf install
-
-PREFIX := $(abspath install)
-$(eval $(call canonicalise,PREFIX))
-
-package:
-	"$(TEST_HC)" --make -v0 -o setup Setup.hs
-	
-	echo "[]" >$(LOCAL_PKGCONF)
-	
-	./setup configure -v0 --prefix="$(PREFIX)" --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=$(LOCAL_PKGCONF)
-	./setup build -v0
-	./setup install -v0
diff --git a/testsuite/tests/ghc-regress/profiling/should_compile/Makefile b/testsuite/tests/ghc-regress/profiling/should_compile/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/profiling/should_compile/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/profiling/should_fail/Makefile b/testsuite/tests/ghc-regress/profiling/should_fail/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/profiling/should_fail/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/profiling/should_run/Makefile b/testsuite/tests/ghc-regress/profiling/should_run/Makefile
deleted file mode 100644
index 8e1f611bda..0000000000
--- a/testsuite/tests/ghc-regress/profiling/should_run/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-DECIMAL_REGEXP = [0-9]\+.[0-9]\+
-
-define scc001Test
-	grep -q '^ *$1 \+Main \+[0-9]\+ \+1 \+$(DECIMAL_REGEXP) \+$(DECIMAL_REGEXP) \+$(DECIMAL_REGEXP) \+$(DECIMAL_REGEXP)$$' scc001.prof || { echo 'No single-entry for $1 found in profile'; grep '^ *$1 ' scc001.prof; true; }
-endef
-
-define scc001Rule
-	rm -f scc001.hi scc001.o scc001
-	@echo Compiling with $1
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make scc001 -prof -auto-all -rtsopts $1
-	./scc001 +RTS -p
-	$(call scc001Test,f)
-	$(call scc001Test,g)
-	$(call scc001Test,h)
-endef
-
-.PHONY: scc001
-scc001:
-	$(call scc001Rule,-O0)
-	$(call scc001Rule,-O)
-
diff --git a/testsuite/tests/ghc-regress/programs/10queens/Makefile b/testsuite/tests/ghc-regress/programs/10queens/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/10queens/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/Queens/Makefile b/testsuite/tests/ghc-regress/programs/Queens/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/Queens/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/andre_monad/Makefile b/testsuite/tests/ghc-regress/programs/andre_monad/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/andre_monad/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/Makefile b/testsuite/tests/ghc-regress/programs/andy_cherry/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/andy_cherry/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Makefile b/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/cholewo-eval/Makefile b/testsuite/tests/ghc-regress/programs/cholewo-eval/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/cholewo-eval/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/cvh_unboxing/Makefile b/testsuite/tests/ghc-regress/programs/cvh_unboxing/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/cvh_unboxing/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/fast2haskell/Makefile b/testsuite/tests/ghc-regress/programs/fast2haskell/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/fast2haskell/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/fun_insts/Makefile b/testsuite/tests/ghc-regress/programs/fun_insts/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/fun_insts/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/Makefile b/testsuite/tests/ghc-regress/programs/galois_raytrace/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/hs-boot/Makefile b/testsuite/tests/ghc-regress/programs/hs-boot/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/hs-boot/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/jl_defaults/Makefile b/testsuite/tests/ghc-regress/programs/jl_defaults/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/jl_defaults/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/joao-circular/Makefile b/testsuite/tests/ghc-regress/programs/joao-circular/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/joao-circular/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/jq_readsPrec/Makefile b/testsuite/tests/ghc-regress/programs/jq_readsPrec/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/jq_readsPrec/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/jtod_circint/Makefile b/testsuite/tests/ghc-regress/programs/jtod_circint/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/jtod_circint/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/jules_xref/Makefile b/testsuite/tests/ghc-regress/programs/jules_xref/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/jules_xref/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/jules_xref2/Makefile b/testsuite/tests/ghc-regress/programs/jules_xref2/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/jules_xref2/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/launchbury/Makefile b/testsuite/tests/ghc-regress/programs/launchbury/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/launchbury/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/lennart_range/Makefile b/testsuite/tests/ghc-regress/programs/lennart_range/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/lennart_range/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/lex/Makefile b/testsuite/tests/ghc-regress/programs/lex/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/lex/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/life_space_leak/Makefile b/testsuite/tests/ghc-regress/programs/life_space_leak/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/life_space_leak/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/maessen-hashtab/Makefile b/testsuite/tests/ghc-regress/programs/maessen-hashtab/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/maessen-hashtab/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/north_array/Makefile b/testsuite/tests/ghc-regress/programs/north_array/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/north_array/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/okeefe_neural/Makefile b/testsuite/tests/ghc-regress/programs/okeefe_neural/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/okeefe_neural/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/record_upd/Makefile b/testsuite/tests/ghc-regress/programs/record_upd/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/record_upd/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/rittri/Makefile b/testsuite/tests/ghc-regress/programs/rittri/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/rittri/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/sanders_array/Makefile b/testsuite/tests/ghc-regress/programs/sanders_array/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/sanders_array/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/seward-space-leak/Makefile b/testsuite/tests/ghc-regress/programs/seward-space-leak/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/seward-space-leak/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/strict_anns/Makefile b/testsuite/tests/ghc-regress/programs/strict_anns/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/strict_anns/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/thurston-modular-arith/Makefile b/testsuite/tests/ghc-regress/programs/thurston-modular-arith/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/programs/thurston-modular-arith/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/quasiquotation/Makefile b/testsuite/tests/ghc-regress/quasiquotation/Makefile
deleted file mode 100644
index 96a01ba5bc..0000000000
--- a/testsuite/tests/ghc-regress/quasiquotation/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-.PHONY: T4150
-
-T4150:
-	$(RM) T4150A.hi T4150A.o T4150.hi T4150.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c T4150A.hs
-	-'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c T4150.hs
-
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq001/Makefile b/testsuite/tests/ghc-regress/quasiquotation/qq001/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/quasiquotation/qq001/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq002/Makefile b/testsuite/tests/ghc-regress/quasiquotation/qq002/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/quasiquotation/qq002/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq003/Makefile b/testsuite/tests/ghc-regress/quasiquotation/qq003/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/quasiquotation/qq003/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq004/Makefile b/testsuite/tests/ghc-regress/quasiquotation/qq004/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/quasiquotation/qq004/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq005/Makefile b/testsuite/tests/ghc-regress/quasiquotation/qq005/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/quasiquotation/qq005/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq006/Makefile b/testsuite/tests/ghc-regress/quasiquotation/qq006/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/quasiquotation/qq006/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq007/Makefile b/testsuite/tests/ghc-regress/quasiquotation/qq007/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/quasiquotation/qq007/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq008/Makefile b/testsuite/tests/ghc-regress/quasiquotation/qq008/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/quasiquotation/qq008/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/rename/prog001/Makefile b/testsuite/tests/ghc-regress/rename/prog001/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/rename/prog001/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/rename/prog002/Makefile b/testsuite/tests/ghc-regress/rename/prog002/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/rename/prog002/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/rename/prog003/Makefile b/testsuite/tests/ghc-regress/rename/prog003/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/rename/prog003/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/rename/prog004/Makefile b/testsuite/tests/ghc-regress/rename/prog004/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/rename/prog004/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/rename/prog005/Makefile b/testsuite/tests/ghc-regress/rename/prog005/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/rename/prog005/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/rename/prog006/Makefile b/testsuite/tests/ghc-regress/rename/prog006/Makefile
deleted file mode 100644
index d1f4dc0764..0000000000
--- a/testsuite/tests/ghc-regress/rename/prog006/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-# Original comments relating to GHC 6.4:
-# This test caused a panic in GHC 6.4, but in reality it is user
-# error, caused by compiling separate modules in the program using
-# different search paths.  GHC gets confused when it can't find a
-# module mentioned as a dependency in another interface file.
-
-# Update for GHC 6.6:
-# This test now succeeds, because A.hi records the fact that B.C
-# came from the package test-1.0, so there's no conflict.
-
-# If the package format changes, we might have to re-generate pkg.conf
-# using the supplied Cabal configuration.
-
-LOCAL_PKGCONF=local.package.conf
-LOCAL_GHC_PKG = '$(GHC_PKG)' --no-user-package-conf -f $(LOCAL_PKGCONF)
-
-rn.prog006:
-	rm -f A.hi A.o B/C.hi B/C.o Main.hi Main.o pkg.conf
-	rm -f pwd pwd.exe pwd.exe.manifest pwd.hi pwd.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) --make pwd -v0
-	'$(TEST_HC)' $(TEST_HC_OPTS) --make -package-name test-1.0 B.C -fforce-recomp -v0
-	rm -f pkg.conf
-	echo "name: test" >>pkg.conf
-	echo "version: 1.0" >>pkg.conf
-	echo "id: test-XXX" >>pkg.conf
-	echo "import-dirs: `./pwd`" >>pkg.conf
-	echo "exposed-modules: B.C" >>pkg.conf
-	echo "[]" >$(LOCAL_PKGCONF)
-	$(LOCAL_GHC_PKG) register pkg.conf -v0
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -package-conf $(LOCAL_PKGCONF) -package test -fforce-recomp A.hs -i
-# The -i clears the search path, so A.hs will find B.C from package test
-	-'$(TEST_HC)' $(TEST_HC_OPTS) -c -package-conf $(LOCAL_PKGCONF) -package test -fforce-recomp Main.hs
-# No -i when compiling Main, so a from-scratch search would find a home-pkg module B.C
-# However, A.hi remembers that B.C came from package test, so all is ok.
-
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Makefile b/testsuite/tests/ghc-regress/rename/should_compile/Makefile
deleted file mode 100644
index 36fc785f7f..0000000000
--- a/testsuite/tests/ghc-regress/rename/should_compile/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-T1792_imports:
-	$(RM) T1792_imports.hi T1792_imports.o T1792_imports.imports
-	'$(TEST_HC)' $(TEST_HC_OPTS) -ddump-minimal-imports -c T1792_imports.hs
-	cat T1792_imports.imports
-
-T3823:
-	$(RM) T3823A.hi-boot T3823A.hi T3823B.hi
-	$(RM) T3823A.o-boot  T3823A.o  T3823B.o
-	-'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make T3823A.hs
-
-T4003:
-	$(RM) T4003A.hi-boot T4003A.hi T4003B.hi
-	$(RM) T4003A.o-boot  T4003A.o  T4003B.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c T4003A.hs-boot
-	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c T4003B.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c T4003A.hs
-
-T3449:
-	$(RM) T3449.hi-boot T3449.hi T3449A.hi
-	$(RM) T3449.o-boot  T3449.o  T3449A.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -Wall -c T3449.hs-boot
-	'$(TEST_HC)' $(TEST_HC_OPTS) -Wall -c T3449A.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -Wall -c T3449.hs
-
-T4239:
-	$(RM) T4239A.hi T4239A.o
-	$(RM) T4239.hi  T4239.o T4239.imports
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c T4239A.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c T4239.hs -ddump-minimal-imports
-	cat T4239.imports
-
-T4240:
-	$(RM) T4240A.hi T4240A.o
-	$(RM) T4240B.hi T4240B.o
-	$(RM) T4240.hi  T4240.o T4240.imports
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c T4240A.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c T4240B.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c T4240.hs -ddump-minimal-imports
-	cat T4240.imports
-
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/Makefile b/testsuite/tests/ghc-regress/rename/should_fail/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/rename/should_fail/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/rts/Makefile b/testsuite/tests/ghc-regress/rts/Makefile
deleted file mode 100644
index 72b0658b4c..0000000000
--- a/testsuite/tests/ghc-regress/rts/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-outofmem-prep::
-	'$(TEST_HC)' $(TEST_HC_OPTS) --make -fforce-recomp outofmem.hs -o outofmem
-
-outofmem::
-	@$(MAKE) outofmem-prep >prep.out 2>prep.out
-	@ulimit -v 10000000 2>/dev/null; ./outofmem || echo "exit($$?)"
-
-outofmem2-prep::
-	'$(TEST_HC)' $(TEST_HC_OPTS) -rtsopts --make -fforce-recomp outofmem2.hs -o outofmem2
-
-outofmem2::
-	@$(MAKE) outofmem2-prep >prep.out 2>prep.out
-	@ulimit -v 1000000 2>/dev/null; ./outofmem2 +RTS -M5m -RTS || echo "exit($$?)"
-
-T2615-prep:
-	$(RM) libfoo_T2615.so
-	'$(TEST_HC)' $(TEST_HC_OPTS) -fPIC -c libfoo_T2615.c -o libfoo_T2615.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -shared -no-auto-link-packages libfoo_T2615.o -o libfoo_T2615.so
-
-.PHONY: T4059
-T4059:
-	$(RM) 4059_c.o 4059.o 4059.hi
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make 4059 4059_c.c
-	./4059
-
-exec_signals-prep:
-	$(CC) -o exec_signals_child exec_signals_child.c
-	$(CC) -o exec_signals_prepare exec_signals_prepare.c
-
-.PHONY: 4850
-4850:
-	$(RM) 4850.o 4850.hi 4850$(exeext)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 -rtsopts -debug -threaded --make 4850
-	./4850 +RTS -s 2>&1 | grep Task | wc -l | tr -d ' '
diff --git a/testsuite/tests/ghc-regress/rts/all.T b/testsuite/tests/ghc-regress/rts/all.T
deleted file mode 100644
index 172c2953f7..0000000000
--- a/testsuite/tests/ghc-regress/rts/all.T
+++ /dev/null
@@ -1,117 +0,0 @@
-test('testblockalloc', compose(c_src, 
-                       compose(only_ways(['normal','threaded1']),
-                               extra_run_opts('+RTS -I0'))), 
-                       compile_and_run, [''])
-
-
-# See bug #101, test requires +RTS -c (or equivalently +RTS -M<something>)
-# only GHCi triggers the bug, but we run the test all ways for completeness.
-test('bug1010', normal, compile_and_run, ['+RTS -c -RTS'])
-test('derefnull',
-     composes([
-             # LLVM Optimiser considers dereference of a null pointer
-             # undefined and marks the code as unreachable which means
-             # that later optimisations remove it altogether.
-             omit_ways(['optllvm']),
-             # SIGSEGV on Linux (which we make the default)
-             exit_code(139),
-             # Apparently the output can be different on different
-             # Linux setups, so just ignore it. As long as we get
-             # the right exit code we're OK.
-             if_os('linux', ignore_output),
-             # SIGBUS on OX X (PPC and x86 only; amd64 gives SEGV)
-             if_platform('i386-apple-darwin', exit_code(138)),
-             if_platform('powerpc-apple-darwin', exit_code(138)),
-             if_platform('i386-unknown-mingw32', exit_code(1))]),
-     compile_and_run, [''])
-test('divbyzero',
-     composes([
-             # SIGFPE on Linux
-             exit_code(136),
-             # Apparently the output can be different on different
-             # Linux setups, so just ignore it. As long as we get
-             # the right exit code we're OK.
-             if_os('linux', ignore_output),
-             if_platform('i386-unknown-mingw32', exit_code(1))]),
-     compile_and_run, [''])
-
-test('outofmem', normal, run_command, ['$MAKE -s --no-print-directory outofmem'])
-test('outofmem2', extra_run_opts('+RTS -M5m -RTS'),
-                  run_command, ['$MAKE -s --no-print-directory outofmem2'])
-
-test('2047', compose(ignore_output, extra_run_opts('+RTS -c -RTS')),
-             compile_and_run, ['-package containers'])
-
-# Blackhole-detection test.
-# Skip GHCi due to #2786
-test('2783', [ omit_ways(['ghci']), exit_code(1) ], compile_and_run, [''])
-
-# Test the work-stealing deque implementation.  We run this test in
-# both threaded1 (-threaded -debug) and threaded2 (-threaded) ways.
-test('testwsdeque', [unless_in_tree_compiler(skip),
-                    c_src, only_ways(['threaded1', 'threaded2'])],
-                    compile_and_run, ['-I../../../../rts'])
-
-test('3236', [c_src, only_ways(['normal','threaded1']), exit_code(1)], compile_and_run, [''])
-
-test('stack001', extra_run_opts('+RTS -K32m -RTS'), compile_and_run, [''])
-test('stack002', extra_run_opts('+RTS -K32m -k4m -RTS'), compile_and_run, [''])
-
-# run this test with very small stack chunks to exercise the stack
-# overflow/underflow machinery.
-test('stack003', [ omit_ways('ghci'), # uses unboxed tuples
-                   extra_run_opts('500000 +RTS -kc1k -kb100 -K96m -RTS') ],
-                 compile_and_run, [''])
-
-test('atomicinc', [ c_src, only_ways(['normal']) ], compile_and_run, [''])
-
-test('3424', # it's slow:
-             [ skip_if_fast, only_ways(['normal','threaded1','ghci']) ],
-             compile_and_run, [''])
-
-# Test for out-of-range heap size
-test('rtsflags001', [ only_ways(['normal']), exit_code(1), extra_run_opts('+RTS -H0m -RTS') ], compile_and_run, [''])
-
-# Test to see if linker scripts link properly to real ELF files
-test('T2615',
-     [ if_platform('i386-unknown-mingw32',skip),
-       # OS X doesn't seem to support linker scripts
-       if_os('darwin', skip),
-       # Solaris' linker does not support GNUish linker scripts
-       if_os('solaris2', skip),
-       cmd_prefix('$MAKE T2615-prep && ' +
-                  # Add current directory to dlopen search path
-                  'LD_LIBRARY_PATH=$LD_LIBRARY_PATH:. '),
-       extra_clean(['libfoo_T2615.so'])],
-     compile_and_run,
-     ['-package ghc'])
-
-# omit dyn and profiling ways, because we don't build dyn_l or p_l
-# variants of the RTS by default
-test('traceEvent', [ omit_ways(['dyn'] + prof_ways), 
-                     extra_run_opts('+RTS -ls -RTS') ], 
-                   compile_and_run, ['-eventlog'])
-
-test('T4059', normal, run_command, ['$MAKE -s --no-print-directory T4059'])
-
-# Test for #4274
-test('exec_signals', [
-     if_platform('i386-unknown-mingw32',skip),
-     cmd_prefix('$MAKE exec_signals-prep && ./exec_signals_prepare'),
-     extra_clean(['exec_signals_child', 'exec_signals_prepare'])
-    ], compile_and_run, [''])
-
-test('return_mem_to_os', normal, compile_and_run, [''])
-
-test('4850', extra_clean(['4850.o','4850.hi','4850']),
-             run_command, ['$MAKE -s --no-print-directory 4850'])
-
-def config_5250(opts):
-    if not (config.arch in ['i386','x86_64']):
-        opts.skip = 1;
-
-test('5250', [ config_5250,
-               extra_clean(['spalign.o']),
-               omit_ways(['ghci']) ],
-             compile_and_run, ['spalign.c'])
-
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Makefile b/testsuite/tests/ghc-regress/safeHaskell/check/Makefile
deleted file mode 100644
index 9ce1411567..0000000000
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
\ No newline at end of file
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/Makefile b/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/Makefile
deleted file mode 100644
index 1c979a14d5..0000000000
--- a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-TOP=../../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-clean:
-	rm -rf setup a.out
-	rm -rf dist
-	find . -name "*.o" | xargs rm -f
-	find . -name "*.hi" | xargs rm -f
-	rm -rf local.db
-	rm -rf install
-
-# We use the global package database as there's no easy way to tell
-# ghc-pkg (via Cabal) to use one in ., and the global one at least
-# won't affect the installed GHC and is more likely to work
-
-PREFIX := $(abspath install)
-$(eval $(call canonicalise,PREFIX))
-
-PKGCONF = local.db
-LGHC_PKG = '$(GHC_PKG)' --no-user-package-conf -f '$(PKGCONF)'
-
-safePkg01:
-	'$(MAKE)' clean
-	'$(TEST_HC)' --make -o setup Setup.hs -v0
-
-	'$(GHC_PKG)' init local.db
-	./setup configure -v0 --prefix='$(PREFIX)' --with-compiler='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS) -trust base' --with-hc-pkg='$(GHC_PKG)' --package-db='$(PKGCONF)' $(PROF)
-	./setup build -v0
-	./setup copy -v0
-	./setup register --inplace -v0
-	$(LGHC_PKG) list
-	$(LGHC_PKG) field safePkg01-1.0 trusted
-	echo
-	echo 'M_SafePkg'
-	'$(TEST_HC)' --show-iface dist/build/M_SafePkg.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
-	echo
-	echo 'M_SafePkg2'
-	'$(TEST_HC)' --show-iface dist/build/M_SafePkg2.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
-	echo
-	echo 'M_SafePkg3'
-	'$(TEST_HC)' --show-iface dist/build/M_SafePkg3.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
-	echo
-	echo 'M_SafePkg4'
-	'$(TEST_HC)' --show-iface dist/build/M_SafePkg4.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
-
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/Makefile b/testsuite/tests/ghc-regress/safeHaskell/flags/Makefile
deleted file mode 100644
index 9ce1411567..0000000000
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
\ No newline at end of file
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/Makefile b/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/Makefile
deleted file mode 100644
index 9ce1411567..0000000000
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
\ No newline at end of file
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Makefile b/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Makefile
deleted file mode 100644
index 9ce1411567..0000000000
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
\ No newline at end of file
diff --git a/testsuite/tests/ghc-regress/simplCore/prog001/Makefile b/testsuite/tests/ghc-regress/simplCore/prog001/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/simplCore/prog001/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/simplCore/prog002/Makefile b/testsuite/tests/ghc-regress/simplCore/prog002/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/simplCore/prog002/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/Makefile b/testsuite/tests/ghc-regress/simplCore/should_compile/Makefile
deleted file mode 100644
index cbf5ec24a8..0000000000
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-T3055:
-	$(RM) -f T3055.o T3055.hi T3055.simpl
-	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c T3055.hs -ddump-simpl > T3055.simpl
-	grep 'I# (-28)' T3055.simpl | sed 's/.*\(I# (-28)\).*/\1/'
-
-T3772:
-	$(RM) -f T3772*.hi T3772*.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T3772_A.hs 
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T3772.hs -dsuppress-uniques -ddump-simpl
-
-T4306:
-	$(RM) -f T4306.hi T4306.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4306.hs 
-	'$(TEST_HC)' $(TEST_HC_OPTS) --show-iface T4306.hi | grep 'wupd ::'
-
-T4201:
-	$(RM) -f T4201.hi T4201.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4201.hs 
-	'$(TEST_HC)' $(TEST_HC_OPTS) --show-iface T4201.hi | grep 'Sym'
-
-# This one looped as a result of bogus specialisation
-T4903:
-	$(RM) -f T4903.hi T4903a.hi T4903a.o T4903.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4903a.hs -dcore-lint
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4903.hs -dcore-lint
-
-T4918:
-	$(RM) -f T4918.hi T4918.o T4918a.hi T4918a.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4918a.hs 
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4918.hs 
-	'$(TEST_HC)' $(TEST_HC_OPTS) --show-iface T4918.hi | grep 'C#'
-
-EvalTest:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O EvalTest.hs -ddump-simpl -dsuppress-uniques | grep 'rght.*Dmd'
-
-T5168:
-	-('$(TEST_HC)' $(TEST_HC_OPTS) -c -O T5168.hs -ddump-simpl -dsuppress-uniques | grep 'patError')
-
-# When SpecConstr works there are no STUArrays at all
-# The "-(...)" ignores the (expected) non-zero exit code from grep
-# when there are (as expected) no matches
-T4945:
-	-('$(TEST_HC)' $(TEST_HC_OPTS) -c -O2 -fno-liberate-case T4945.hs -ddump-simpl -dsuppress-uniques | grep 'STUArray')
-
-# When this one works there are no 'lets' at all
-T4957:
-	-('$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4957.hs -ddump-simpl -dsuppress-uniques | grep 'let')
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/Makefile b/testsuite/tests/ghc-regress/simplCore/should_run/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/simplCore/should_run/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/Makefile b/testsuite/tests/ghc-regress/stranal/should_compile/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/stranal/should_compile/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/stranal/should_run/Makefile b/testsuite/tests/ghc-regress/stranal/should_run/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/stranal/should_run/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/th/2014/Makefile b/testsuite/tests/ghc-regress/th/2014/Makefile
deleted file mode 100644
index 862ea725d6..0000000000
--- a/testsuite/tests/ghc-regress/th/2014/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-2014 :
-	'$(TEST_HC)' $(TEST_HC_OPTS) -fforce-recomp -c A.hs-boot
-	'$(TEST_HC)' $(TEST_HC_OPTS) -fforce-recomp -c A.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -fforce-recomp -c B.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -fforce-recomp -c C.hs -v0
diff --git a/testsuite/tests/ghc-regress/th/Makefile b/testsuite/tests/ghc-regress/th/Makefile
deleted file mode 100644
index e8b4c2d177..0000000000
--- a/testsuite/tests/ghc-regress/th/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-# Trac 2386 requires batch-compile not --make
-# Very important: without -O 
-T2386:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c T2386_Lib.hs -fforce-recomp
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c T2386.hs -fforce-recomp
-
-
-HC_OPTS = -XTemplateHaskell -package template-haskell
-
-TH_spliceE5_prof::
-	$(RM) TH_spliceE5_prof*.o TH_spliceE5_prof*.hi TH_spliceE5_prof*.p_o 
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(HC_OPTS) --make -v0 TH_spliceE5_prof.hs -c
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(HC_OPTS) --make -v0 TH_spliceE5_prof.hs -prof -auto-all -osuf p_o -o $@
-	./$@
-
diff --git a/testsuite/tests/ghc-regress/th/TH_import_loop/Makefile b/testsuite/tests/ghc-regress/th/TH_import_loop/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/th/TH_import_loop/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/th/TH_recompile/Makefile b/testsuite/tests/ghc-regress/th/TH_recompile/Makefile
deleted file mode 100644
index 9e717bd223..0000000000
--- a/testsuite/tests/ghc-regress/th/TH_recompile/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-# Test for trac #481. GHC should notice that the code that generates
-# the splice has changed, and thus re-run it.
-
-clean:
-	rm -f *.o
-	rm -f hi
-	rm -f test test2
-	rm -f Sub.hs
-
-TH_recompile:
-	$(MAKE) clean
-	cp Sub1.hs Sub.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -XTemplateHaskell Main.hs -o test
-	cp Sub2.hs Sub.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -XTemplateHaskell Main.hs -o test2
-	./test
-	./test2
-
diff --git a/testsuite/tests/ghc-regress/typecheck/bug1465/Makefile b/testsuite/tests/ghc-regress/typecheck/bug1465/Makefile
deleted file mode 100644
index a5b535d453..0000000000
--- a/testsuite/tests/ghc-regress/typecheck/bug1465/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-LOCAL_PKGCONF=local.package.conf
-
-PKG=bug1465
-
-clean:
-	rm -f v1/setup v1/Setup.o v1/Setup.hi
-	rm -f v2/setup v2/Setup.o v2/Setup.hi
-	rm -rf v1/dist v2/dist
-	rm -f *.o *.hi
-	rm -f $(LOCAL_PKGCONF)
-
-bug1465:
-	$(MAKE) clean
-	$(MAKE) prep
-	'$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(LOCAL_PKGCONF) -c C.hs || exit 0
-	$(MAKE) clean
-
-prep:
-	echo "[]" >$(LOCAL_PKGCONF)
-	$(MAKE) prep.v1
-	$(MAKE) prep.v2
-	'$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(LOCAL_PKGCONF) -c -package $(PKG)-1.0 B1.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(LOCAL_PKGCONF) -c -package $(PKG)-2.0 B2.hs
-
-prep.%:
-	cd $* && '$(TEST_HC)' -v0 --make -o setup Setup.hs
-	cd $* && ./setup configure -v0 --with-compiler='$(TEST_HC)' --with-ghc-pkg='$(GHC_PKG)' --package-db ../$(LOCAL_PKGCONF)
-	cd $* && ./setup build -v0
-	cd $* && ./setup register -v0 --inplace
diff --git a/testsuite/tests/ghc-regress/typecheck/prog001/Makefile b/testsuite/tests/ghc-regress/typecheck/prog001/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/typecheck/prog001/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/typecheck/prog002/Makefile b/testsuite/tests/ghc-regress/typecheck/prog002/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/typecheck/prog002/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/Makefile b/testsuite/tests/ghc-regress/typecheck/should_compile/Makefile
deleted file mode 100644
index 81ab165c9c..0000000000
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-tc170:
-	$(RM) Tc170_Aux.hi Tc170_Aux.o tc170.hi tc170.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c Tc170_Aux.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c tc170.hs
-
-tc173:
-	$(RM) Tc173a.o Tc173a.hi Tc173b.o Tc173b.hi
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -XFlexibleInstances -XTypeSynonymInstances -XUndecidableInstances -XOverlappingInstances Tc173a.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -XUndecidableInstances -XOverlappingInstances Tc173b.hs
-
-T2412:
-	$(RM) -f T2412.hi-boot T2412.o-boot T2412A.hi T2412A.o T2412.hi T2412.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c T2412.hs-boot
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c T2412A.hs
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c T2412.hs
-
-tc245:
-	$(RM) -f Tc245_A.hi Tc245_A.o tc245.hi tc245.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) --make tc245
-	$(RM) -f tc245.hi tc245.o
-	'$(TEST_HC)' $(TEST_HC_OPTS) --make tc245
-
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/Makefile b/testsuite/tests/ghc-regress/typecheck/should_fail/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/Makefile b/testsuite/tests/ghc-regress/typecheck/should_run/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/typecheck/should_run/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/typecheck/testeq1/Makefile b/testsuite/tests/ghc-regress/typecheck/testeq1/Makefile
deleted file mode 100644
index 1c39d1c1fe..0000000000
--- a/testsuite/tests/ghc-regress/typecheck/testeq1/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-TOP=../../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/GADT.hs b/testsuite/tests/ghci.debugger/GADT.hs
index a99c1156b9..a99c1156b9 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/GADT.hs
+++ b/testsuite/tests/ghci.debugger/GADT.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/HappyTest.hs b/testsuite/tests/ghci.debugger/HappyTest.hs
index 9be54402a9..9be54402a9 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/HappyTest.hs
+++ b/testsuite/tests/ghci.debugger/HappyTest.hs
diff --git a/testsuite/tests/ghci.debugger/Makefile b/testsuite/tests/ghci.debugger/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/ghci.debugger/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/QSort.hs b/testsuite/tests/ghci.debugger/QSort.hs
index aa45aa14e5..aa45aa14e5 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/QSort.hs
+++ b/testsuite/tests/ghci.debugger/QSort.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/Test.hs b/testsuite/tests/ghci.debugger/Test.hs
index f0477afc3b..f0477afc3b 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/Test.hs
+++ b/testsuite/tests/ghci.debugger/Test.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/Test2.hs b/testsuite/tests/ghci.debugger/Test2.hs
index ee52f7b00a..ee52f7b00a 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/Test2.hs
+++ b/testsuite/tests/ghci.debugger/Test2.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/Test3.hs b/testsuite/tests/ghci.debugger/Test3.hs
index 3bb7bd629b..3bb7bd629b 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/Test3.hs
+++ b/testsuite/tests/ghci.debugger/Test3.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/Test4.hs b/testsuite/tests/ghci.debugger/Test4.hs
index 8bd15e6fba..8bd15e6fba 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/Test4.hs
+++ b/testsuite/tests/ghci.debugger/Test4.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/Test6.hs b/testsuite/tests/ghci.debugger/Test6.hs
index a6ed16e611..a6ed16e611 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/Test6.hs
+++ b/testsuite/tests/ghci.debugger/Test6.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/Test7.hs b/testsuite/tests/ghci.debugger/Test7.hs
index 9f34bfd4f5..9f34bfd4f5 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/Test7.hs
+++ b/testsuite/tests/ghci.debugger/Test7.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/getargs.hs b/testsuite/tests/ghci.debugger/getargs.hs
index 62208f7bf7..62208f7bf7 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/getargs.hs
+++ b/testsuite/tests/ghci.debugger/getargs.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/mdo.hs b/testsuite/tests/ghci.debugger/mdo.hs
index 761c056658..761c056658 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/mdo.hs
+++ b/testsuite/tests/ghci.debugger/mdo.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/2740.hs b/testsuite/tests/ghci.debugger/scripts/2740.hs
index 291e7c8c02..291e7c8c02 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/2740.hs
+++ b/testsuite/tests/ghci.debugger/scripts/2740.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/2740.script b/testsuite/tests/ghci.debugger/scripts/2740.script
index 8cf8c3909b..8cf8c3909b 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/2740.script
+++ b/testsuite/tests/ghci.debugger/scripts/2740.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/2740.stdout b/testsuite/tests/ghci.debugger/scripts/2740.stdout
index c7fefaaeb2..c7fefaaeb2 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/2740.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/2740.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/Break007.hs b/testsuite/tests/ghci.debugger/scripts/Break007.hs
index fc66e943da..fc66e943da 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/Break007.hs
+++ b/testsuite/tests/ghci.debugger/scripts/Break007.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/Break020b.hs b/testsuite/tests/ghci.debugger/scripts/Break020b.hs
index ca4737ff26..ca4737ff26 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/Break020b.hs
+++ b/testsuite/tests/ghci.debugger/scripts/Break020b.hs
diff --git a/testsuite/tests/ghc-regress/rename/Makefile b/testsuite/tests/ghci.debugger/scripts/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/rename/Makefile
+++ b/testsuite/tests/ghci.debugger/scripts/Makefile
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/TupleN.hs b/testsuite/tests/ghci.debugger/scripts/TupleN.hs
index 528f0ea238..528f0ea238 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/TupleN.hs
+++ b/testsuite/tests/ghci.debugger/scripts/TupleN.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/all.T b/testsuite/tests/ghci.debugger/scripts/all.T
index 8c8cb7c64f..8c8cb7c64f 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/all.T
+++ b/testsuite/tests/ghci.debugger/scripts/all.T
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break001.script b/testsuite/tests/ghci.debugger/scripts/break001.script
index 63b5e71a5f..63b5e71a5f 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break001.script
+++ b/testsuite/tests/ghci.debugger/scripts/break001.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break001.stderr b/testsuite/tests/ghci.debugger/scripts/break001.stderr
index cb0cc93ac7..cb0cc93ac7 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break001.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/break001.stderr
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break001.stdout b/testsuite/tests/ghci.debugger/scripts/break001.stdout
index e88c2fcc5c..e88c2fcc5c 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break001.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break001.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break002.script b/testsuite/tests/ghci.debugger/scripts/break002.script
index 0bc2605e4f..0bc2605e4f 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break002.script
+++ b/testsuite/tests/ghci.debugger/scripts/break002.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break002.stdout b/testsuite/tests/ghci.debugger/scripts/break002.stdout
index 72e0359c7b..72e0359c7b 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break002.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break002.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break003.script b/testsuite/tests/ghci.debugger/scripts/break003.script
index 68ca96fcd2..68ca96fcd2 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break003.script
+++ b/testsuite/tests/ghci.debugger/scripts/break003.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break003.stderr b/testsuite/tests/ghci.debugger/scripts/break003.stderr
index f640cb0fab..f640cb0fab 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break003.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/break003.stderr
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break003.stdout b/testsuite/tests/ghci.debugger/scripts/break003.stdout
index ed418836c8..ed418836c8 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break003.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break003.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break004.script b/testsuite/tests/ghci.debugger/scripts/break004.script
index e4bb16fd1a..e4bb16fd1a 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break004.script
+++ b/testsuite/tests/ghci.debugger/scripts/break004.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break005.script b/testsuite/tests/ghci.debugger/scripts/break005.script
index b36ebbca2a..b36ebbca2a 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break005.script
+++ b/testsuite/tests/ghci.debugger/scripts/break005.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break005.stdout b/testsuite/tests/ghci.debugger/scripts/break005.stdout
index adf9502b0a..adf9502b0a 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break005.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break005.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break006.script b/testsuite/tests/ghci.debugger/scripts/break006.script
index 7381490f69..7381490f69 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break006.script
+++ b/testsuite/tests/ghci.debugger/scripts/break006.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break006.stderr b/testsuite/tests/ghci.debugger/scripts/break006.stderr
index 31c3f94f1b..31c3f94f1b 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break006.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/break006.stderr
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break006.stdout b/testsuite/tests/ghci.debugger/scripts/break006.stdout
index 42560877d1..42560877d1 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break006.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break006.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break007.script b/testsuite/tests/ghci.debugger/scripts/break007.script
index 46386ca182..46386ca182 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break007.script
+++ b/testsuite/tests/ghci.debugger/scripts/break007.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break007.stdout b/testsuite/tests/ghci.debugger/scripts/break007.stdout
index e692d2048f..e692d2048f 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break007.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break007.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break008.script b/testsuite/tests/ghci.debugger/scripts/break008.script
index 0cdf7566e6..0cdf7566e6 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break008.script
+++ b/testsuite/tests/ghci.debugger/scripts/break008.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break008.stdout b/testsuite/tests/ghci.debugger/scripts/break008.stdout
index 6961fa3cec..6961fa3cec 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break008.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break008.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break009.script b/testsuite/tests/ghci.debugger/scripts/break009.script
index 3e43b07a70..3e43b07a70 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break009.script
+++ b/testsuite/tests/ghci.debugger/scripts/break009.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break009.stdout b/testsuite/tests/ghci.debugger/scripts/break009.stdout
index cd9436e34a..cd9436e34a 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break009.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break009.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break010.script b/testsuite/tests/ghci.debugger/scripts/break010.script
index c4cfe917f2..c4cfe917f2 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break010.script
+++ b/testsuite/tests/ghci.debugger/scripts/break010.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break010.stdout b/testsuite/tests/ghci.debugger/scripts/break010.stdout
index 2751b6d160..2751b6d160 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break010.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break010.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break011.script b/testsuite/tests/ghci.debugger/scripts/break011.script
index f9ca3fe393..f9ca3fe393 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break011.script
+++ b/testsuite/tests/ghci.debugger/scripts/break011.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break011.stdout b/testsuite/tests/ghci.debugger/scripts/break011.stdout
index 7ca63b686a..7ca63b686a 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break011.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break011.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break012.hs b/testsuite/tests/ghci.debugger/scripts/break012.hs
index 7b2e2ea0fb..7b2e2ea0fb 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break012.hs
+++ b/testsuite/tests/ghci.debugger/scripts/break012.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break012.script b/testsuite/tests/ghci.debugger/scripts/break012.script
index 749947a4a9..749947a4a9 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break012.script
+++ b/testsuite/tests/ghci.debugger/scripts/break012.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break012.stdout b/testsuite/tests/ghci.debugger/scripts/break012.stdout
index 90e228c293..90e228c293 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break012.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break012.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break013.hs b/testsuite/tests/ghci.debugger/scripts/break013.hs
index 53d8432865..53d8432865 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break013.hs
+++ b/testsuite/tests/ghci.debugger/scripts/break013.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break013.script b/testsuite/tests/ghci.debugger/scripts/break013.script
index b14e4c135f..b14e4c135f 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break013.script
+++ b/testsuite/tests/ghci.debugger/scripts/break013.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break013.stdout b/testsuite/tests/ghci.debugger/scripts/break013.stdout
index 9daa2db266..9daa2db266 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break013.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break013.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break014.hs b/testsuite/tests/ghci.debugger/scripts/break014.hs
index 7dff7b6fc5..7dff7b6fc5 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break014.hs
+++ b/testsuite/tests/ghci.debugger/scripts/break014.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break014.script b/testsuite/tests/ghci.debugger/scripts/break014.script
index f0ad6da277..f0ad6da277 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break014.script
+++ b/testsuite/tests/ghci.debugger/scripts/break014.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break014.stdout b/testsuite/tests/ghci.debugger/scripts/break014.stdout
index 3d284bf11f..3d284bf11f 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break014.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break014.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break015.hs b/testsuite/tests/ghci.debugger/scripts/break015.hs
index d897118268..d897118268 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break015.hs
+++ b/testsuite/tests/ghci.debugger/scripts/break015.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break015.script b/testsuite/tests/ghci.debugger/scripts/break015.script
index bbeba92f2c..bbeba92f2c 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break015.script
+++ b/testsuite/tests/ghci.debugger/scripts/break015.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break016.hs b/testsuite/tests/ghci.debugger/scripts/break016.hs
index 1e31c807e9..1e31c807e9 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break016.hs
+++ b/testsuite/tests/ghci.debugger/scripts/break016.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break016.script b/testsuite/tests/ghci.debugger/scripts/break016.script
index 2124e045bd..2124e045bd 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break016.script
+++ b/testsuite/tests/ghci.debugger/scripts/break016.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break016.stdout b/testsuite/tests/ghci.debugger/scripts/break016.stdout
index 92128d177d..92128d177d 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break016.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break016.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break017.script b/testsuite/tests/ghci.debugger/scripts/break017.script
index 05c99acdda..05c99acdda 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break017.script
+++ b/testsuite/tests/ghci.debugger/scripts/break017.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break017.stdout b/testsuite/tests/ghci.debugger/scripts/break017.stdout
index 305289d216..305289d216 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break017.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break017.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break018.script b/testsuite/tests/ghci.debugger/scripts/break018.script
index 0a4c70ef5a..0a4c70ef5a 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break018.script
+++ b/testsuite/tests/ghci.debugger/scripts/break018.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break018.stderr b/testsuite/tests/ghci.debugger/scripts/break018.stderr
index 0107b5880f..0107b5880f 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break018.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/break018.stderr
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break018.stdout b/testsuite/tests/ghci.debugger/scripts/break018.stdout
index a495e7903a..a495e7903a 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break018.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break018.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break019.script b/testsuite/tests/ghci.debugger/scripts/break019.script
index 59537e7364..59537e7364 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break019.script
+++ b/testsuite/tests/ghci.debugger/scripts/break019.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break019.stderr b/testsuite/tests/ghci.debugger/scripts/break019.stderr
index fe27afda19..fe27afda19 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break019.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/break019.stderr
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break020.hs b/testsuite/tests/ghci.debugger/scripts/break020.hs
index b44de82a4c..b44de82a4c 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break020.hs
+++ b/testsuite/tests/ghci.debugger/scripts/break020.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break020.script b/testsuite/tests/ghci.debugger/scripts/break020.script
index f8ba30859e..f8ba30859e 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break020.script
+++ b/testsuite/tests/ghci.debugger/scripts/break020.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break020.stdout b/testsuite/tests/ghci.debugger/scripts/break020.stdout
index 0c7b0a4fc9..0c7b0a4fc9 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break020.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break020.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break021.script b/testsuite/tests/ghci.debugger/scripts/break021.script
index e9251d6613..e9251d6613 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break021.script
+++ b/testsuite/tests/ghci.debugger/scripts/break021.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break021.stdout b/testsuite/tests/ghci.debugger/scripts/break021.stdout
index 3a78eafce7..3a78eafce7 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break021.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break021.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/A.hs b/testsuite/tests/ghci.debugger/scripts/break022/A.hs
index bf903ab11e..bf903ab11e 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/A.hs
+++ b/testsuite/tests/ghci.debugger/scripts/break022/A.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/B.hs b/testsuite/tests/ghci.debugger/scripts/break022/B.hs
index cfc9682cbd..cfc9682cbd 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/B.hs
+++ b/testsuite/tests/ghci.debugger/scripts/break022/B.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/B.hs-boot b/testsuite/tests/ghci.debugger/scripts/break022/B.hs-boot
index 8e73321e9f..8e73321e9f 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/B.hs-boot
+++ b/testsuite/tests/ghci.debugger/scripts/break022/B.hs-boot
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/C.hs b/testsuite/tests/ghci.debugger/scripts/break022/C.hs
index 0dd15af7e7..0dd15af7e7 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/C.hs
+++ b/testsuite/tests/ghci.debugger/scripts/break022/C.hs
diff --git a/testsuite/tests/ghc-regress/array/should_run/Makefile b/testsuite/tests/ghci.debugger/scripts/break022/Makefile
index 1c39d1c1fe..1c39d1c1fe 100644
--- a/testsuite/tests/ghc-regress/array/should_run/Makefile
+++ b/testsuite/tests/ghci.debugger/scripts/break022/Makefile
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/all.T b/testsuite/tests/ghci.debugger/scripts/break022/all.T
index f81e8de45c..f81e8de45c 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/all.T
+++ b/testsuite/tests/ghci.debugger/scripts/break022/all.T
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/break022.script b/testsuite/tests/ghci.debugger/scripts/break022/break022.script
index e0aaeda371..e0aaeda371 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/break022.script
+++ b/testsuite/tests/ghci.debugger/scripts/break022/break022.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/break022.stdout b/testsuite/tests/ghci.debugger/scripts/break022/break022.stdout
index 49cbd2628d..49cbd2628d 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break022/break022.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break022/break022.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/A.hs b/testsuite/tests/ghci.debugger/scripts/break023/A.hs
index 138a4faa1c..138a4faa1c 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/A.hs
+++ b/testsuite/tests/ghci.debugger/scripts/break023/A.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/B.hs b/testsuite/tests/ghci.debugger/scripts/break023/B.hs
index cfc9682cbd..cfc9682cbd 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/B.hs
+++ b/testsuite/tests/ghci.debugger/scripts/break023/B.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/B.hs-boot b/testsuite/tests/ghci.debugger/scripts/break023/B.hs-boot
index 8e73321e9f..8e73321e9f 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/B.hs-boot
+++ b/testsuite/tests/ghci.debugger/scripts/break023/B.hs-boot
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/C.hs b/testsuite/tests/ghci.debugger/scripts/break023/C.hs
index 0dd15af7e7..0dd15af7e7 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/C.hs
+++ b/testsuite/tests/ghci.debugger/scripts/break023/C.hs
diff --git a/testsuite/tests/ghc-regress/arrows/should_compile/Makefile b/testsuite/tests/ghci.debugger/scripts/break023/Makefile
index 1c39d1c1fe..1c39d1c1fe 100644
--- a/testsuite/tests/ghc-regress/arrows/should_compile/Makefile
+++ b/testsuite/tests/ghci.debugger/scripts/break023/Makefile
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/all.T b/testsuite/tests/ghci.debugger/scripts/break023/all.T
index 3858849735..3858849735 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/all.T
+++ b/testsuite/tests/ghci.debugger/scripts/break023/all.T
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/break023.script b/testsuite/tests/ghci.debugger/scripts/break023/break023.script
index 4ddd2d6be4..4ddd2d6be4 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/break023.script
+++ b/testsuite/tests/ghci.debugger/scripts/break023/break023.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/break023.stdout b/testsuite/tests/ghci.debugger/scripts/break023/break023.stdout
index 2b6c85daf4..2b6c85daf4 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break023/break023.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break023/break023.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break024.hs b/testsuite/tests/ghci.debugger/scripts/break024.hs
index 33c8ce6036..33c8ce6036 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break024.hs
+++ b/testsuite/tests/ghci.debugger/scripts/break024.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break024.script b/testsuite/tests/ghci.debugger/scripts/break024.script
index 7efb396788..7efb396788 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break024.script
+++ b/testsuite/tests/ghci.debugger/scripts/break024.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break024.stdout b/testsuite/tests/ghci.debugger/scripts/break024.stdout
index dc3bd73425..dc3bd73425 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break024.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break024.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break024.stdout-ghc-7.0 b/testsuite/tests/ghci.debugger/scripts/break024.stdout-ghc-7.0
index d2c3495ee6..d2c3495ee6 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break024.stdout-ghc-7.0
+++ b/testsuite/tests/ghci.debugger/scripts/break024.stdout-ghc-7.0
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break025.script b/testsuite/tests/ghci.debugger/scripts/break025.script
index 2fe0bfcae6..2fe0bfcae6 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break025.script
+++ b/testsuite/tests/ghci.debugger/scripts/break025.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break025.stdout b/testsuite/tests/ghci.debugger/scripts/break025.stdout
index e38f173aff..e38f173aff 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break025.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break025.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break026.hs b/testsuite/tests/ghci.debugger/scripts/break026.hs
index e88b9e96d7..e88b9e96d7 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break026.hs
+++ b/testsuite/tests/ghci.debugger/scripts/break026.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break026.script b/testsuite/tests/ghci.debugger/scripts/break026.script
index 98c6624751..98c6624751 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break026.script
+++ b/testsuite/tests/ghci.debugger/scripts/break026.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break026.stdout b/testsuite/tests/ghci.debugger/scripts/break026.stdout
index 311c1e6bd2..311c1e6bd2 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break026.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break026.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break027.script b/testsuite/tests/ghci.debugger/scripts/break027.script
index 198b259c78..198b259c78 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break027.script
+++ b/testsuite/tests/ghci.debugger/scripts/break027.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break027.stdout b/testsuite/tests/ghci.debugger/scripts/break027.stdout
index 818111a9e1..818111a9e1 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break027.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break027.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break028.hs b/testsuite/tests/ghci.debugger/scripts/break028.hs
index 8e4ef2a3b5..8e4ef2a3b5 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break028.hs
+++ b/testsuite/tests/ghci.debugger/scripts/break028.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break028.script b/testsuite/tests/ghci.debugger/scripts/break028.script
index 26793f1459..26793f1459 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break028.script
+++ b/testsuite/tests/ghci.debugger/scripts/break028.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break028.stdout b/testsuite/tests/ghci.debugger/scripts/break028.stdout
index 2438d73a14..2438d73a14 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/break028.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/break028.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk001.script b/testsuite/tests/ghci.debugger/scripts/dynbrk001.script
index 95c1ab6118..95c1ab6118 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk001.script
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk001.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk001.stderr b/testsuite/tests/ghci.debugger/scripts/dynbrk001.stderr
index adb8dca658..adb8dca658 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk001.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk001.stderr
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk001.stdout b/testsuite/tests/ghci.debugger/scripts/dynbrk001.stdout
index 3ce4969682..3ce4969682 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk001.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk001.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk002.script b/testsuite/tests/ghci.debugger/scripts/dynbrk002.script
index 043e02328b..043e02328b 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk002.script
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk002.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk002.stdout b/testsuite/tests/ghci.debugger/scripts/dynbrk002.stdout
index b67ced36a6..b67ced36a6 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk002.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk002.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk003.script b/testsuite/tests/ghci.debugger/scripts/dynbrk003.script
index dfd00b69ab..dfd00b69ab 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk003.script
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk003.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk003.stdout b/testsuite/tests/ghci.debugger/scripts/dynbrk003.stdout
index be3e67e656..be3e67e656 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk003.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk003.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk004.script b/testsuite/tests/ghci.debugger/scripts/dynbrk004.script
index eb0bad6940..eb0bad6940 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk004.script
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk004.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk004.stderr b/testsuite/tests/ghci.debugger/scripts/dynbrk004.stderr
index 0107b5880f..0107b5880f 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk004.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk004.stderr
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk004.stdout b/testsuite/tests/ghci.debugger/scripts/dynbrk004.stdout
index ed7fb990a4..ed7fb990a4 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk004.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk004.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk005.hs b/testsuite/tests/ghci.debugger/scripts/dynbrk005.hs
index 5b228d2ab4..5b228d2ab4 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk005.hs
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk005.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk005.script b/testsuite/tests/ghci.debugger/scripts/dynbrk005.script
index 6ac65d8096..6ac65d8096 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk005.script
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk005.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk005.stdout b/testsuite/tests/ghci.debugger/scripts/dynbrk005.stdout
index 3eff707e6c..3eff707e6c 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk005.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk005.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk007.hs b/testsuite/tests/ghci.debugger/scripts/dynbrk007.hs
index dc02170216..dc02170216 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk007.hs
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk007.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk007.script b/testsuite/tests/ghci.debugger/scripts/dynbrk007.script
index 1f40a2255f..1f40a2255f 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk007.script
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk007.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk007.stdout b/testsuite/tests/ghci.debugger/scripts/dynbrk007.stdout
index 22adee0db2..22adee0db2 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk007.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk007.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk008.hs b/testsuite/tests/ghci.debugger/scripts/dynbrk008.hs
index 8fbde66d21..8fbde66d21 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk008.hs
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk008.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk008.script b/testsuite/tests/ghci.debugger/scripts/dynbrk008.script
index e99ee6076e..e99ee6076e 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk008.script
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk008.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk008.stdout b/testsuite/tests/ghci.debugger/scripts/dynbrk008.stdout
index 722f2991f3..722f2991f3 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk008.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk008.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk009.hs b/testsuite/tests/ghci.debugger/scripts/dynbrk009.hs
index f0e0bfee16..f0e0bfee16 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk009.hs
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk009.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk009.script b/testsuite/tests/ghci.debugger/scripts/dynbrk009.script
index 7d00f193a5..7d00f193a5 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk009.script
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk009.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk009.stdout b/testsuite/tests/ghci.debugger/scripts/dynbrk009.stdout
index e7e107448c..e7e107448c 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/dynbrk009.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/dynbrk009.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/getargs.script b/testsuite/tests/ghci.debugger/scripts/getargs.script
index 4574386df3..4574386df3 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/getargs.script
+++ b/testsuite/tests/ghci.debugger/scripts/getargs.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/getargs.stdout b/testsuite/tests/ghci.debugger/scripts/getargs.stdout
index 659308cd77..659308cd77 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/getargs.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/getargs.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/hist001.script b/testsuite/tests/ghci.debugger/scripts/hist001.script
index 5f8eab637e..5f8eab637e 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/hist001.script
+++ b/testsuite/tests/ghci.debugger/scripts/hist001.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/hist001.stdout b/testsuite/tests/ghci.debugger/scripts/hist001.stdout
index 68e05cc076..68e05cc076 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/hist001.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/hist001.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand001.script b/testsuite/tests/ghci.debugger/scripts/listCommand001.script
index 767b27c47f..767b27c47f 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand001.script
+++ b/testsuite/tests/ghci.debugger/scripts/listCommand001.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand001.stdout b/testsuite/tests/ghci.debugger/scripts/listCommand001.stdout
index 26a27ac5a5..26a27ac5a5 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand001.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/listCommand001.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.hs b/testsuite/tests/ghci.debugger/scripts/listCommand002.hs
index 71f3f5482c..71f3f5482c 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.hs
+++ b/testsuite/tests/ghci.debugger/scripts/listCommand002.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.script b/testsuite/tests/ghci.debugger/scripts/listCommand002.script
index 72abf5291d..72abf5291d 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.script
+++ b/testsuite/tests/ghci.debugger/scripts/listCommand002.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.stdout b/testsuite/tests/ghci.debugger/scripts/listCommand002.stdout
index 95854884b2..95854884b2 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/listCommand002.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/listCommand002.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print001.script b/testsuite/tests/ghci.debugger/scripts/print001.script
index f2111c0cc5..f2111c0cc5 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print001.script
+++ b/testsuite/tests/ghci.debugger/scripts/print001.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print001.stdout b/testsuite/tests/ghci.debugger/scripts/print001.stdout
index c55ed941cb..c55ed941cb 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print001.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print001.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print002.script b/testsuite/tests/ghci.debugger/scripts/print002.script
index 629bb92e74..629bb92e74 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print002.script
+++ b/testsuite/tests/ghci.debugger/scripts/print002.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print002.stdout b/testsuite/tests/ghci.debugger/scripts/print002.stdout
index ab0e6f2fdb..ab0e6f2fdb 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print002.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print002.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print003.script b/testsuite/tests/ghci.debugger/scripts/print003.script
index 8544f46231..8544f46231 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print003.script
+++ b/testsuite/tests/ghci.debugger/scripts/print003.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print003.stdout b/testsuite/tests/ghci.debugger/scripts/print003.stdout
index 99a66e4bdc..99a66e4bdc 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print003.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print003.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print004.script b/testsuite/tests/ghci.debugger/scripts/print004.script
index b82929a600..b82929a600 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print004.script
+++ b/testsuite/tests/ghci.debugger/scripts/print004.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print004.stdout b/testsuite/tests/ghci.debugger/scripts/print004.stdout
index ee7bbacefa..ee7bbacefa 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print004.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print004.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print005.script b/testsuite/tests/ghci.debugger/scripts/print005.script
index 0d26508703..0d26508703 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print005.script
+++ b/testsuite/tests/ghci.debugger/scripts/print005.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print005.stdout b/testsuite/tests/ghci.debugger/scripts/print005.stdout
index f2c930a356..f2c930a356 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print005.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print005.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print006.script b/testsuite/tests/ghci.debugger/scripts/print006.script
index d4c60d56a6..d4c60d56a6 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print006.script
+++ b/testsuite/tests/ghci.debugger/scripts/print006.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print006.stdout b/testsuite/tests/ghci.debugger/scripts/print006.stdout
index 0a91ca724b..0a91ca724b 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print006.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print006.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print007.script b/testsuite/tests/ghci.debugger/scripts/print007.script
index 69fbb4d2dd..69fbb4d2dd 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print007.script
+++ b/testsuite/tests/ghci.debugger/scripts/print007.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print007.stderr b/testsuite/tests/ghci.debugger/scripts/print007.stderr
index 713c629818..713c629818 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print007.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/print007.stderr
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print007.stdout b/testsuite/tests/ghci.debugger/scripts/print007.stdout
index 1498fe1ae1..1498fe1ae1 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print007.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print007.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print008.script b/testsuite/tests/ghci.debugger/scripts/print008.script
index 52ca7dc857..52ca7dc857 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print008.script
+++ b/testsuite/tests/ghci.debugger/scripts/print008.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print008.stdout b/testsuite/tests/ghci.debugger/scripts/print008.stdout
index 1b42a99ed4..1b42a99ed4 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print008.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print008.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print009.script b/testsuite/tests/ghci.debugger/scripts/print009.script
index 9c36e8c403..9c36e8c403 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print009.script
+++ b/testsuite/tests/ghci.debugger/scripts/print009.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print009.stdout b/testsuite/tests/ghci.debugger/scripts/print009.stdout
index de29287d57..de29287d57 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print009.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print009.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print010.script b/testsuite/tests/ghci.debugger/scripts/print010.script
index 4b488fa867..4b488fa867 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print010.script
+++ b/testsuite/tests/ghci.debugger/scripts/print010.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print010.stdout b/testsuite/tests/ghci.debugger/scripts/print010.stdout
index b390d255c8..b390d255c8 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print010.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print010.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print011.script b/testsuite/tests/ghci.debugger/scripts/print011.script
index 9d200dcaa2..9d200dcaa2 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print011.script
+++ b/testsuite/tests/ghci.debugger/scripts/print011.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print011.stdout b/testsuite/tests/ghci.debugger/scripts/print011.stdout
index 852312f15f..852312f15f 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print011.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print011.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print012.script b/testsuite/tests/ghci.debugger/scripts/print012.script
index bda9a8fbe7..bda9a8fbe7 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print012.script
+++ b/testsuite/tests/ghci.debugger/scripts/print012.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print012.stdout b/testsuite/tests/ghci.debugger/scripts/print012.stdout
index c717acc069..c717acc069 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print012.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print012.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print013.script b/testsuite/tests/ghci.debugger/scripts/print013.script
index 154c1b328f..154c1b328f 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print013.script
+++ b/testsuite/tests/ghci.debugger/scripts/print013.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print013.stdout b/testsuite/tests/ghci.debugger/scripts/print013.stdout
index 8ccfef5376..8ccfef5376 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print013.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print013.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print014.script b/testsuite/tests/ghci.debugger/scripts/print014.script
index 88fce78418..88fce78418 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print014.script
+++ b/testsuite/tests/ghci.debugger/scripts/print014.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print014.stdout b/testsuite/tests/ghci.debugger/scripts/print014.stdout
index e6d9a01bd8..e6d9a01bd8 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print014.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print014.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print015.script b/testsuite/tests/ghci.debugger/scripts/print015.script
index 6fdcca9b56..6fdcca9b56 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print015.script
+++ b/testsuite/tests/ghci.debugger/scripts/print015.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print015.stdout b/testsuite/tests/ghci.debugger/scripts/print015.stdout
index cc037e9ba7..cc037e9ba7 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print015.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print015.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print016.script b/testsuite/tests/ghci.debugger/scripts/print016.script
index 1f5f153892..1f5f153892 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print016.script
+++ b/testsuite/tests/ghci.debugger/scripts/print016.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print016.stdout b/testsuite/tests/ghci.debugger/scripts/print016.stdout
index ec894b5162..ec894b5162 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print016.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print016.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print017.script b/testsuite/tests/ghci.debugger/scripts/print017.script
index 7a8371a2c1..7a8371a2c1 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print017.script
+++ b/testsuite/tests/ghci.debugger/scripts/print017.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print017.stdout b/testsuite/tests/ghci.debugger/scripts/print017.stdout
index 4d38a041c4..4d38a041c4 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print017.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print017.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print018.script b/testsuite/tests/ghci.debugger/scripts/print018.script
index 695dfca291..695dfca291 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print018.script
+++ b/testsuite/tests/ghci.debugger/scripts/print018.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print018.stderr b/testsuite/tests/ghci.debugger/scripts/print018.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print018.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/print018.stderr
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print018.stdout b/testsuite/tests/ghci.debugger/scripts/print018.stdout
index 26861305f3..26861305f3 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print018.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print018.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print019.script b/testsuite/tests/ghci.debugger/scripts/print019.script
index a7653720d6..a7653720d6 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print019.script
+++ b/testsuite/tests/ghci.debugger/scripts/print019.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print019.stderr b/testsuite/tests/ghci.debugger/scripts/print019.stderr
index dcf63dd07e..dcf63dd07e 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print019.stderr
+++ b/testsuite/tests/ghci.debugger/scripts/print019.stderr
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print019.stdout b/testsuite/tests/ghci.debugger/scripts/print019.stdout
index 9c48d11d8d..9c48d11d8d 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print019.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print019.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print020.script b/testsuite/tests/ghci.debugger/scripts/print020.script
index e0101955cb..e0101955cb 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print020.script
+++ b/testsuite/tests/ghci.debugger/scripts/print020.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print020.stdout b/testsuite/tests/ghci.debugger/scripts/print020.stdout
index ee10c3a575..ee10c3a575 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print020.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print020.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print021.hs b/testsuite/tests/ghci.debugger/scripts/print021.hs
index 7c3962d803..7c3962d803 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print021.hs
+++ b/testsuite/tests/ghci.debugger/scripts/print021.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print021.script b/testsuite/tests/ghci.debugger/scripts/print021.script
index 58846cb64a..58846cb64a 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print021.script
+++ b/testsuite/tests/ghci.debugger/scripts/print021.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print021.stdout b/testsuite/tests/ghci.debugger/scripts/print021.stdout
index 4ebd63ee4a..4ebd63ee4a 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print021.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print021.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print022.hs b/testsuite/tests/ghci.debugger/scripts/print022.hs
index f83873e5ea..f83873e5ea 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print022.hs
+++ b/testsuite/tests/ghci.debugger/scripts/print022.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print022.script b/testsuite/tests/ghci.debugger/scripts/print022.script
index cfed80380e..cfed80380e 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print022.script
+++ b/testsuite/tests/ghci.debugger/scripts/print022.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print022.stdout b/testsuite/tests/ghci.debugger/scripts/print022.stdout
index 8aa539418a..8aa539418a 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print022.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print022.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print023.script b/testsuite/tests/ghci.debugger/scripts/print023.script
index 434b8df4af..434b8df4af 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print023.script
+++ b/testsuite/tests/ghci.debugger/scripts/print023.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print023.stdout b/testsuite/tests/ghci.debugger/scripts/print023.stdout
index ef8d3c18fa..ef8d3c18fa 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print023.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print023.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print024.script b/testsuite/tests/ghci.debugger/scripts/print024.script
index d617ecaaa0..d617ecaaa0 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print024.script
+++ b/testsuite/tests/ghci.debugger/scripts/print024.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print024.stdout b/testsuite/tests/ghci.debugger/scripts/print024.stdout
index 021fa5c98a..021fa5c98a 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print024.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print024.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print025.hs b/testsuite/tests/ghci.debugger/scripts/print025.hs
index c2898bfa8e..c2898bfa8e 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print025.hs
+++ b/testsuite/tests/ghci.debugger/scripts/print025.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print025.script b/testsuite/tests/ghci.debugger/scripts/print025.script
index 926890f4bc..926890f4bc 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print025.script
+++ b/testsuite/tests/ghci.debugger/scripts/print025.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print025.stdout b/testsuite/tests/ghci.debugger/scripts/print025.stdout
index b2fcf65b1b..b2fcf65b1b 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print025.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print025.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print026.script b/testsuite/tests/ghci.debugger/scripts/print026.script
index de31983f1d..de31983f1d 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print026.script
+++ b/testsuite/tests/ghci.debugger/scripts/print026.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print026.stdout b/testsuite/tests/ghci.debugger/scripts/print026.stdout
index decc3dfb6d..decc3dfb6d 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print026.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print026.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print027.script b/testsuite/tests/ghci.debugger/scripts/print027.script
index b8c7238148..b8c7238148 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print027.script
+++ b/testsuite/tests/ghci.debugger/scripts/print027.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print027.stdout b/testsuite/tests/ghci.debugger/scripts/print027.stdout
index 38c46a9118..38c46a9118 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print027.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print027.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print028.script b/testsuite/tests/ghci.debugger/scripts/print028.script
index 0beb8bf725..0beb8bf725 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print028.script
+++ b/testsuite/tests/ghci.debugger/scripts/print028.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print028.stdout b/testsuite/tests/ghci.debugger/scripts/print028.stdout
index 93a80bc69d..93a80bc69d 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print028.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print028.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print029.hs b/testsuite/tests/ghci.debugger/scripts/print029.hs
index 23eb61bb5b..23eb61bb5b 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print029.hs
+++ b/testsuite/tests/ghci.debugger/scripts/print029.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print029.script b/testsuite/tests/ghci.debugger/scripts/print029.script
index b320153d17..b320153d17 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print029.script
+++ b/testsuite/tests/ghci.debugger/scripts/print029.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print029.stdout b/testsuite/tests/ghci.debugger/scripts/print029.stdout
index 366d1d480a..366d1d480a 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print029.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print029.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print030.script b/testsuite/tests/ghci.debugger/scripts/print030.script
index 9296c90163..9296c90163 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print030.script
+++ b/testsuite/tests/ghci.debugger/scripts/print030.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print030.stdout b/testsuite/tests/ghci.debugger/scripts/print030.stdout
index a67d0492d2..a67d0492d2 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print030.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print030.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print031.hs b/testsuite/tests/ghci.debugger/scripts/print031.hs
index c64c786b89..c64c786b89 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print031.hs
+++ b/testsuite/tests/ghci.debugger/scripts/print031.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print031.script b/testsuite/tests/ghci.debugger/scripts/print031.script
index fb6308ffcf..fb6308ffcf 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print031.script
+++ b/testsuite/tests/ghci.debugger/scripts/print031.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print031.stdout b/testsuite/tests/ghci.debugger/scripts/print031.stdout
index 529b6987b5..529b6987b5 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print031.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print031.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print032.script b/testsuite/tests/ghci.debugger/scripts/print032.script
index fa872af5d3..fa872af5d3 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print032.script
+++ b/testsuite/tests/ghci.debugger/scripts/print032.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print032.stdout b/testsuite/tests/ghci.debugger/scripts/print032.stdout
index 5b84fd7c6d..5b84fd7c6d 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print032.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print032.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print033.script b/testsuite/tests/ghci.debugger/scripts/print033.script
index fed81fe3de..fed81fe3de 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print033.script
+++ b/testsuite/tests/ghci.debugger/scripts/print033.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print033.stdout b/testsuite/tests/ghci.debugger/scripts/print033.stdout
index e60df0905a..e60df0905a 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print033.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print033.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print034.script b/testsuite/tests/ghci.debugger/scripts/print034.script
index 95bcfde0a6..95bcfde0a6 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print034.script
+++ b/testsuite/tests/ghci.debugger/scripts/print034.script
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print034.stdout b/testsuite/tests/ghci.debugger/scripts/print034.stdout
index 5d83c8c9b7..5d83c8c9b7 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/print034.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/print034.stdout
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/result001.hs b/testsuite/tests/ghci.debugger/scripts/result001.hs
index a32e2c10fa..a32e2c10fa 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/result001.hs
+++ b/testsuite/tests/ghci.debugger/scripts/result001.hs
diff --git a/testsuite/tests/ghc-regress/ghci.debugger/scripts/result001.script b/testsuite/tests/ghci.debugger/scripts/result001.script
index c5714fe781..c5714fe781 100644
--- a/testsuite/tests/ghc-regress/ghci.debugger/scripts/result001.script
+++ b/testsuite/tests/ghci.debugger/scripts/result001.script
diff --git a/testsuite/tests/ghci/Makefile b/testsuite/tests/ghci/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/ghci/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci/prog001/A.hs b/testsuite/tests/ghci/prog001/A.hs
index ca0a7e864b..ca0a7e864b 100644
--- a/testsuite/tests/ghc-regress/ghci/prog001/A.hs
+++ b/testsuite/tests/ghci/prog001/A.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog001/B.hs b/testsuite/tests/ghci/prog001/B.hs
index e57c31ffff..e57c31ffff 100644
--- a/testsuite/tests/ghc-regress/ghci/prog001/B.hs
+++ b/testsuite/tests/ghci/prog001/B.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog001/C.hs b/testsuite/tests/ghci/prog001/C.hs
index 006014f98c..006014f98c 100644
--- a/testsuite/tests/ghc-regress/ghci/prog001/C.hs
+++ b/testsuite/tests/ghci/prog001/C.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog001/D1.hs b/testsuite/tests/ghci/prog001/D1.hs
index 35184c7afe..35184c7afe 100644
--- a/testsuite/tests/ghc-regress/ghci/prog001/D1.hs
+++ b/testsuite/tests/ghci/prog001/D1.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog001/D2.hs b/testsuite/tests/ghci/prog001/D2.hs
index 997171cdb6..997171cdb6 100644
--- a/testsuite/tests/ghc-regress/ghci/prog001/D2.hs
+++ b/testsuite/tests/ghci/prog001/D2.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/Makefile b/testsuite/tests/ghci/prog001/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/Makefile
+++ b/testsuite/tests/ghci/prog001/Makefile
diff --git a/testsuite/tests/ghc-regress/ghci/prog001/prog001.T b/testsuite/tests/ghci/prog001/prog001.T
index 4dfdb69456..4dfdb69456 100644
--- a/testsuite/tests/ghc-regress/ghci/prog001/prog001.T
+++ b/testsuite/tests/ghci/prog001/prog001.T
diff --git a/testsuite/tests/ghc-regress/ghci/prog001/prog001.script b/testsuite/tests/ghci/prog001/prog001.script
index 77fb21b9bb..77fb21b9bb 100644
--- a/testsuite/tests/ghc-regress/ghci/prog001/prog001.script
+++ b/testsuite/tests/ghci/prog001/prog001.script
diff --git a/testsuite/tests/ghc-regress/ghci/prog001/prog001.stdout b/testsuite/tests/ghci/prog001/prog001.stdout
index eef24c2153..eef24c2153 100644
--- a/testsuite/tests/ghc-regress/ghci/prog001/prog001.stdout
+++ b/testsuite/tests/ghci/prog001/prog001.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/prog002/A.hs b/testsuite/tests/ghci/prog002/A.hs
index 6dc493aaa2..6dc493aaa2 100644
--- a/testsuite/tests/ghc-regress/ghci/prog002/A.hs
+++ b/testsuite/tests/ghci/prog002/A.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog002/A1.hs b/testsuite/tests/ghci/prog002/A1.hs
index 069e8ef07a..069e8ef07a 100644
--- a/testsuite/tests/ghc-regress/ghci/prog002/A1.hs
+++ b/testsuite/tests/ghci/prog002/A1.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog002/A2.hs b/testsuite/tests/ghci/prog002/A2.hs
index 6dc493aaa2..6dc493aaa2 100644
--- a/testsuite/tests/ghc-regress/ghci/prog002/A2.hs
+++ b/testsuite/tests/ghci/prog002/A2.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog002/B.hs b/testsuite/tests/ghci/prog002/B.hs
index 6aced23415..6aced23415 100644
--- a/testsuite/tests/ghc-regress/ghci/prog002/B.hs
+++ b/testsuite/tests/ghci/prog002/B.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog002/C.hs b/testsuite/tests/ghci/prog002/C.hs
index b3baac2979..b3baac2979 100644
--- a/testsuite/tests/ghc-regress/ghci/prog002/C.hs
+++ b/testsuite/tests/ghci/prog002/C.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog002/D.hs b/testsuite/tests/ghci/prog002/D.hs
index 35672bd88c..35672bd88c 100644
--- a/testsuite/tests/ghc-regress/ghci/prog002/D.hs
+++ b/testsuite/tests/ghci/prog002/D.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/Makefile b/testsuite/tests/ghci/prog002/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/simplCore/Makefile
+++ b/testsuite/tests/ghci/prog002/Makefile
diff --git a/testsuite/tests/ghc-regress/ghci/prog002/prog002.T b/testsuite/tests/ghci/prog002/prog002.T
index ea39005f6f..ea39005f6f 100644
--- a/testsuite/tests/ghc-regress/ghci/prog002/prog002.T
+++ b/testsuite/tests/ghci/prog002/prog002.T
diff --git a/testsuite/tests/ghc-regress/ghci/prog002/prog002.script b/testsuite/tests/ghci/prog002/prog002.script
index cecbe4091a..cecbe4091a 100644
--- a/testsuite/tests/ghc-regress/ghci/prog002/prog002.script
+++ b/testsuite/tests/ghci/prog002/prog002.script
diff --git a/testsuite/tests/ghc-regress/ghci/prog002/prog002.stdout b/testsuite/tests/ghci/prog002/prog002.stdout
index aece15514e..aece15514e 100644
--- a/testsuite/tests/ghc-regress/ghci/prog002/prog002.stdout
+++ b/testsuite/tests/ghci/prog002/prog002.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/prog003/A.hs b/testsuite/tests/ghci/prog003/A.hs
index 6e9351c066..6e9351c066 100644
--- a/testsuite/tests/ghc-regress/ghci/prog003/A.hs
+++ b/testsuite/tests/ghci/prog003/A.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog003/B.hs b/testsuite/tests/ghci/prog003/B.hs
index cd579657fb..cd579657fb 100644
--- a/testsuite/tests/ghc-regress/ghci/prog003/B.hs
+++ b/testsuite/tests/ghci/prog003/B.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog003/C.hs b/testsuite/tests/ghci/prog003/C.hs
index f26067c78a..f26067c78a 100644
--- a/testsuite/tests/ghc-regress/ghci/prog003/C.hs
+++ b/testsuite/tests/ghci/prog003/C.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog003/D.hs b/testsuite/tests/ghci/prog003/D.hs
index a53a8c3da6..a53a8c3da6 100644
--- a/testsuite/tests/ghc-regress/ghci/prog003/D.hs
+++ b/testsuite/tests/ghci/prog003/D.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog003/D1.hs b/testsuite/tests/ghci/prog003/D1.hs
index 4414d65d2a..4414d65d2a 100644
--- a/testsuite/tests/ghc-regress/ghci/prog003/D1.hs
+++ b/testsuite/tests/ghci/prog003/D1.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog003/D2.hs b/testsuite/tests/ghci/prog003/D2.hs
index a53a8c3da6..a53a8c3da6 100644
--- a/testsuite/tests/ghc-regress/ghci/prog003/D2.hs
+++ b/testsuite/tests/ghci/prog003/D2.hs
diff --git a/testsuite/tests/ghc-regress/stranal/Makefile b/testsuite/tests/ghci/prog003/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/stranal/Makefile
+++ b/testsuite/tests/ghci/prog003/Makefile
diff --git a/testsuite/tests/ghc-regress/ghci/prog003/prog003.T b/testsuite/tests/ghci/prog003/prog003.T
index c87bc90597..c87bc90597 100644
--- a/testsuite/tests/ghc-regress/ghci/prog003/prog003.T
+++ b/testsuite/tests/ghci/prog003/prog003.T
diff --git a/testsuite/tests/ghc-regress/ghci/prog003/prog003.script b/testsuite/tests/ghci/prog003/prog003.script
index 9cdf484a59..9cdf484a59 100644
--- a/testsuite/tests/ghc-regress/ghci/prog003/prog003.script
+++ b/testsuite/tests/ghci/prog003/prog003.script
diff --git a/testsuite/tests/ghc-regress/ghci/prog003/prog003.stdout b/testsuite/tests/ghci/prog003/prog003.stdout
index dd299f34c8..dd299f34c8 100644
--- a/testsuite/tests/ghc-regress/ghci/prog003/prog003.stdout
+++ b/testsuite/tests/ghci/prog003/prog003.stdout
diff --git a/testsuite/tests/ghci/prog004/Makefile b/testsuite/tests/ghci/prog004/Makefile
new file mode 100644
index 0000000000..61631fcd48
--- /dev/null
+++ b/testsuite/tests/ghci/prog004/Makefile
@@ -0,0 +1,11 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+# Test that we can load a C object compiled with -g into GHCi.
+# (sourceforge bug #1073501).
+ghciprog004:
+	rm -f ctest.o
+	echo "int foo(){}" >ctest.c
+	'$(TEST_HC)' $(TEST_HC_OPTS) -optc-g -c ctest.c
+	echo ":q" | '$(TEST_HC)' $(TEST_HC_OPTS) -v0 --interactive -ignore-dot-ghci ctest.o
diff --git a/testsuite/tests/ghc-regress/ghci/prog004/prog004.T b/testsuite/tests/ghci/prog004/prog004.T
index a67ebf35c8..a67ebf35c8 100644
--- a/testsuite/tests/ghc-regress/ghci/prog004/prog004.T
+++ b/testsuite/tests/ghci/prog004/prog004.T
diff --git a/testsuite/tests/ghc-regress/ghci/prog005/A.hs b/testsuite/tests/ghci/prog005/A.hs
index e14d0ebe45..e14d0ebe45 100644
--- a/testsuite/tests/ghc-regress/ghci/prog005/A.hs
+++ b/testsuite/tests/ghci/prog005/A.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog005/B.hs b/testsuite/tests/ghci/prog005/B.hs
index 57b34b2be2..57b34b2be2 100644
--- a/testsuite/tests/ghc-regress/ghci/prog005/B.hs
+++ b/testsuite/tests/ghci/prog005/B.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/Makefile b/testsuite/tests/ghci/prog005/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/ghc-regress/typecheck/Makefile
+++ b/testsuite/tests/ghci/prog005/Makefile
diff --git a/testsuite/tests/ghc-regress/ghci/prog005/prog005.T b/testsuite/tests/ghci/prog005/prog005.T
index ca2bfe5237..ca2bfe5237 100644
--- a/testsuite/tests/ghc-regress/ghci/prog005/prog005.T
+++ b/testsuite/tests/ghci/prog005/prog005.T
diff --git a/testsuite/tests/ghc-regress/ghci/prog005/prog005.script b/testsuite/tests/ghci/prog005/prog005.script
index d7ca33fa83..d7ca33fa83 100644
--- a/testsuite/tests/ghc-regress/ghci/prog005/prog005.script
+++ b/testsuite/tests/ghci/prog005/prog005.script
diff --git a/testsuite/tests/ghc-regress/ghci/prog005/prog005.stdout b/testsuite/tests/ghci/prog005/prog005.stdout
index a5c8806279..a5c8806279 100644
--- a/testsuite/tests/ghc-regress/ghci/prog005/prog005.stdout
+++ b/testsuite/tests/ghci/prog005/prog005.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/prog006/A.hs b/testsuite/tests/ghci/prog006/A.hs
index cc38a11890..cc38a11890 100644
--- a/testsuite/tests/ghc-regress/ghci/prog006/A.hs
+++ b/testsuite/tests/ghci/prog006/A.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog006/Boot.hs-boot b/testsuite/tests/ghci/prog006/Boot.hs-boot
index 5d95f574d6..5d95f574d6 100644
--- a/testsuite/tests/ghc-regress/ghci/prog006/Boot.hs-boot
+++ b/testsuite/tests/ghci/prog006/Boot.hs-boot
diff --git a/testsuite/tests/ghc-regress/ghci/prog006/Boot1.hs b/testsuite/tests/ghci/prog006/Boot1.hs
index 0625737342..0625737342 100644
--- a/testsuite/tests/ghc-regress/ghci/prog006/Boot1.hs
+++ b/testsuite/tests/ghci/prog006/Boot1.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog006/Boot2.hs b/testsuite/tests/ghci/prog006/Boot2.hs
index 5e7297e448..5e7297e448 100644
--- a/testsuite/tests/ghc-regress/ghci/prog006/Boot2.hs
+++ b/testsuite/tests/ghci/prog006/Boot2.hs
diff --git a/testsuite/tests/ghci/prog006/Makefile b/testsuite/tests/ghci/prog006/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/ghci/prog006/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci/prog006/prog006.T b/testsuite/tests/ghci/prog006/prog006.T
index 04f3a7c61b..04f3a7c61b 100644
--- a/testsuite/tests/ghc-regress/ghci/prog006/prog006.T
+++ b/testsuite/tests/ghci/prog006/prog006.T
diff --git a/testsuite/tests/ghc-regress/ghci/prog006/prog006.script b/testsuite/tests/ghci/prog006/prog006.script
index 4ca4c90a3d..4ca4c90a3d 100644
--- a/testsuite/tests/ghc-regress/ghci/prog006/prog006.script
+++ b/testsuite/tests/ghci/prog006/prog006.script
diff --git a/testsuite/tests/ghc-regress/ghci/prog006/prog006.stderr b/testsuite/tests/ghci/prog006/prog006.stderr
index 472272a01e..472272a01e 100644
--- a/testsuite/tests/ghc-regress/ghci/prog006/prog006.stderr
+++ b/testsuite/tests/ghci/prog006/prog006.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/prog007/A.hs b/testsuite/tests/ghci/prog007/A.hs
index f4694d7a9c..f4694d7a9c 100644
--- a/testsuite/tests/ghc-regress/ghci/prog007/A.hs
+++ b/testsuite/tests/ghci/prog007/A.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog007/B.hs b/testsuite/tests/ghci/prog007/B.hs
index ec64b00fa4..ec64b00fa4 100644
--- a/testsuite/tests/ghc-regress/ghci/prog007/B.hs
+++ b/testsuite/tests/ghci/prog007/B.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog007/C.hs b/testsuite/tests/ghci/prog007/C.hs
index 8273d6bdda..8273d6bdda 100644
--- a/testsuite/tests/ghc-regress/ghci/prog007/C.hs
+++ b/testsuite/tests/ghci/prog007/C.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog007/C.hs-boot b/testsuite/tests/ghci/prog007/C.hs-boot
index b81773302e..b81773302e 100644
--- a/testsuite/tests/ghc-regress/ghci/prog007/C.hs-boot
+++ b/testsuite/tests/ghci/prog007/C.hs-boot
diff --git a/testsuite/tests/ghc-regress/ghci/prog007/ghci.prog007.script b/testsuite/tests/ghci/prog007/ghci.prog007.script
index 2c6d817d0c..2c6d817d0c 100644
--- a/testsuite/tests/ghc-regress/ghci/prog007/ghci.prog007.script
+++ b/testsuite/tests/ghci/prog007/ghci.prog007.script
diff --git a/testsuite/tests/ghc-regress/ghci/prog007/ghci.prog007.stdout b/testsuite/tests/ghci/prog007/ghci.prog007.stdout
index f70f10e4db..f70f10e4db 100644
--- a/testsuite/tests/ghc-regress/ghci/prog007/ghci.prog007.stdout
+++ b/testsuite/tests/ghci/prog007/ghci.prog007.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/prog007/prog007.T b/testsuite/tests/ghci/prog007/prog007.T
index 28f19e5602..28f19e5602 100644
--- a/testsuite/tests/ghc-regress/ghci/prog007/prog007.T
+++ b/testsuite/tests/ghci/prog007/prog007.T
diff --git a/testsuite/tests/ghc-regress/ghci/prog008/A.hs b/testsuite/tests/ghci/prog008/A.hs
index 0be5e1270d..0be5e1270d 100644
--- a/testsuite/tests/ghc-regress/ghci/prog008/A.hs
+++ b/testsuite/tests/ghci/prog008/A.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog008/ghci.prog008.script b/testsuite/tests/ghci/prog008/ghci.prog008.script
index 48954d2488..48954d2488 100644
--- a/testsuite/tests/ghc-regress/ghci/prog008/ghci.prog008.script
+++ b/testsuite/tests/ghci/prog008/ghci.prog008.script
diff --git a/testsuite/tests/ghc-regress/ghci/prog008/ghci.prog008.stdout b/testsuite/tests/ghci/prog008/ghci.prog008.stdout
index 99e63a1b14..99e63a1b14 100644
--- a/testsuite/tests/ghc-regress/ghci/prog008/ghci.prog008.stdout
+++ b/testsuite/tests/ghci/prog008/ghci.prog008.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/prog008/prog008.T b/testsuite/tests/ghci/prog008/prog008.T
index 96ebbfb168..96ebbfb168 100644
--- a/testsuite/tests/ghc-regress/ghci/prog008/prog008.T
+++ b/testsuite/tests/ghci/prog008/prog008.T
diff --git a/testsuite/tests/ghc-regress/ghci/prog009/A1.hs b/testsuite/tests/ghci/prog009/A1.hs
index 41644a1c54..41644a1c54 100644
--- a/testsuite/tests/ghc-regress/ghci/prog009/A1.hs
+++ b/testsuite/tests/ghci/prog009/A1.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog009/A2.hs b/testsuite/tests/ghci/prog009/A2.hs
index d843c00b78..d843c00b78 100644
--- a/testsuite/tests/ghc-regress/ghci/prog009/A2.hs
+++ b/testsuite/tests/ghci/prog009/A2.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog009/A3.hs b/testsuite/tests/ghci/prog009/A3.hs
index 4a61af00da..4a61af00da 100644
--- a/testsuite/tests/ghc-regress/ghci/prog009/A3.hs
+++ b/testsuite/tests/ghci/prog009/A3.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog009/B.hs b/testsuite/tests/ghci/prog009/B.hs
index 14580d43b3..14580d43b3 100644
--- a/testsuite/tests/ghc-regress/ghci/prog009/B.hs
+++ b/testsuite/tests/ghci/prog009/B.hs
diff --git a/testsuite/tests/ghci/prog009/Makefile b/testsuite/tests/ghci/prog009/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/ghci/prog009/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci/prog009/ghci.prog009.T b/testsuite/tests/ghci/prog009/ghci.prog009.T
index f8b063407d..f8b063407d 100644
--- a/testsuite/tests/ghc-regress/ghci/prog009/ghci.prog009.T
+++ b/testsuite/tests/ghci/prog009/ghci.prog009.T
diff --git a/testsuite/tests/ghc-regress/ghci/prog009/ghci.prog009.script b/testsuite/tests/ghci/prog009/ghci.prog009.script
index 6005727d44..6005727d44 100644
--- a/testsuite/tests/ghc-regress/ghci/prog009/ghci.prog009.script
+++ b/testsuite/tests/ghci/prog009/ghci.prog009.script
diff --git a/testsuite/tests/ghc-regress/ghci/prog009/ghci.prog009.stderr b/testsuite/tests/ghci/prog009/ghci.prog009.stderr
index 484a1b9f27..484a1b9f27 100644
--- a/testsuite/tests/ghc-regress/ghci/prog009/ghci.prog009.stderr
+++ b/testsuite/tests/ghci/prog009/ghci.prog009.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/prog009/ghci.prog009.stdout b/testsuite/tests/ghci/prog009/ghci.prog009.stdout
index 74d4c49e88..74d4c49e88 100644
--- a/testsuite/tests/ghc-regress/ghci/prog009/ghci.prog009.stdout
+++ b/testsuite/tests/ghci/prog009/ghci.prog009.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/prog010/A.hs b/testsuite/tests/ghci/prog010/A.hs
index 0a779b2cf0..0a779b2cf0 100644
--- a/testsuite/tests/ghc-regress/ghci/prog010/A.hs
+++ b/testsuite/tests/ghci/prog010/A.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog010/B.hs b/testsuite/tests/ghci/prog010/B.hs
index ce9e7e4932..ce9e7e4932 100644
--- a/testsuite/tests/ghc-regress/ghci/prog010/B.hs
+++ b/testsuite/tests/ghci/prog010/B.hs
diff --git a/testsuite/tests/ghc-regress/ghci/prog010/ghci.prog010.script b/testsuite/tests/ghci/prog010/ghci.prog010.script
index 563e471a59..563e471a59 100644
--- a/testsuite/tests/ghc-regress/ghci/prog010/ghci.prog010.script
+++ b/testsuite/tests/ghci/prog010/ghci.prog010.script
diff --git a/testsuite/tests/ghc-regress/ghci/prog010/ghci.prog010.stderr b/testsuite/tests/ghci/prog010/ghci.prog010.stderr
index c7cbb1173f..c7cbb1173f 100644
--- a/testsuite/tests/ghc-regress/ghci/prog010/ghci.prog010.stderr
+++ b/testsuite/tests/ghci/prog010/ghci.prog010.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/prog010/ghci.prog010.stdout b/testsuite/tests/ghci/prog010/ghci.prog010.stdout
index ccb6dcd78f..ccb6dcd78f 100644
--- a/testsuite/tests/ghc-regress/ghci/prog010/ghci.prog010.stdout
+++ b/testsuite/tests/ghci/prog010/ghci.prog010.stdout
diff --git a/testsuite/tests/ghci/prog011/Makefile b/testsuite/tests/ghci/prog011/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/ghci/prog011/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/ghci/prog011/prog011.T b/testsuite/tests/ghci/prog011/prog011.T
index c14d457b10..c14d457b10 100644
--- a/testsuite/tests/ghc-regress/ghci/prog011/prog011.T
+++ b/testsuite/tests/ghci/prog011/prog011.T
diff --git a/testsuite/tests/ghc-regress/ghci/prog011/prog011.hx b/testsuite/tests/ghci/prog011/prog011.hx
index a9ae3aa347..a9ae3aa347 100644
--- a/testsuite/tests/ghc-regress/ghci/prog011/prog011.hx
+++ b/testsuite/tests/ghci/prog011/prog011.hx
diff --git a/testsuite/tests/ghc-regress/ghci/prog011/prog011.script b/testsuite/tests/ghci/prog011/prog011.script
index 011093f314..011093f314 100644
--- a/testsuite/tests/ghc-regress/ghci/prog011/prog011.script
+++ b/testsuite/tests/ghci/prog011/prog011.script
diff --git a/testsuite/tests/ghc-regress/ghci/prog011/prog011.stderr b/testsuite/tests/ghci/prog011/prog011.stderr
index 6ee1facfdc..6ee1facfdc 100644
--- a/testsuite/tests/ghc-regress/ghci/prog011/prog011.stderr
+++ b/testsuite/tests/ghci/prog011/prog011.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/prog011/prog011.stdout b/testsuite/tests/ghci/prog011/prog011.stdout
index 5b3671f1f3..5b3671f1f3 100644
--- a/testsuite/tests/ghc-regress/ghci/prog011/prog011.stdout
+++ b/testsuite/tests/ghci/prog011/prog011.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/1914.script b/testsuite/tests/ghci/scripts/1914.script
index 5a74350341..5a74350341 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/1914.script
+++ b/testsuite/tests/ghci/scripts/1914.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/1914.stderr b/testsuite/tests/ghci/scripts/1914.stderr
index fe06f7e58f..fe06f7e58f 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/1914.stderr
+++ b/testsuite/tests/ghci/scripts/1914.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/1914.stdout b/testsuite/tests/ghci/scripts/1914.stdout
index 063758e39c..063758e39c 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/1914.stdout
+++ b/testsuite/tests/ghci/scripts/1914.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/2452.script b/testsuite/tests/ghci/scripts/2452.script
index 28d2bdc580..28d2bdc580 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/2452.script
+++ b/testsuite/tests/ghci/scripts/2452.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/2452.stderr b/testsuite/tests/ghci/scripts/2452.stderr
index 2802ee2bdf..2802ee2bdf 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/2452.stderr
+++ b/testsuite/tests/ghci/scripts/2452.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/2816.script b/testsuite/tests/ghci/scripts/2816.script
index 5fd8477b64..5fd8477b64 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/2816.script
+++ b/testsuite/tests/ghci/scripts/2816.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/2816.stderr b/testsuite/tests/ghci/scripts/2816.stderr
index b9c60eea43..b9c60eea43 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/2816.stderr
+++ b/testsuite/tests/ghci/scripts/2816.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/2816.stdout b/testsuite/tests/ghci/scripts/2816.stdout
index 14a53b928e..14a53b928e 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/2816.stdout
+++ b/testsuite/tests/ghci/scripts/2816.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/2976.script b/testsuite/tests/ghci/scripts/2976.script
index f4fe8d7122..f4fe8d7122 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/2976.script
+++ b/testsuite/tests/ghci/scripts/2976.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/2976.stdout b/testsuite/tests/ghci/scripts/2976.stdout
index d927ad696c..d927ad696c 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/2976.stdout
+++ b/testsuite/tests/ghci/scripts/2976.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/4051.hs b/testsuite/tests/ghci/scripts/4051.hs
index fc9974cb8e..fc9974cb8e 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/4051.hs
+++ b/testsuite/tests/ghci/scripts/4051.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/4051.script b/testsuite/tests/ghci/scripts/4051.script
index 545ce8b4d8..545ce8b4d8 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/4051.script
+++ b/testsuite/tests/ghci/scripts/4051.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/4051.stdout b/testsuite/tests/ghci/scripts/4051.stdout
index 00750edc07..00750edc07 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/4051.stdout
+++ b/testsuite/tests/ghci/scripts/4051.stdout
diff --git a/testsuite/tests/ghci/scripts/Makefile b/testsuite/tests/ghci/scripts/Makefile
new file mode 100644
index 0000000000..e3cc561b23
--- /dev/null
+++ b/testsuite/tests/ghci/scripts/Makefile
@@ -0,0 +1,33 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+ghci024:
+	@echo "~~~~~~~~~~ Testing :set"
+	printf ":set\n" \
+	    | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \
+	    | grep -E "^([^ ]|  -fno-print-explicit-foralls|  -fno-warn-implicit-prelude)"
+	@echo "~~~~~~~~~~ Testing :show languages"
+	printf ":show languages\n" \
+	    | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \
+	    | grep -E "^([^ ]|  -XImplicitPrelude|  -XMagicHash)"
+	@echo "~~~~~~~~~~ Testing :show languages, with -XMagicHash"
+	printf ":set -XMagicHash\n:show languages\n" \
+	    | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \
+	    | grep -E "^([^ ]|  -XImplicitPrelude|  -XMagicHash)"
+	@echo "~~~~~~~~~~ Testing :show packages"
+	printf ":show packages\n" \
+	    | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \
+	    | grep -E "^([^ ]|  -package|base|ghc-prim|integer|rts|Cabal)" \
+	    | sed "s/Cabal-[0-9.]*/Cabal-VERSION/"
+	@echo "~~~~~~~~~~ Testing :show packages, including the ghc package"
+	printf ":set -package ghc\n:show packages\n" \
+	    | '$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci \
+	    | grep -E "^([^ ]|  -package|base|ghc-prim|integer|rts|Cabal)" \
+	    | sed "s/Cabal-[0-9.]*/Cabal-VERSION/"
+
+.PHONY: ghci037
+ghci037:
+	'$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci                   < ghci037.script
+	'$(TEST_HC)' $(TEST_HC_OPTS) --interactive -v0 -ignore-dot-ghci -fno-ghci-sandbox < ghci037.script
+
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T2766.script b/testsuite/tests/ghci/scripts/T2766.script
index 87e9bb3918..87e9bb3918 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T2766.script
+++ b/testsuite/tests/ghci/scripts/T2766.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T2766.stdout b/testsuite/tests/ghci/scripts/T2766.stdout
index abe1ca2c95..abe1ca2c95 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T2766.stdout
+++ b/testsuite/tests/ghci/scripts/T2766.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T3263.hs b/testsuite/tests/ghci/scripts/T3263.hs
index 237cf42c6d..237cf42c6d 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T3263.hs
+++ b/testsuite/tests/ghci/scripts/T3263.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T3263.script b/testsuite/tests/ghci/scripts/T3263.script
index dc13aa6732..dc13aa6732 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T3263.script
+++ b/testsuite/tests/ghci/scripts/T3263.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T3263.stderr b/testsuite/tests/ghci/scripts/T3263.stderr
index a7924e4b7f..a7924e4b7f 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T3263.stderr
+++ b/testsuite/tests/ghci/scripts/T3263.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T4015.hs b/testsuite/tests/ghci/scripts/T4015.hs
index d2968db317..d2968db317 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T4015.hs
+++ b/testsuite/tests/ghci/scripts/T4015.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T4015.script b/testsuite/tests/ghci/scripts/T4015.script
index 0ab6f33d1a..0ab6f33d1a 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T4015.script
+++ b/testsuite/tests/ghci/scripts/T4015.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T4015.stdout b/testsuite/tests/ghci/scripts/T4015.stdout
index e850fb9384..e850fb9384 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T4015.stdout
+++ b/testsuite/tests/ghci/scripts/T4015.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T4087.hs b/testsuite/tests/ghci/scripts/T4087.hs
index b992a9bb20..b992a9bb20 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T4087.hs
+++ b/testsuite/tests/ghci/scripts/T4087.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T4087.script b/testsuite/tests/ghci/scripts/T4087.script
index d1b32ab266..d1b32ab266 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T4087.script
+++ b/testsuite/tests/ghci/scripts/T4087.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T4087.stdout b/testsuite/tests/ghci/scripts/T4087.stdout
index d3e3ae9abd..d3e3ae9abd 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T4087.stdout
+++ b/testsuite/tests/ghci/scripts/T4087.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T4127.script b/testsuite/tests/ghci/scripts/T4127.script
index 03eb490544..03eb490544 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T4127.script
+++ b/testsuite/tests/ghci/scripts/T4127.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T4127.stdout b/testsuite/tests/ghci/scripts/T4127.stdout
index 9c8f7a1098..9c8f7a1098 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T4127.stdout
+++ b/testsuite/tests/ghci/scripts/T4127.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T4127a.script b/testsuite/tests/ghci/scripts/T4127a.script
index 3712c6a184..3712c6a184 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T4127a.script
+++ b/testsuite/tests/ghci/scripts/T4127a.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T4127a.stderr b/testsuite/tests/ghci/scripts/T4127a.stderr
index bd96443381..bd96443381 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T4127a.stderr
+++ b/testsuite/tests/ghci/scripts/T4127a.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T4316.script b/testsuite/tests/ghci/scripts/T4316.script
index b620aac653..b620aac653 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T4316.script
+++ b/testsuite/tests/ghci/scripts/T4316.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T4316.stdout b/testsuite/tests/ghci/scripts/T4316.stdout
index 06891cb2df..06891cb2df 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T4316.stdout
+++ b/testsuite/tests/ghci/scripts/T4316.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T4832.script b/testsuite/tests/ghci/scripts/T4832.script
index 27b1c2fe4a..27b1c2fe4a 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T4832.script
+++ b/testsuite/tests/ghci/scripts/T4832.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T4832.stdout b/testsuite/tests/ghci/scripts/T4832.stdout
index 6a452c185a..6a452c185a 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T4832.stdout
+++ b/testsuite/tests/ghci/scripts/T4832.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T5045.hs b/testsuite/tests/ghci/scripts/T5045.hs
index a63bead315..a63bead315 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T5045.hs
+++ b/testsuite/tests/ghci/scripts/T5045.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T5045.script b/testsuite/tests/ghci/scripts/T5045.script
index 34e9a58f5a..34e9a58f5a 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T5045.script
+++ b/testsuite/tests/ghci/scripts/T5045.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T5130.script b/testsuite/tests/ghci/scripts/T5130.script
index cb4e9d0d6b..cb4e9d0d6b 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T5130.script
+++ b/testsuite/tests/ghci/scripts/T5130.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T5130.stderr b/testsuite/tests/ghci/scripts/T5130.stderr
index cf9e6b40ce..cf9e6b40ce 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T5130.stderr
+++ b/testsuite/tests/ghci/scripts/T5130.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T789.hs b/testsuite/tests/ghci/scripts/T789.hs
index 5cb8e4e1ad..5cb8e4e1ad 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T789.hs
+++ b/testsuite/tests/ghci/scripts/T789.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T789.script b/testsuite/tests/ghci/scripts/T789.script
index d8e2a3a00b..d8e2a3a00b 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T789.script
+++ b/testsuite/tests/ghci/scripts/T789.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/T789.stdout b/testsuite/tests/ghci/scripts/T789.stdout
index 045c1c6b12..045c1c6b12 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/T789.stdout
+++ b/testsuite/tests/ghci/scripts/T789.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T
index f3ddbffc6a..f3ddbffc6a 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/all.T
+++ b/testsuite/tests/ghci/scripts/all.T
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci001.script b/testsuite/tests/ghci/scripts/ghci001.script
index 0902a0ccd1..0902a0ccd1 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci001.script
+++ b/testsuite/tests/ghci/scripts/ghci001.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci001.stdout b/testsuite/tests/ghci/scripts/ghci001.stdout
index b0a2458b59..b0a2458b59 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci001.stdout
+++ b/testsuite/tests/ghci/scripts/ghci001.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci002.script b/testsuite/tests/ghci/scripts/ghci002.script
index 3c0ec29eae..3c0ec29eae 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci002.script
+++ b/testsuite/tests/ghci/scripts/ghci002.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci002.stdout b/testsuite/tests/ghci/scripts/ghci002.stdout
index 815d6689fe..815d6689fe 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci002.stdout
+++ b/testsuite/tests/ghci/scripts/ghci002.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci003.script b/testsuite/tests/ghci/scripts/ghci003.script
index 08d0114de4..08d0114de4 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci003.script
+++ b/testsuite/tests/ghci/scripts/ghci003.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci003.stdout b/testsuite/tests/ghci/scripts/ghci003.stdout
index 6d07eb1b81..6d07eb1b81 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci003.stdout
+++ b/testsuite/tests/ghci/scripts/ghci003.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci004.hs b/testsuite/tests/ghci/scripts/ghci004.hs
index 6406a11565..6406a11565 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci004.hs
+++ b/testsuite/tests/ghci/scripts/ghci004.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci004.script b/testsuite/tests/ghci/scripts/ghci004.script
index 4949629935..4949629935 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci004.script
+++ b/testsuite/tests/ghci/scripts/ghci004.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci004.stderr b/testsuite/tests/ghci/scripts/ghci004.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci004.stderr
+++ b/testsuite/tests/ghci/scripts/ghci004.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci004.stdout b/testsuite/tests/ghci/scripts/ghci004.stdout
index 0aec69a0c1..0aec69a0c1 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci004.stdout
+++ b/testsuite/tests/ghci/scripts/ghci004.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci005.script b/testsuite/tests/ghci/scripts/ghci005.script
index e31b6fc9b7..e31b6fc9b7 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci005.script
+++ b/testsuite/tests/ghci/scripts/ghci005.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci005.stdout b/testsuite/tests/ghci/scripts/ghci005.stdout
index e94f822e46..e94f822e46 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci005.stdout
+++ b/testsuite/tests/ghci/scripts/ghci005.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci006.hs b/testsuite/tests/ghci/scripts/ghci006.hs
index c1bef51070..c1bef51070 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci006.hs
+++ b/testsuite/tests/ghci/scripts/ghci006.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci006.script b/testsuite/tests/ghci/scripts/ghci006.script
index adccf3114c..adccf3114c 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci006.script
+++ b/testsuite/tests/ghci/scripts/ghci006.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci006.stderr b/testsuite/tests/ghci/scripts/ghci006.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci006.stderr
+++ b/testsuite/tests/ghci/scripts/ghci006.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci006.stdout b/testsuite/tests/ghci/scripts/ghci006.stdout
index 359e72fb1b..359e72fb1b 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci006.stdout
+++ b/testsuite/tests/ghci/scripts/ghci006.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci007.script b/testsuite/tests/ghci/scripts/ghci007.script
index a4819aab50..a4819aab50 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci007.script
+++ b/testsuite/tests/ghci/scripts/ghci007.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci007.stdout b/testsuite/tests/ghci/scripts/ghci007.stdout
index 59eac9cfdb..59eac9cfdb 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci007.stdout
+++ b/testsuite/tests/ghci/scripts/ghci007.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci008.script b/testsuite/tests/ghci/scripts/ghci008.script
index 8bbee9d58b..8bbee9d58b 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci008.script
+++ b/testsuite/tests/ghci/scripts/ghci008.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci008.stdout b/testsuite/tests/ghci/scripts/ghci008.stdout
index 000f254070..000f254070 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci008.stdout
+++ b/testsuite/tests/ghci/scripts/ghci008.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci009.script b/testsuite/tests/ghci/scripts/ghci009.script
index ecb635c704..ecb635c704 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci009.script
+++ b/testsuite/tests/ghci/scripts/ghci009.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci009.stdout b/testsuite/tests/ghci/scripts/ghci009.stdout
index 3d40fb8d99..3d40fb8d99 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci009.stdout
+++ b/testsuite/tests/ghci/scripts/ghci009.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci010.script b/testsuite/tests/ghci/scripts/ghci010.script
index 56b99062db..56b99062db 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci010.script
+++ b/testsuite/tests/ghci/scripts/ghci010.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci010.stdout b/testsuite/tests/ghci/scripts/ghci010.stdout
index b0be06f788..b0be06f788 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci010.stdout
+++ b/testsuite/tests/ghci/scripts/ghci010.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci011.script b/testsuite/tests/ghci/scripts/ghci011.script
index 0c147736f0..0c147736f0 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci011.script
+++ b/testsuite/tests/ghci/scripts/ghci011.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci011.stdout b/testsuite/tests/ghci/scripts/ghci011.stdout
index 840bb18a4d..840bb18a4d 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci011.stdout
+++ b/testsuite/tests/ghci/scripts/ghci011.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci012.script b/testsuite/tests/ghci/scripts/ghci012.script
index d2548dd670..d2548dd670 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci012.script
+++ b/testsuite/tests/ghci/scripts/ghci012.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci012.stdout b/testsuite/tests/ghci/scripts/ghci012.stdout
index 98780e4152..98780e4152 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci012.stdout
+++ b/testsuite/tests/ghci/scripts/ghci012.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci013.script b/testsuite/tests/ghci/scripts/ghci013.script
index eec0af840a..eec0af840a 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci013.script
+++ b/testsuite/tests/ghci/scripts/ghci013.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci013.stdout b/testsuite/tests/ghci/scripts/ghci013.stdout
index 5daf16ee23..5daf16ee23 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci013.stdout
+++ b/testsuite/tests/ghci/scripts/ghci013.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci014.hs b/testsuite/tests/ghci/scripts/ghci014.hs
index dd668cff3b..dd668cff3b 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci014.hs
+++ b/testsuite/tests/ghci/scripts/ghci014.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci014.script b/testsuite/tests/ghci/scripts/ghci014.script
index e1c6193ac1..e1c6193ac1 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci014.script
+++ b/testsuite/tests/ghci/scripts/ghci014.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci014.stdout b/testsuite/tests/ghci/scripts/ghci014.stdout
index 324972da57..324972da57 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci014.stdout
+++ b/testsuite/tests/ghci/scripts/ghci014.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci015.hs b/testsuite/tests/ghci/scripts/ghci015.hs
index 0ff637f046..0ff637f046 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci015.hs
+++ b/testsuite/tests/ghci/scripts/ghci015.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci015.script b/testsuite/tests/ghci/scripts/ghci015.script
index 320f930276..320f930276 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci015.script
+++ b/testsuite/tests/ghci/scripts/ghci015.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci015.stdout b/testsuite/tests/ghci/scripts/ghci015.stdout
index dd8584cd33..dd8584cd33 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci015.stdout
+++ b/testsuite/tests/ghci/scripts/ghci015.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci016.hs b/testsuite/tests/ghci/scripts/ghci016.hs
index 2740a66517..2740a66517 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci016.hs
+++ b/testsuite/tests/ghci/scripts/ghci016.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci016.script b/testsuite/tests/ghci/scripts/ghci016.script
index b0fc578813..b0fc578813 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci016.script
+++ b/testsuite/tests/ghci/scripts/ghci016.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci016.stdout b/testsuite/tests/ghci/scripts/ghci016.stdout
index 62a6e3c9df..62a6e3c9df 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci016.stdout
+++ b/testsuite/tests/ghci/scripts/ghci016.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci017.script b/testsuite/tests/ghci/scripts/ghci017.script
index 6a452c185a..6a452c185a 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci017.script
+++ b/testsuite/tests/ghci/scripts/ghci017.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci017.stdout b/testsuite/tests/ghci/scripts/ghci017.stdout
index 6a452c185a..6a452c185a 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci017.stdout
+++ b/testsuite/tests/ghci/scripts/ghci017.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci018.script b/testsuite/tests/ghci/scripts/ghci018.script
index 7eea11e3c3..7eea11e3c3 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci018.script
+++ b/testsuite/tests/ghci/scripts/ghci018.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci018.stdout b/testsuite/tests/ghci/scripts/ghci018.stdout
index 6b97cd261f..6b97cd261f 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci018.stdout
+++ b/testsuite/tests/ghci/scripts/ghci018.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci019.hs b/testsuite/tests/ghci/scripts/ghci019.hs
index f1ea575566..f1ea575566 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci019.hs
+++ b/testsuite/tests/ghci/scripts/ghci019.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci019.script b/testsuite/tests/ghci/scripts/ghci019.script
index b74e7c5ab9..b74e7c5ab9 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci019.script
+++ b/testsuite/tests/ghci/scripts/ghci019.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci019.stdout b/testsuite/tests/ghci/scripts/ghci019.stdout
index fa4027070c..fa4027070c 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci019.stdout
+++ b/testsuite/tests/ghci/scripts/ghci019.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci020.script b/testsuite/tests/ghci/scripts/ghci020.script
index 6fdfb52def..6fdfb52def 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci020.script
+++ b/testsuite/tests/ghci/scripts/ghci020.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci020.stdout b/testsuite/tests/ghci/scripts/ghci020.stdout
index 30f3bf6083..30f3bf6083 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci020.stdout
+++ b/testsuite/tests/ghci/scripts/ghci020.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci021.script b/testsuite/tests/ghci/scripts/ghci021.script
index c2c4dec5d1..c2c4dec5d1 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci021.script
+++ b/testsuite/tests/ghci/scripts/ghci021.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci021.stderr b/testsuite/tests/ghci/scripts/ghci021.stderr
index ae7c75b6bb..ae7c75b6bb 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci021.stderr
+++ b/testsuite/tests/ghci/scripts/ghci021.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci021.stdout b/testsuite/tests/ghci/scripts/ghci021.stdout
index 67fe32dafe..67fe32dafe 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci021.stdout
+++ b/testsuite/tests/ghci/scripts/ghci021.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci022.hs b/testsuite/tests/ghci/scripts/ghci022.hs
index d49fdba319..d49fdba319 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci022.hs
+++ b/testsuite/tests/ghci/scripts/ghci022.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci022.script b/testsuite/tests/ghci/scripts/ghci022.script
index ccefc3c83b..ccefc3c83b 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci022.script
+++ b/testsuite/tests/ghci/scripts/ghci022.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci022.stderr b/testsuite/tests/ghci/scripts/ghci022.stderr
index 138460c99f..138460c99f 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci022.stderr
+++ b/testsuite/tests/ghci/scripts/ghci022.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci022.stdout b/testsuite/tests/ghci/scripts/ghci022.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci022.stdout
+++ b/testsuite/tests/ghci/scripts/ghci022.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci023.ghci b/testsuite/tests/ghci/scripts/ghci023.ghci
index 83363a3ddc..83363a3ddc 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci023.ghci
+++ b/testsuite/tests/ghci/scripts/ghci023.ghci
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci023.script b/testsuite/tests/ghci/scripts/ghci023.script
index dd77433af7..dd77433af7 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci023.script
+++ b/testsuite/tests/ghci/scripts/ghci023.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci023.stdout b/testsuite/tests/ghci/scripts/ghci023.stdout
index 855695af06..855695af06 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci023.stdout
+++ b/testsuite/tests/ghci/scripts/ghci023.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci024.script b/testsuite/tests/ghci/scripts/ghci024.script
index f1c9286991..f1c9286991 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci024.script
+++ b/testsuite/tests/ghci/scripts/ghci024.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci024.stderr b/testsuite/tests/ghci/scripts/ghci024.stderr
index 425c02baba..425c02baba 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci024.stderr
+++ b/testsuite/tests/ghci/scripts/ghci024.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci024.stdout b/testsuite/tests/ghci/scripts/ghci024.stdout
index 9f3fe7b999..9f3fe7b999 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci024.stdout
+++ b/testsuite/tests/ghci/scripts/ghci024.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci025.hs b/testsuite/tests/ghci/scripts/ghci025.hs
index 0e1bc7e2c5..0e1bc7e2c5 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci025.hs
+++ b/testsuite/tests/ghci/scripts/ghci025.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci025.script b/testsuite/tests/ghci/scripts/ghci025.script
index 40f3e475be..40f3e475be 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci025.script
+++ b/testsuite/tests/ghci/scripts/ghci025.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci025.stdout b/testsuite/tests/ghci/scripts/ghci025.stdout
index 2c8a9835dd..2c8a9835dd 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci025.stdout
+++ b/testsuite/tests/ghci/scripts/ghci025.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci025.stdout-ghc-7.0 b/testsuite/tests/ghci/scripts/ghci025.stdout-ghc-7.0
index d06660c3ef..d06660c3ef 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci025.stdout-ghc-7.0
+++ b/testsuite/tests/ghci/scripts/ghci025.stdout-ghc-7.0
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci026.script b/testsuite/tests/ghci/scripts/ghci026.script
index 871de86741..871de86741 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci026.script
+++ b/testsuite/tests/ghci/scripts/ghci026.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci026.stdout b/testsuite/tests/ghci/scripts/ghci026.stdout
index 163cca29b6..163cca29b6 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci026.stdout
+++ b/testsuite/tests/ghci/scripts/ghci026.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci027.hs b/testsuite/tests/ghci/scripts/ghci027.hs
index df99d7d1c0..df99d7d1c0 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci027.hs
+++ b/testsuite/tests/ghci/scripts/ghci027.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci027.script b/testsuite/tests/ghci/scripts/ghci027.script
index aaf0ac5544..aaf0ac5544 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci027.script
+++ b/testsuite/tests/ghci/scripts/ghci027.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci027.stdout b/testsuite/tests/ghci/scripts/ghci027.stdout
index 2f627b46ec..2f627b46ec 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci027.stdout
+++ b/testsuite/tests/ghci/scripts/ghci027.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci027_1.hs b/testsuite/tests/ghci/scripts/ghci027_1.hs
index a1a7bfac37..a1a7bfac37 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci027_1.hs
+++ b/testsuite/tests/ghci/scripts/ghci027_1.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci027_2.hs b/testsuite/tests/ghci/scripts/ghci027_2.hs
index df99d7d1c0..df99d7d1c0 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci027_2.hs
+++ b/testsuite/tests/ghci/scripts/ghci027_2.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci028.script b/testsuite/tests/ghci/scripts/ghci028.script
index 5f527c13f6..5f527c13f6 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci028.script
+++ b/testsuite/tests/ghci/scripts/ghci028.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci028.stdout b/testsuite/tests/ghci/scripts/ghci028.stdout
index a6ed183d5f..a6ed183d5f 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci028.stdout
+++ b/testsuite/tests/ghci/scripts/ghci028.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci029.script b/testsuite/tests/ghci/scripts/ghci029.script
index e669b278e0..e669b278e0 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci029.script
+++ b/testsuite/tests/ghci/scripts/ghci029.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci029.stdout b/testsuite/tests/ghci/scripts/ghci029.stdout
index 05cc525d47..05cc525d47 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci029.stdout
+++ b/testsuite/tests/ghci/scripts/ghci029.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci030.hs b/testsuite/tests/ghci/scripts/ghci030.hs
index ed95ea9661..ed95ea9661 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci030.hs
+++ b/testsuite/tests/ghci/scripts/ghci030.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci030.script b/testsuite/tests/ghci/scripts/ghci030.script
index b0821e8388..b0821e8388 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci030.script
+++ b/testsuite/tests/ghci/scripts/ghci030.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci030.stdout b/testsuite/tests/ghci/scripts/ghci030.stdout
index 24fa768e6a..24fa768e6a 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci030.stdout
+++ b/testsuite/tests/ghci/scripts/ghci030.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci031.hs b/testsuite/tests/ghci/scripts/ghci031.hs
index ef5d985f75..ef5d985f75 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci031.hs
+++ b/testsuite/tests/ghci/scripts/ghci031.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci031.script b/testsuite/tests/ghci/scripts/ghci031.script
index 23cba64bac..23cba64bac 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci031.script
+++ b/testsuite/tests/ghci/scripts/ghci031.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci031.stderr b/testsuite/tests/ghci/scripts/ghci031.stderr
index 8e4256c7f4..8e4256c7f4 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci031.stderr
+++ b/testsuite/tests/ghci/scripts/ghci031.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci031.stdout b/testsuite/tests/ghci/scripts/ghci031.stdout
index 018dc4bc58..018dc4bc58 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci031.stdout
+++ b/testsuite/tests/ghci/scripts/ghci031.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci032.script b/testsuite/tests/ghci/scripts/ghci032.script
index cea8afff15..cea8afff15 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci032.script
+++ b/testsuite/tests/ghci/scripts/ghci032.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci032.stdout b/testsuite/tests/ghci/scripts/ghci032.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci032.stdout
+++ b/testsuite/tests/ghci/scripts/ghci032.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci033.hs b/testsuite/tests/ghci/scripts/ghci033.hs
index b67960068d..b67960068d 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci033.hs
+++ b/testsuite/tests/ghci/scripts/ghci033.hs
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci033.script b/testsuite/tests/ghci/scripts/ghci033.script
index 3911618777..3911618777 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci033.script
+++ b/testsuite/tests/ghci/scripts/ghci033.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci033.stdout b/testsuite/tests/ghci/scripts/ghci033.stdout
index 748fab88b3..748fab88b3 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci033.stdout
+++ b/testsuite/tests/ghci/scripts/ghci033.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci034.script b/testsuite/tests/ghci/scripts/ghci034.script
index 386760081f..386760081f 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci034.script
+++ b/testsuite/tests/ghci/scripts/ghci034.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci034.stderr b/testsuite/tests/ghci/scripts/ghci034.stderr
index 59501b2443..59501b2443 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci034.stderr
+++ b/testsuite/tests/ghci/scripts/ghci034.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci034.stdout b/testsuite/tests/ghci/scripts/ghci034.stdout
index bc56c4d894..bc56c4d894 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci034.stdout
+++ b/testsuite/tests/ghci/scripts/ghci034.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci035.script b/testsuite/tests/ghci/scripts/ghci035.script
index dcf5adc0de..dcf5adc0de 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci035.script
+++ b/testsuite/tests/ghci/scripts/ghci035.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci035.stdout b/testsuite/tests/ghci/scripts/ghci035.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci035.stdout
+++ b/testsuite/tests/ghci/scripts/ghci035.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci036.script b/testsuite/tests/ghci/scripts/ghci036.script
index 3615e07252..3615e07252 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci036.script
+++ b/testsuite/tests/ghci/scripts/ghci036.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci036.stderr b/testsuite/tests/ghci/scripts/ghci036.stderr
index 2470e3402b..2470e3402b 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci036.stderr
+++ b/testsuite/tests/ghci/scripts/ghci036.stderr
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci036.stdout b/testsuite/tests/ghci/scripts/ghci036.stdout
index 739118210d..739118210d 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci036.stdout
+++ b/testsuite/tests/ghci/scripts/ghci036.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci037.script b/testsuite/tests/ghci/scripts/ghci037.script
index 1407625632..1407625632 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci037.script
+++ b/testsuite/tests/ghci/scripts/ghci037.script
diff --git a/testsuite/tests/ghc-regress/ghci/scripts/ghci037.stdout b/testsuite/tests/ghci/scripts/ghci037.stdout
index 91d6f80f27..91d6f80f27 100644
--- a/testsuite/tests/ghc-regress/ghci/scripts/ghci037.stdout
+++ b/testsuite/tests/ghci/scripts/ghci037.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/shell.hs b/testsuite/tests/ghci/shell.hs
index 75f78342a4..75f78342a4 100644
--- a/testsuite/tests/ghc-regress/ghci/shell.hs
+++ b/testsuite/tests/ghci/shell.hs
diff --git a/testsuite/tests/ghc-regress/ghci/should_run/2589.hs b/testsuite/tests/ghci/should_run/2589.hs
index eadb9995e1..eadb9995e1 100644
--- a/testsuite/tests/ghc-regress/ghci/should_run/2589.hs
+++ b/testsuite/tests/ghci/should_run/2589.hs
diff --git a/testsuite/tests/ghc-regress/ghci/should_run/2589.stdout b/testsuite/tests/ghci/should_run/2589.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/ghci/should_run/2589.stdout
+++ b/testsuite/tests/ghci/should_run/2589.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/should_run/2881.hs b/testsuite/tests/ghci/should_run/2881.hs
index 94ecfa6a00..94ecfa6a00 100644
--- a/testsuite/tests/ghc-regress/ghci/should_run/2881.hs
+++ b/testsuite/tests/ghci/should_run/2881.hs
diff --git a/testsuite/tests/ghc-regress/ghci/should_run/2881.stdout b/testsuite/tests/ghci/should_run/2881.stdout
index 06a735b308..06a735b308 100644
--- a/testsuite/tests/ghc-regress/ghci/should_run/2881.stdout
+++ b/testsuite/tests/ghci/should_run/2881.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/should_run/3171.stdout b/testsuite/tests/ghci/should_run/3171.stdout
index c83176a2cf..c83176a2cf 100644
--- a/testsuite/tests/ghc-regress/ghci/should_run/3171.stdout
+++ b/testsuite/tests/ghci/should_run/3171.stdout
diff --git a/testsuite/tests/ghci/should_run/Makefile b/testsuite/tests/ghci/should_run/Makefile
new file mode 100644
index 0000000000..3354196188
--- /dev/null
+++ b/testsuite/tests/ghci/should_run/Makefile
@@ -0,0 +1,9 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+# Test that threadDelay can be interrupted by ^C.
+3171:
+	echo "do Control.Concurrent.threadDelay 3000000; putStrLn \"threadDelay was not interrupted\"" | \
+	"$(TEST_HC)" $(TEST_HC_OPTS) -ignore-dot-ghci -v0 --interactive 2>3171.err & \
+	sleep 2; kill -INT $$!; wait
diff --git a/testsuite/tests/ghc-regress/ghci/should_run/all.T b/testsuite/tests/ghci/should_run/all.T
index 41d65f2e32..41d65f2e32 100644
--- a/testsuite/tests/ghc-regress/ghci/should_run/all.T
+++ b/testsuite/tests/ghci/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/ghci/should_run/ghcirun001.hs b/testsuite/tests/ghci/should_run/ghcirun001.hs
index af193ecb97..af193ecb97 100644
--- a/testsuite/tests/ghc-regress/ghci/should_run/ghcirun001.hs
+++ b/testsuite/tests/ghci/should_run/ghcirun001.hs
diff --git a/testsuite/tests/ghc-regress/ghci/should_run/ghcirun001.stdout b/testsuite/tests/ghci/should_run/ghcirun001.stdout
index 0558f45ba9..0558f45ba9 100644
--- a/testsuite/tests/ghc-regress/ghci/should_run/ghcirun001.stdout
+++ b/testsuite/tests/ghci/should_run/ghcirun001.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/should_run/ghcirun002.hs b/testsuite/tests/ghci/should_run/ghcirun002.hs
index d744359ed1..d744359ed1 100644
--- a/testsuite/tests/ghc-regress/ghci/should_run/ghcirun002.hs
+++ b/testsuite/tests/ghci/should_run/ghcirun002.hs
diff --git a/testsuite/tests/ghc-regress/ghci/should_run/ghcirun002.stdout b/testsuite/tests/ghci/should_run/ghcirun002.stdout
index 30ca057963..30ca057963 100644
--- a/testsuite/tests/ghc-regress/ghci/should_run/ghcirun002.stdout
+++ b/testsuite/tests/ghci/should_run/ghcirun002.stdout
diff --git a/testsuite/tests/ghc-regress/ghci/should_run/ghcirun003.hs b/testsuite/tests/ghci/should_run/ghcirun003.hs
index 1087188305..1087188305 100644
--- a/testsuite/tests/ghc-regress/ghci/should_run/ghcirun003.hs
+++ b/testsuite/tests/ghci/should_run/ghcirun003.hs
diff --git a/testsuite/tests/ghc-regress/ghci/should_run/ghcirun003.stdout b/testsuite/tests/ghci/should_run/ghcirun003.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/ghci/should_run/ghcirun003.stdout
+++ b/testsuite/tests/ghci/should_run/ghcirun003.stdout
diff --git a/testsuite/tests/haddock/Makefile b/testsuite/tests/haddock/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/haddock/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/haddock/haddock_examples/Hidden.hs b/testsuite/tests/haddock/haddock_examples/Hidden.hs
index d30925b10e..d30925b10e 100644
--- a/testsuite/tests/ghc-regress/haddock/haddock_examples/Hidden.hs
+++ b/testsuite/tests/haddock/haddock_examples/Hidden.hs
diff --git a/testsuite/tests/haddock/haddock_examples/Makefile b/testsuite/tests/haddock/haddock_examples/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/haddock/haddock_examples/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/haddock/haddock_examples/Test.hs b/testsuite/tests/haddock/haddock_examples/Test.hs
index 8336cb543d..8336cb543d 100644
--- a/testsuite/tests/ghc-regress/haddock/haddock_examples/Test.hs
+++ b/testsuite/tests/haddock/haddock_examples/Test.hs
diff --git a/testsuite/tests/ghc-regress/haddock/haddock_examples/Visible.hs b/testsuite/tests/haddock/haddock_examples/Visible.hs
index cad719315f..cad719315f 100644
--- a/testsuite/tests/ghc-regress/haddock/haddock_examples/Visible.hs
+++ b/testsuite/tests/haddock/haddock_examples/Visible.hs
diff --git a/testsuite/tests/ghc-regress/haddock/haddock_examples/haddock.Test.stderr b/testsuite/tests/haddock/haddock_examples/haddock.Test.stderr
index ddc289f161..ddc289f161 100644
--- a/testsuite/tests/ghc-regress/haddock/haddock_examples/haddock.Test.stderr
+++ b/testsuite/tests/haddock/haddock_examples/haddock.Test.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/haddock_examples/header.h b/testsuite/tests/haddock/haddock_examples/header.h
index 0125eb3bfd..0125eb3bfd 100644
--- a/testsuite/tests/ghc-regress/haddock/haddock_examples/header.h
+++ b/testsuite/tests/haddock/haddock_examples/header.h
diff --git a/testsuite/tests/ghc-regress/haddock/haddock_examples/test.T b/testsuite/tests/haddock/haddock_examples/test.T
index 856bf73bfd..856bf73bfd 100644
--- a/testsuite/tests/ghc-regress/haddock/haddock_examples/test.T
+++ b/testsuite/tests/haddock/haddock_examples/test.T
diff --git a/testsuite/tests/haddock/should_compile_flag_haddock/Makefile b/testsuite/tests/haddock/should_compile_flag_haddock/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/all.T b/testsuite/tests/haddock/should_compile_flag_haddock/all.T
index ed77310fd5..ed77310fd5 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/all.T
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/all.T
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA001.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA001.hs
index 8710c20eee..8710c20eee 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA001.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA001.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA001.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA001.stderr
index 679876f821..679876f821 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA001.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA001.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA002.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA002.hs
index e6ab145eb5..e6ab145eb5 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA002.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA002.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA002.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA002.stderr
index 8ad5a91566..8ad5a91566 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA002.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA002.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA003.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA003.hs
index 54af6d73b4..54af6d73b4 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA003.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA003.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA003.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA003.stderr
index 8ad5a91566..8ad5a91566 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA003.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA003.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA004.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA004.hs
index 4311798859..4311798859 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA004.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA004.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA004.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA004.stderr
index 8ad5a91566..8ad5a91566 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA004.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA004.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA005.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA005.hs
index 4c854505ca..4c854505ca 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA005.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA005.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA005.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA005.stderr
index 8fced3ae43..8fced3ae43 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA005.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA005.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA006.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA006.hs
index 518c598b38..518c598b38 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA006.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA006.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA006.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA006.stderr
index 43971dfd1d..43971dfd1d 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA006.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA006.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA007.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA007.hs
index c6098072bf..c6098072bf 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA007.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA007.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA007.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA007.stderr
index 8ad5a91566..8ad5a91566 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA007.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA007.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA008.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA008.hs
index ca17e8de4b..ca17e8de4b 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA008.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA008.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA008.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA008.stderr
index 8ad5a91566..8ad5a91566 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA008.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA008.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA009.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA009.hs
index 67ef8ff570..67ef8ff570 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA009.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA009.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA009.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA009.stderr
index 8ad5a91566..8ad5a91566 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA009.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA009.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA010.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA010.hs
index 943b28e485..943b28e485 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA010.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA010.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA010.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA010.stderr
index 8ad5a91566..8ad5a91566 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA010.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA010.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA011.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA011.hs
index 5efa2db249..5efa2db249 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA011.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA011.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA011.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA011.stderr
index 8ad5a91566..8ad5a91566 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA011.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA011.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA012.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA012.hs
index c392d85211..c392d85211 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA012.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA012.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA012.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA012.stderr
index 56736ccbca..56736ccbca 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA012.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA012.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA013.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA013.hs
index 224e38d360..224e38d360 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA013.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA013.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA013.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA013.stderr
index ea9837b3c8..ea9837b3c8 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA013.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA013.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA014.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA014.hs
index 880264f60b..880264f60b 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA014.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA014.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA014.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA014.stderr
index f71f89a89e..f71f89a89e 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA014.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA014.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA015.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA015.hs
index b4b47be108..b4b47be108 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA015.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA015.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA015.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA015.stderr
index 356d5b73bf..356d5b73bf 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA015.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA015.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA016.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA016.hs
index ffe02923ea..ffe02923ea 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA016.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA016.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA016.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA016.stderr
index 1f436a7bec..1f436a7bec 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA016.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA016.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA017.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA017.hs
index 75d859a1c7..75d859a1c7 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA017.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA017.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA017.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA017.stderr
index 3fd476b166..3fd476b166 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA017.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA017.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA018.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA018.hs
index c8b6f52d42..c8b6f52d42 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA018.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA018.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA018.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA018.stderr
index 1f436a7bec..1f436a7bec 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA018.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA018.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA019.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA019.hs
index 7e5e98be8d..7e5e98be8d 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA019.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA019.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA019.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA019.stderr
index 68e7b4f225..68e7b4f225 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA019.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA019.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA020.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA020.hs
index 31b38da179..31b38da179 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA020.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA020.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA020.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA020.stderr
index 20c628006d..20c628006d 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA020.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA020.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA021.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA021.hs
index ac12f30d6b..ac12f30d6b 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA021.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA021.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA021.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA021.stderr
index edf523dfa2..edf523dfa2 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA021.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA021.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA022.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA022.hs
index dcd90750e0..dcd90750e0 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA022.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA022.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA022.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA022.stderr
index 6e6c5c6730..6e6c5c6730 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA022.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA022.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA023.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA023.hs
index e197a6b48f..e197a6b48f 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA023.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA023.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA023.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA023.stderr
index 2c4f5bc952..2c4f5bc952 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA023.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA023.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA024.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA024.hs
index 9e069c322c..9e069c322c 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA024.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA024.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA024.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA024.stderr
index f0d269d0b1..f0d269d0b1 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA024.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA024.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA025.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA025.hs
index c53ae7bb3e..c53ae7bb3e 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA025.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA025.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA025.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA025.stderr
index 792da55155..792da55155 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA025.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA025.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA026.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA026.hs
index cc2d8bfae5..cc2d8bfae5 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA026.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA026.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA026.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA026.stderr
index e352980fd4..e352980fd4 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA026.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA026.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA027.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA027.hs
index 1aa6e37d07..1aa6e37d07 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA027.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA027.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA027.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA027.stderr
index 67bf6528c0..67bf6528c0 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA027.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA027.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA028.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA028.hs
index 2f4b7c1bcb..2f4b7c1bcb 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA028.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA028.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA028.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA028.stderr
index d74422461e..d74422461e 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA028.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA028.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA029.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA029.hs
index 2615e555f1..2615e555f1 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA029.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA029.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA029.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA029.stderr
index aa48d998ef..aa48d998ef 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA029.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA029.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA030.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA030.hs
index 82c3799d1f..82c3799d1f 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA030.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA030.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA030.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA030.stderr
index c879d2244b..c879d2244b 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA030.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA030.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA031.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA031.hs
index 2d4b55f659..2d4b55f659 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA031.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA031.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA031.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA031.stderr
index 75ac2945b8..75ac2945b8 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA031.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA031.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA032.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA032.hs
index b772ec1de3..b772ec1de3 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA032.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA032.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA032.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA032.stderr
index 2b0e4d24af..2b0e4d24af 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA032.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA032.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA033.hs b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA033.hs
index 6d3db6cdc6..6d3db6cdc6 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA033.hs
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA033.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA033.stderr b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA033.stderr
index c1760c11fe..c1760c11fe 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_haddock/haddockA033.stderr
+++ b/testsuite/tests/haddock/should_compile_flag_haddock/haddockA033.stderr
diff --git a/testsuite/tests/haddock/should_compile_flag_nohaddock/Makefile b/testsuite/tests/haddock/should_compile_flag_nohaddock/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/haddock/should_compile_flag_nohaddock/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/all.T b/testsuite/tests/haddock/should_compile_flag_nohaddock/all.T
index 500a7e6bd1..500a7e6bd1 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/all.T
+++ b/testsuite/tests/haddock/should_compile_flag_nohaddock/all.T
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/haddockB001.hs b/testsuite/tests/haddock/should_compile_flag_nohaddock/haddockB001.hs
index 10998fdb1d..10998fdb1d 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/haddockB001.hs
+++ b/testsuite/tests/haddock/should_compile_flag_nohaddock/haddockB001.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/haddockB002.hs b/testsuite/tests/haddock/should_compile_flag_nohaddock/haddockB002.hs
index f698fa0520..f698fa0520 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/haddockB002.hs
+++ b/testsuite/tests/haddock/should_compile_flag_nohaddock/haddockB002.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/haddockB003.hs b/testsuite/tests/haddock/should_compile_flag_nohaddock/haddockB003.hs
index 7c3f733483..7c3f733483 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/haddockB003.hs
+++ b/testsuite/tests/haddock/should_compile_flag_nohaddock/haddockB003.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/haddockB004.hs b/testsuite/tests/haddock/should_compile_flag_nohaddock/haddockB004.hs
index cc9e07e6b2..cc9e07e6b2 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_flag_nohaddock/haddockB004.hs
+++ b/testsuite/tests/haddock/should_compile_flag_nohaddock/haddockB004.hs
diff --git a/testsuite/tests/haddock/should_compile_noflag_haddock/Makefile b/testsuite/tests/haddock/should_compile_noflag_haddock/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/all.T b/testsuite/tests/haddock/should_compile_noflag_haddock/all.T
index dbc7d17d9a..dbc7d17d9a 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/all.T
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/all.T
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC001.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC001.hs
index 8710c20eee..8710c20eee 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC001.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC001.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC002.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC002.hs
index e6ab145eb5..e6ab145eb5 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC002.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC002.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC003.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC003.hs
index 54af6d73b4..54af6d73b4 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC003.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC003.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC004.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC004.hs
index 4311798859..4311798859 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC004.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC004.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC005.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC005.hs
index 4c854505ca..4c854505ca 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC005.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC005.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC006.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC006.hs
index 518c598b38..518c598b38 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC006.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC006.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC007.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC007.hs
index 94ce040c20..94ce040c20 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC007.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC007.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC008.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC008.hs
index ca17e8de4b..ca17e8de4b 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC008.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC008.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC009.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC009.hs
index 67ef8ff570..67ef8ff570 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC009.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC009.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC010.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC010.hs
index 943b28e485..943b28e485 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC010.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC010.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC011.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC011.hs
index c6146d2369..c6146d2369 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC011.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC011.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC012.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC012.hs
index c392d85211..c392d85211 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC012.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC012.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC013.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC013.hs
index 82f2561f86..82f2561f86 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC013.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC013.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC014.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC014.hs
index 880264f60b..880264f60b 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC014.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC014.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC015.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC015.hs
index b4b47be108..b4b47be108 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC015.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC015.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC016.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC016.hs
index ffe02923ea..ffe02923ea 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC016.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC016.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC017.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC017.hs
index 75d859a1c7..75d859a1c7 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC017.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC017.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC018.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC018.hs
index c8b6f52d42..c8b6f52d42 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC018.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC018.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC019.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC019.hs
index 7e5e98be8d..7e5e98be8d 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC019.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC019.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC020.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC020.hs
index 31b38da179..31b38da179 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC020.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC020.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC021.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC021.hs
index ac12f30d6b..ac12f30d6b 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC021.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC021.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC022.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC022.hs
index dcd90750e0..dcd90750e0 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC022.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC022.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC023.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC023.hs
index 9e069c322c..9e069c322c 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC023.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC023.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC024.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC024.hs
index 9e069c322c..9e069c322c 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC024.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC024.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC025.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC025.hs
index c53ae7bb3e..c53ae7bb3e 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC025.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC025.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC026.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC026.hs
index cc2d8bfae5..cc2d8bfae5 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC026.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC026.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC027.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC027.hs
index c22be2fb87..c22be2fb87 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC027.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC027.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC028.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC028.hs
index 3f8abc19d3..3f8abc19d3 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC028.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC028.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC029.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC029.hs
index 2615e555f1..2615e555f1 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC029.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC029.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC030.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC030.hs
index 82c3799d1f..82c3799d1f 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC030.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC030.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC031.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC031.hs
index 2d4b55f659..2d4b55f659 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC031.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC031.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC032.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC032.hs
index b772ec1de3..b772ec1de3 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockC032.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockC032.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockSimplUtilsBug.hs b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockSimplUtilsBug.hs
index a62020f508..a62020f508 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockSimplUtilsBug.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockSimplUtilsBug.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockSimplUtilsBug.stderr b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockSimplUtilsBug.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_haddock/haddockSimplUtilsBug.stderr
+++ b/testsuite/tests/haddock/should_compile_noflag_haddock/haddockSimplUtilsBug.stderr
diff --git a/testsuite/tests/haddock/should_compile_noflag_nohaddock/Makefile b/testsuite/tests/haddock/should_compile_noflag_nohaddock/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/haddock/should_compile_noflag_nohaddock/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/all.T b/testsuite/tests/haddock/should_compile_noflag_nohaddock/all.T
index 89c205b3ce..89c205b3ce 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/all.T
+++ b/testsuite/tests/haddock/should_compile_noflag_nohaddock/all.T
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/haddockD001.hs b/testsuite/tests/haddock/should_compile_noflag_nohaddock/haddockD001.hs
index 10998fdb1d..10998fdb1d 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/haddockD001.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_nohaddock/haddockD001.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/haddockD002.hs b/testsuite/tests/haddock/should_compile_noflag_nohaddock/haddockD002.hs
index f698fa0520..f698fa0520 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/haddockD002.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_nohaddock/haddockD002.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/haddockD003.hs b/testsuite/tests/haddock/should_compile_noflag_nohaddock/haddockD003.hs
index 7c3f733483..7c3f733483 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/haddockD003.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_nohaddock/haddockD003.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/haddockD004.hs b/testsuite/tests/haddock/should_compile_noflag_nohaddock/haddockD004.hs
index cc9e07e6b2..cc9e07e6b2 100644
--- a/testsuite/tests/ghc-regress/haddock/should_compile_noflag_nohaddock/haddockD004.hs
+++ b/testsuite/tests/haddock/should_compile_noflag_nohaddock/haddockD004.hs
diff --git a/testsuite/tests/haddock/should_fail_flag_haddock/Makefile b/testsuite/tests/haddock/should_fail_flag_haddock/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/haddock/should_fail_flag_haddock/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/all.T b/testsuite/tests/haddock/should_fail_flag_haddock/all.T
index bbe4c6edf2..bbe4c6edf2 100644
--- a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/all.T
+++ b/testsuite/tests/haddock/should_fail_flag_haddock/all.T
diff --git a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE001.hs b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE001.hs
index b8d900190a..b8d900190a 100644
--- a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE001.hs
+++ b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE001.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE001.stderr b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE001.stderr
index f1332ea124..f1332ea124 100644
--- a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE001.stderr
+++ b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE001.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE002.hs b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE002.hs
index 7c49f02e5a..7c49f02e5a 100644
--- a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE002.hs
+++ b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE002.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE002.stderr b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE002.stderr
index cb1e257b3d..cb1e257b3d 100644
--- a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE002.stderr
+++ b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE002.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE003.hs b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE003.hs
index ee6aef2bf8..ee6aef2bf8 100644
--- a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE003.hs
+++ b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE003.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE003.stderr b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE003.stderr
index 6965356fad..6965356fad 100644
--- a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE003.stderr
+++ b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE003.stderr
diff --git a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE004.hs b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE004.hs
index d73fe8f796..d73fe8f796 100644
--- a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE004.hs
+++ b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE004.hs
diff --git a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE004.stderr b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE004.stderr
index 3462c61a8c..3462c61a8c 100644
--- a/testsuite/tests/ghc-regress/haddock/should_fail_flag_haddock/haddockE004.stderr
+++ b/testsuite/tests/haddock/should_fail_flag_haddock/haddockE004.stderr
diff --git a/testsuite/tests/ghc-regress/hsc2hs/3837.hsc b/testsuite/tests/hsc2hs/3837.hsc
index 7f8ee255af..7f8ee255af 100644
--- a/testsuite/tests/ghc-regress/hsc2hs/3837.hsc
+++ b/testsuite/tests/hsc2hs/3837.hsc
diff --git a/testsuite/tests/hsc2hs/Makefile b/testsuite/tests/hsc2hs/Makefile
new file mode 100644
index 0000000000..0b904f317c
--- /dev/null
+++ b/testsuite/tests/hsc2hs/Makefile
@@ -0,0 +1,16 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+ALL_TESTS = hsc2hs001 hsc2hs002
+
+.PHONY: $(TESTS)
+
+$(ALL_TESTS):
+	'$(HSC2HS)' $@.hsc
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c $@.hs
+
+.PHONY: 3837
+3837:
+	LANG=C '$(HSC2HS)' $@.hsc
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c $@.hs
diff --git a/testsuite/tests/ghc-regress/hsc2hs/all.T b/testsuite/tests/hsc2hs/all.T
index 32900434d2..32900434d2 100644
--- a/testsuite/tests/ghc-regress/hsc2hs/all.T
+++ b/testsuite/tests/hsc2hs/all.T
diff --git a/testsuite/tests/ghc-regress/hsc2hs/hsc2hs001.hsc b/testsuite/tests/hsc2hs/hsc2hs001.hsc
index 4a47501859..4a47501859 100644
--- a/testsuite/tests/ghc-regress/hsc2hs/hsc2hs001.hsc
+++ b/testsuite/tests/hsc2hs/hsc2hs001.hsc
diff --git a/testsuite/tests/ghc-regress/hsc2hs/hsc2hs002.hsc b/testsuite/tests/hsc2hs/hsc2hs002.hsc
index 14cee92358..14cee92358 100644
--- a/testsuite/tests/ghc-regress/hsc2hs/hsc2hs002.hsc
+++ b/testsuite/tests/hsc2hs/hsc2hs002.hsc
diff --git a/testsuite/tests/indexed-types/Makefile b/testsuite/tests/indexed-types/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/indexed-types/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/ATLoop.hs b/testsuite/tests/indexed-types/should_compile/ATLoop.hs
index 19f9e5b8a2..19f9e5b8a2 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/ATLoop.hs
+++ b/testsuite/tests/indexed-types/should_compile/ATLoop.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/ATLoop_help.hs b/testsuite/tests/indexed-types/should_compile/ATLoop_help.hs
index 8814f480eb..8814f480eb 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/ATLoop_help.hs
+++ b/testsuite/tests/indexed-types/should_compile/ATLoop_help.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Class1.hs b/testsuite/tests/indexed-types/should_compile/Class1.hs
index 4e58e13d58..4e58e13d58 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Class1.hs
+++ b/testsuite/tests/indexed-types/should_compile/Class1.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Class2.hs b/testsuite/tests/indexed-types/should_compile/Class2.hs
index f0d90f35f5..f0d90f35f5 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Class2.hs
+++ b/testsuite/tests/indexed-types/should_compile/Class2.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Class3.hs b/testsuite/tests/indexed-types/should_compile/Class3.hs
index 6bea22e1a4..6bea22e1a4 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Class3.hs
+++ b/testsuite/tests/indexed-types/should_compile/Class3.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Class3.stderr b/testsuite/tests/indexed-types/should_compile/Class3.stderr
index 58367939d0..58367939d0 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Class3.stderr
+++ b/testsuite/tests/indexed-types/should_compile/Class3.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/ClassEqContext.hs b/testsuite/tests/indexed-types/should_compile/ClassEqContext.hs
index 7de87362b4..7de87362b4 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/ClassEqContext.hs
+++ b/testsuite/tests/indexed-types/should_compile/ClassEqContext.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/ClassEqContext2.hs b/testsuite/tests/indexed-types/should_compile/ClassEqContext2.hs
index a491577723..a491577723 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/ClassEqContext2.hs
+++ b/testsuite/tests/indexed-types/should_compile/ClassEqContext2.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/ClassEqContext3.hs b/testsuite/tests/indexed-types/should_compile/ClassEqContext3.hs
index e2fd14515f..e2fd14515f 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/ClassEqContext3.hs
+++ b/testsuite/tests/indexed-types/should_compile/ClassEqContext3.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/CoTest3.hs b/testsuite/tests/indexed-types/should_compile/CoTest3.hs
index 971a464a89..971a464a89 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/CoTest3.hs
+++ b/testsuite/tests/indexed-types/should_compile/CoTest3.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Col.hs b/testsuite/tests/indexed-types/should_compile/Col.hs
index 62c309bd91..62c309bd91 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Col.hs
+++ b/testsuite/tests/indexed-types/should_compile/Col.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Col2.hs b/testsuite/tests/indexed-types/should_compile/Col2.hs
index 97a10aef84..97a10aef84 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Col2.hs
+++ b/testsuite/tests/indexed-types/should_compile/Col2.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/ColGivenCheck.hs b/testsuite/tests/indexed-types/should_compile/ColGivenCheck.hs
index 288c6e0608..288c6e0608 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/ColGivenCheck.hs
+++ b/testsuite/tests/indexed-types/should_compile/ColGivenCheck.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/ColGivenCheck2.hs b/testsuite/tests/indexed-types/should_compile/ColGivenCheck2.hs
index 2da7cb4117..2da7cb4117 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/ColGivenCheck2.hs
+++ b/testsuite/tests/indexed-types/should_compile/ColGivenCheck2.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/ColInference.hs b/testsuite/tests/indexed-types/should_compile/ColInference.hs
index a70b7dd444..a70b7dd444 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/ColInference.hs
+++ b/testsuite/tests/indexed-types/should_compile/ColInference.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/ColInference2.hs b/testsuite/tests/indexed-types/should_compile/ColInference2.hs
index 9785d717a7..9785d717a7 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/ColInference2.hs
+++ b/testsuite/tests/indexed-types/should_compile/ColInference2.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/ColInference3.hs b/testsuite/tests/indexed-types/should_compile/ColInference3.hs
index f946e89120..f946e89120 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/ColInference3.hs
+++ b/testsuite/tests/indexed-types/should_compile/ColInference3.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/ColInference4.hs b/testsuite/tests/indexed-types/should_compile/ColInference4.hs
index 27675b1051..27675b1051 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/ColInference4.hs
+++ b/testsuite/tests/indexed-types/should_compile/ColInference4.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/ColInference5.hs b/testsuite/tests/indexed-types/should_compile/ColInference5.hs
index b65a90092e..b65a90092e 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/ColInference5.hs
+++ b/testsuite/tests/indexed-types/should_compile/ColInference5.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/ColInference6.hs b/testsuite/tests/indexed-types/should_compile/ColInference6.hs
index 9273632e2b..9273632e2b 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/ColInference6.hs
+++ b/testsuite/tests/indexed-types/should_compile/ColInference6.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/DataFamDeriv.hs b/testsuite/tests/indexed-types/should_compile/DataFamDeriv.hs
index 3800b51a3f..3800b51a3f 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/DataFamDeriv.hs
+++ b/testsuite/tests/indexed-types/should_compile/DataFamDeriv.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Deriving.hs b/testsuite/tests/indexed-types/should_compile/Deriving.hs
index fd0eff2016..fd0eff2016 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Deriving.hs
+++ b/testsuite/tests/indexed-types/should_compile/Deriving.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/DerivingNewType.hs b/testsuite/tests/indexed-types/should_compile/DerivingNewType.hs
index 65f3b8520d..65f3b8520d 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/DerivingNewType.hs
+++ b/testsuite/tests/indexed-types/should_compile/DerivingNewType.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Exp.hs b/testsuite/tests/indexed-types/should_compile/Exp.hs
index 60cb12f098..60cb12f098 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Exp.hs
+++ b/testsuite/tests/indexed-types/should_compile/Exp.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT1.hs b/testsuite/tests/indexed-types/should_compile/GADT1.hs
index 7761eafe97..7761eafe97 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT1.hs
+++ b/testsuite/tests/indexed-types/should_compile/GADT1.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT10.hs b/testsuite/tests/indexed-types/should_compile/GADT10.hs
index 76efaf1fcc..76efaf1fcc 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT10.hs
+++ b/testsuite/tests/indexed-types/should_compile/GADT10.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT11.hs b/testsuite/tests/indexed-types/should_compile/GADT11.hs
index 70c5d75d84..70c5d75d84 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT11.hs
+++ b/testsuite/tests/indexed-types/should_compile/GADT11.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT12.hs b/testsuite/tests/indexed-types/should_compile/GADT12.hs
index 4eb5124c1d..4eb5124c1d 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT12.hs
+++ b/testsuite/tests/indexed-types/should_compile/GADT12.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT12.stderr b/testsuite/tests/indexed-types/should_compile/GADT12.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT12.stderr
+++ b/testsuite/tests/indexed-types/should_compile/GADT12.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT13.hs b/testsuite/tests/indexed-types/should_compile/GADT13.hs
index b5724b2500..b5724b2500 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT13.hs
+++ b/testsuite/tests/indexed-types/should_compile/GADT13.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT14.hs b/testsuite/tests/indexed-types/should_compile/GADT14.hs
index ace1de45da..ace1de45da 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT14.hs
+++ b/testsuite/tests/indexed-types/should_compile/GADT14.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT2.hs b/testsuite/tests/indexed-types/should_compile/GADT2.hs
index eb8354ba28..eb8354ba28 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT2.hs
+++ b/testsuite/tests/indexed-types/should_compile/GADT2.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT3.hs b/testsuite/tests/indexed-types/should_compile/GADT3.hs
index f630ad5d22..f630ad5d22 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT3.hs
+++ b/testsuite/tests/indexed-types/should_compile/GADT3.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT4.hs b/testsuite/tests/indexed-types/should_compile/GADT4.hs
index 07cf492843..07cf492843 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT4.hs
+++ b/testsuite/tests/indexed-types/should_compile/GADT4.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT5.hs b/testsuite/tests/indexed-types/should_compile/GADT5.hs
index 69a6481fd0..69a6481fd0 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT5.hs
+++ b/testsuite/tests/indexed-types/should_compile/GADT5.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT6.hs b/testsuite/tests/indexed-types/should_compile/GADT6.hs
index 0e976b441e..0e976b441e 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT6.hs
+++ b/testsuite/tests/indexed-types/should_compile/GADT6.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT7.hs b/testsuite/tests/indexed-types/should_compile/GADT7.hs
index 00912605b4..00912605b4 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT7.hs
+++ b/testsuite/tests/indexed-types/should_compile/GADT7.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT8.hs b/testsuite/tests/indexed-types/should_compile/GADT8.hs
index 6d9381296e..6d9381296e 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT8.hs
+++ b/testsuite/tests/indexed-types/should_compile/GADT8.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT9.hs b/testsuite/tests/indexed-types/should_compile/GADT9.hs
index 7ced0f76d1..7ced0f76d1 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GADT9.hs
+++ b/testsuite/tests/indexed-types/should_compile/GADT9.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Gentle.hs b/testsuite/tests/indexed-types/should_compile/Gentle.hs
index a32ac798a0..a32ac798a0 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Gentle.hs
+++ b/testsuite/tests/indexed-types/should_compile/Gentle.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Gentle.stderr b/testsuite/tests/indexed-types/should_compile/Gentle.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Gentle.stderr
+++ b/testsuite/tests/indexed-types/should_compile/Gentle.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GivenCheck.hs b/testsuite/tests/indexed-types/should_compile/GivenCheck.hs
index 20320ae1c9..20320ae1c9 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GivenCheck.hs
+++ b/testsuite/tests/indexed-types/should_compile/GivenCheck.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GivenCheckDecomp.hs b/testsuite/tests/indexed-types/should_compile/GivenCheckDecomp.hs
index 3d2492770d..3d2492770d 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GivenCheckDecomp.hs
+++ b/testsuite/tests/indexed-types/should_compile/GivenCheckDecomp.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GivenCheckSwap.hs b/testsuite/tests/indexed-types/should_compile/GivenCheckSwap.hs
index 8d053f312a..8d053f312a 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GivenCheckSwap.hs
+++ b/testsuite/tests/indexed-types/should_compile/GivenCheckSwap.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/GivenCheckTop.hs b/testsuite/tests/indexed-types/should_compile/GivenCheckTop.hs
index bc81d1acc7..bc81d1acc7 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/GivenCheckTop.hs
+++ b/testsuite/tests/indexed-types/should_compile/GivenCheckTop.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/HO.hs b/testsuite/tests/indexed-types/should_compile/HO.hs
index 40d597a76f..40d597a76f 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/HO.hs
+++ b/testsuite/tests/indexed-types/should_compile/HO.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Imp.hs b/testsuite/tests/indexed-types/should_compile/Imp.hs
index 6ae1812083..6ae1812083 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Imp.hs
+++ b/testsuite/tests/indexed-types/should_compile/Imp.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Ind2_help.hs b/testsuite/tests/indexed-types/should_compile/Ind2_help.hs
index b088302fec..b088302fec 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Ind2_help.hs
+++ b/testsuite/tests/indexed-types/should_compile/Ind2_help.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/IndTypesPerf.hs b/testsuite/tests/indexed-types/should_compile/IndTypesPerf.hs
index 4edcd03988..4edcd03988 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/IndTypesPerf.hs
+++ b/testsuite/tests/indexed-types/should_compile/IndTypesPerf.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/IndTypesPerfMerge.hs b/testsuite/tests/indexed-types/should_compile/IndTypesPerfMerge.hs
index 18ed35bdc1..18ed35bdc1 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/IndTypesPerfMerge.hs
+++ b/testsuite/tests/indexed-types/should_compile/IndTypesPerfMerge.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Infix.hs b/testsuite/tests/indexed-types/should_compile/Infix.hs
index dee389331b..dee389331b 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Infix.hs
+++ b/testsuite/tests/indexed-types/should_compile/Infix.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/InstContextNorm.hs b/testsuite/tests/indexed-types/should_compile/InstContextNorm.hs
index 329756aa9c..329756aa9c 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/InstContextNorm.hs
+++ b/testsuite/tests/indexed-types/should_compile/InstContextNorm.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/InstEqContext.hs b/testsuite/tests/indexed-types/should_compile/InstEqContext.hs
index e178e110a5..e178e110a5 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/InstEqContext.hs
+++ b/testsuite/tests/indexed-types/should_compile/InstEqContext.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/InstEqContext2.hs b/testsuite/tests/indexed-types/should_compile/InstEqContext2.hs
index c5d017a644..c5d017a644 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/InstEqContext2.hs
+++ b/testsuite/tests/indexed-types/should_compile/InstEqContext2.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/InstEqContext3.hs b/testsuite/tests/indexed-types/should_compile/InstEqContext3.hs
index 3f307f8941..3f307f8941 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/InstEqContext3.hs
+++ b/testsuite/tests/indexed-types/should_compile/InstEqContext3.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Kind.hs b/testsuite/tests/indexed-types/should_compile/Kind.hs
index 73c528df11..73c528df11 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Kind.hs
+++ b/testsuite/tests/indexed-types/should_compile/Kind.hs
diff --git a/testsuite/tests/indexed-types/should_compile/Makefile b/testsuite/tests/indexed-types/should_compile/Makefile
new file mode 100644
index 0000000000..a5dfe03de8
--- /dev/null
+++ b/testsuite/tests/indexed-types/should_compile/Makefile
@@ -0,0 +1,15 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+NewTyCo:
+	$(RM) NewTyCo1.o NewTyCo1.hi NewTyCo2.o NewTyCo2.hi
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c NewTyCo1.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c NewTyCo2.hs
+
+.PHONY: IndTypesPerf
+IndTypesPerf:
+	$(RM) IndTypesPerf.o IndTypesPerf.hi
+	$(RM) IndTypesPerfMerge.o IndTypesPerfMerge.hi
+	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c IndTypesPerfMerge.hs +RTS -M20M
+	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c IndTypesPerf.hs      +RTS -M20M
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/NewTyCo1.hs b/testsuite/tests/indexed-types/should_compile/NewTyCo1.hs
index 9af6d9ee92..9af6d9ee92 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/NewTyCo1.hs
+++ b/testsuite/tests/indexed-types/should_compile/NewTyCo1.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/NewTyCo2.hs b/testsuite/tests/indexed-types/should_compile/NewTyCo2.hs
index 6ff2bc1ecd..6ff2bc1ecd 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/NewTyCo2.hs
+++ b/testsuite/tests/indexed-types/should_compile/NewTyCo2.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/NonLinearLHS.hs b/testsuite/tests/indexed-types/should_compile/NonLinearLHS.hs
index dc0ae5392a..dc0ae5392a 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/NonLinearLHS.hs
+++ b/testsuite/tests/indexed-types/should_compile/NonLinearLHS.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Numerals.hs b/testsuite/tests/indexed-types/should_compile/Numerals.hs
index 17fb30c3ca..17fb30c3ca 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Numerals.hs
+++ b/testsuite/tests/indexed-types/should_compile/Numerals.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/OversatDecomp.hs b/testsuite/tests/indexed-types/should_compile/OversatDecomp.hs
index a93256c92c..a93256c92c 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/OversatDecomp.hs
+++ b/testsuite/tests/indexed-types/should_compile/OversatDecomp.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/PushedInAsGivens.hs b/testsuite/tests/indexed-types/should_compile/PushedInAsGivens.hs
index 0117b81d47..0117b81d47 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/PushedInAsGivens.hs
+++ b/testsuite/tests/indexed-types/should_compile/PushedInAsGivens.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Records.hs b/testsuite/tests/indexed-types/should_compile/Records.hs
index 4a08125e30..4a08125e30 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Records.hs
+++ b/testsuite/tests/indexed-types/should_compile/Records.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Refl.hs b/testsuite/tests/indexed-types/should_compile/Refl.hs
index 0b1b1f7a36..0b1b1f7a36 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Refl.hs
+++ b/testsuite/tests/indexed-types/should_compile/Refl.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Refl2.hs b/testsuite/tests/indexed-types/should_compile/Refl2.hs
index b6f5d056b5..b6f5d056b5 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Refl2.hs
+++ b/testsuite/tests/indexed-types/should_compile/Refl2.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/RelaxedExamples.hs b/testsuite/tests/indexed-types/should_compile/RelaxedExamples.hs
index a58fb3da67..a58fb3da67 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/RelaxedExamples.hs
+++ b/testsuite/tests/indexed-types/should_compile/RelaxedExamples.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Roman1.hs b/testsuite/tests/indexed-types/should_compile/Roman1.hs
index 491fee04c5..491fee04c5 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Roman1.hs
+++ b/testsuite/tests/indexed-types/should_compile/Roman1.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Rules1.hs b/testsuite/tests/indexed-types/should_compile/Rules1.hs
index 497c5bbeb9..497c5bbeb9 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Rules1.hs
+++ b/testsuite/tests/indexed-types/should_compile/Rules1.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple1.hs b/testsuite/tests/indexed-types/should_compile/Simple1.hs
index e442042bb1..e442042bb1 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple1.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple1.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple10.hs b/testsuite/tests/indexed-types/should_compile/Simple10.hs
index 2e6aacf510..2e6aacf510 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple10.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple10.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple11.hs b/testsuite/tests/indexed-types/should_compile/Simple11.hs
index 2d507a728e..2d507a728e 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple11.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple11.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple12.hs b/testsuite/tests/indexed-types/should_compile/Simple12.hs
index c425d78db5..c425d78db5 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple12.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple12.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple13.hs b/testsuite/tests/indexed-types/should_compile/Simple13.hs
index 7633f01f98..7633f01f98 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple13.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple13.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple14.hs b/testsuite/tests/indexed-types/should_compile/Simple14.hs
index 16158d9714..16158d9714 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple14.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple14.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple14.stderr b/testsuite/tests/indexed-types/should_compile/Simple14.stderr
index a5250d556f..a5250d556f 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple14.stderr
+++ b/testsuite/tests/indexed-types/should_compile/Simple14.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple15.hs b/testsuite/tests/indexed-types/should_compile/Simple15.hs
index 8a28d27b6f..8a28d27b6f 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple15.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple15.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple16.hs b/testsuite/tests/indexed-types/should_compile/Simple16.hs
index f1958c3ffd..f1958c3ffd 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple16.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple16.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple17.hs b/testsuite/tests/indexed-types/should_compile/Simple17.hs
index 4e812be0fe..4e812be0fe 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple17.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple17.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple18.hs b/testsuite/tests/indexed-types/should_compile/Simple18.hs
index c7d94c4984..c7d94c4984 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple18.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple18.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple19.hs b/testsuite/tests/indexed-types/should_compile/Simple19.hs
index d738b0bd85..d738b0bd85 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple19.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple19.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple2.hs b/testsuite/tests/indexed-types/should_compile/Simple2.hs
index 2dc673f58b..2dc673f58b 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple2.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple2.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple2.stderr b/testsuite/tests/indexed-types/should_compile/Simple2.stderr
index e2d5ce6973..e2d5ce6973 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple2.stderr
+++ b/testsuite/tests/indexed-types/should_compile/Simple2.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple20.hs b/testsuite/tests/indexed-types/should_compile/Simple20.hs
index 81a8522804..81a8522804 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple20.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple20.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple20.stderr b/testsuite/tests/indexed-types/should_compile/Simple20.stderr
index 6c8feeb75b..6c8feeb75b 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple20.stderr
+++ b/testsuite/tests/indexed-types/should_compile/Simple20.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple21.hs b/testsuite/tests/indexed-types/should_compile/Simple21.hs
index e858ae3ba9..e858ae3ba9 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple21.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple21.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple22.hs b/testsuite/tests/indexed-types/should_compile/Simple22.hs
index dd0a558c4f..dd0a558c4f 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple22.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple22.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple23.hs b/testsuite/tests/indexed-types/should_compile/Simple23.hs
index b7d5ee4ccb..b7d5ee4ccb 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple23.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple23.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple24.hs b/testsuite/tests/indexed-types/should_compile/Simple24.hs
index de33458bc7..de33458bc7 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple24.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple24.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple3.hs b/testsuite/tests/indexed-types/should_compile/Simple3.hs
index aa37ac215d..aa37ac215d 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple3.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple3.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple4.hs b/testsuite/tests/indexed-types/should_compile/Simple4.hs
index bd8ae3d66a..bd8ae3d66a 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple4.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple4.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple5.hs b/testsuite/tests/indexed-types/should_compile/Simple5.hs
index ecae60d53d..ecae60d53d 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple5.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple5.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple6.hs b/testsuite/tests/indexed-types/should_compile/Simple6.hs
index ead121ab2d..ead121ab2d 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple6.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple6.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple7.hs b/testsuite/tests/indexed-types/should_compile/Simple7.hs
index 61ba22117f..61ba22117f 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple7.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple7.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple8.hs b/testsuite/tests/indexed-types/should_compile/Simple8.hs
index f819763579..f819763579 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple8.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple8.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple9.hs b/testsuite/tests/indexed-types/should_compile/Simple9.hs
index 4075d4845f..4075d4845f 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/Simple9.hs
+++ b/testsuite/tests/indexed-types/should_compile/Simple9.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T1769.hs b/testsuite/tests/indexed-types/should_compile/T1769.hs
index 57b966051b..57b966051b 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T1769.hs
+++ b/testsuite/tests/indexed-types/should_compile/T1769.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T1981.hs b/testsuite/tests/indexed-types/should_compile/T1981.hs
index 658821ea73..658821ea73 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T1981.hs
+++ b/testsuite/tests/indexed-types/should_compile/T1981.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2102.hs b/testsuite/tests/indexed-types/should_compile/T2102.hs
index 6283b18071..6283b18071 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2102.hs
+++ b/testsuite/tests/indexed-types/should_compile/T2102.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2203b.hs b/testsuite/tests/indexed-types/should_compile/T2203b.hs
index 74517aeadd..74517aeadd 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2203b.hs
+++ b/testsuite/tests/indexed-types/should_compile/T2203b.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2219.hs b/testsuite/tests/indexed-types/should_compile/T2219.hs
index ea7d442f74..ea7d442f74 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2219.hs
+++ b/testsuite/tests/indexed-types/should_compile/T2219.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2238.hs b/testsuite/tests/indexed-types/should_compile/T2238.hs
index 8e77283d77..8e77283d77 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2238.hs
+++ b/testsuite/tests/indexed-types/should_compile/T2238.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2291.hs b/testsuite/tests/indexed-types/should_compile/T2291.hs
index a6832b60ad..a6832b60ad 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2291.hs
+++ b/testsuite/tests/indexed-types/should_compile/T2291.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2448.hs b/testsuite/tests/indexed-types/should_compile/T2448.hs
index 806df3ff4c..806df3ff4c 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2448.hs
+++ b/testsuite/tests/indexed-types/should_compile/T2448.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2627.hs b/testsuite/tests/indexed-types/should_compile/T2627.hs
index 6a29d611e5..6a29d611e5 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2627.hs
+++ b/testsuite/tests/indexed-types/should_compile/T2627.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2639.hs b/testsuite/tests/indexed-types/should_compile/T2639.hs
index 43e6c98a1d..43e6c98a1d 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2639.hs
+++ b/testsuite/tests/indexed-types/should_compile/T2639.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2715.hs b/testsuite/tests/indexed-types/should_compile/T2715.hs
index 0fae15eaf8..0fae15eaf8 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2715.hs
+++ b/testsuite/tests/indexed-types/should_compile/T2715.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2767.hs b/testsuite/tests/indexed-types/should_compile/T2767.hs
index 7104db2fa3..7104db2fa3 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2767.hs
+++ b/testsuite/tests/indexed-types/should_compile/T2767.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2850.hs b/testsuite/tests/indexed-types/should_compile/T2850.hs
index bdb423b6eb..bdb423b6eb 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2850.hs
+++ b/testsuite/tests/indexed-types/should_compile/T2850.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2944.hs b/testsuite/tests/indexed-types/should_compile/T2944.hs
index 19c009b0f9..19c009b0f9 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T2944.hs
+++ b/testsuite/tests/indexed-types/should_compile/T2944.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3017.hs b/testsuite/tests/indexed-types/should_compile/T3017.hs
index 8e4e5bd999..8e4e5bd999 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3017.hs
+++ b/testsuite/tests/indexed-types/should_compile/T3017.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3017.stderr b/testsuite/tests/indexed-types/should_compile/T3017.stderr
index 5afb822c32..5afb822c32 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3017.stderr
+++ b/testsuite/tests/indexed-types/should_compile/T3017.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3023.hs b/testsuite/tests/indexed-types/should_compile/T3023.hs
index 26966daed7..26966daed7 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3023.hs
+++ b/testsuite/tests/indexed-types/should_compile/T3023.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3023.stderr b/testsuite/tests/indexed-types/should_compile/T3023.stderr
index 68066bac91..68066bac91 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3023.stderr
+++ b/testsuite/tests/indexed-types/should_compile/T3023.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3208a.hs b/testsuite/tests/indexed-types/should_compile/T3208a.hs
index fded5bf55d..fded5bf55d 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3208a.hs
+++ b/testsuite/tests/indexed-types/should_compile/T3208a.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3208b.hs b/testsuite/tests/indexed-types/should_compile/T3208b.hs
index 012756abd1..012756abd1 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3208b.hs
+++ b/testsuite/tests/indexed-types/should_compile/T3208b.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3208b.stderr b/testsuite/tests/indexed-types/should_compile/T3208b.stderr
index 712f732b06..712f732b06 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3208b.stderr
+++ b/testsuite/tests/indexed-types/should_compile/T3208b.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3220.hs b/testsuite/tests/indexed-types/should_compile/T3220.hs
index 7d6190a7fa..7d6190a7fa 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3220.hs
+++ b/testsuite/tests/indexed-types/should_compile/T3220.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3418.hs b/testsuite/tests/indexed-types/should_compile/T3418.hs
index a0ffaf0aed..a0ffaf0aed 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3418.hs
+++ b/testsuite/tests/indexed-types/should_compile/T3418.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3418.stderr b/testsuite/tests/indexed-types/should_compile/T3418.stderr
index 657e2a07b7..657e2a07b7 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3418.stderr
+++ b/testsuite/tests/indexed-types/should_compile/T3418.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3423.hs b/testsuite/tests/indexed-types/should_compile/T3423.hs
index bbca944374..bbca944374 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3423.hs
+++ b/testsuite/tests/indexed-types/should_compile/T3423.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3460.hs b/testsuite/tests/indexed-types/should_compile/T3460.hs
index ea4f59cd6b..ea4f59cd6b 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3460.hs
+++ b/testsuite/tests/indexed-types/should_compile/T3460.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3484.hs b/testsuite/tests/indexed-types/should_compile/T3484.hs
index 4d1570915e..4d1570915e 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3484.hs
+++ b/testsuite/tests/indexed-types/should_compile/T3484.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3590.hs b/testsuite/tests/indexed-types/should_compile/T3590.hs
index 1b4ba426aa..1b4ba426aa 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3590.hs
+++ b/testsuite/tests/indexed-types/should_compile/T3590.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3787.hs b/testsuite/tests/indexed-types/should_compile/T3787.hs
index 955b6a1cdd..955b6a1cdd 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3787.hs
+++ b/testsuite/tests/indexed-types/should_compile/T3787.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3826.hs b/testsuite/tests/indexed-types/should_compile/T3826.hs
index 39c597f69c..39c597f69c 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3826.hs
+++ b/testsuite/tests/indexed-types/should_compile/T3826.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3851.hs b/testsuite/tests/indexed-types/should_compile/T3851.hs
index 3b40db1bce..3b40db1bce 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T3851.hs
+++ b/testsuite/tests/indexed-types/should_compile/T3851.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4120.hs b/testsuite/tests/indexed-types/should_compile/T4120.hs
index 57dd21a39b..57dd21a39b 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4120.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4120.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4120.stderr b/testsuite/tests/indexed-types/should_compile/T4120.stderr
index d957620b78..d957620b78 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4120.stderr
+++ b/testsuite/tests/indexed-types/should_compile/T4120.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4160.hs b/testsuite/tests/indexed-types/should_compile/T4160.hs
index f13aafa103..f13aafa103 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4160.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4160.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4178.hs b/testsuite/tests/indexed-types/should_compile/T4178.hs
index b0a34b28e1..b0a34b28e1 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4178.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4178.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4200.hs b/testsuite/tests/indexed-types/should_compile/T4200.hs
index 0d0e23a419..0d0e23a419 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4200.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4200.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4338.hs b/testsuite/tests/indexed-types/should_compile/T4338.hs
index 6fa2ae85ac..6fa2ae85ac 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4338.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4338.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4356.hs b/testsuite/tests/indexed-types/should_compile/T4356.hs
index 400314eeb2..400314eeb2 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4356.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4356.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4358.hs b/testsuite/tests/indexed-types/should_compile/T4358.hs
index 92ac3a743b..92ac3a743b 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4358.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4358.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4484.hs b/testsuite/tests/indexed-types/should_compile/T4484.hs
index 94a76ee7d4..94a76ee7d4 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4484.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4484.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4492.hs b/testsuite/tests/indexed-types/should_compile/T4492.hs
index 0c01cbc973..0c01cbc973 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4492.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4492.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4494.hs b/testsuite/tests/indexed-types/should_compile/T4494.hs
index 52e1435272..52e1435272 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4494.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4494.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4497.hs b/testsuite/tests/indexed-types/should_compile/T4497.hs
index 57d3d48ca4..57d3d48ca4 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4497.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4497.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4935.hs b/testsuite/tests/indexed-types/should_compile/T4935.hs
index 2c9d16a9b8..2c9d16a9b8 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4935.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4935.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4981-V1.hs b/testsuite/tests/indexed-types/should_compile/T4981-V1.hs
index 14f675ca59..14f675ca59 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4981-V1.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4981-V1.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4981-V2.hs b/testsuite/tests/indexed-types/should_compile/T4981-V2.hs
index d18d67e91c..d18d67e91c 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4981-V2.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4981-V2.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4981-V3.hs b/testsuite/tests/indexed-types/should_compile/T4981-V3.hs
index 9e0eda54eb..9e0eda54eb 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T4981-V3.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4981-V3.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/T5002.hs b/testsuite/tests/indexed-types/should_compile/T5002.hs
index cfc82d559e..cfc82d559e 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/T5002.hs
+++ b/testsuite/tests/indexed-types/should_compile/T5002.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/TF_GADT.hs b/testsuite/tests/indexed-types/should_compile/TF_GADT.hs
index 345b5748e0..345b5748e0 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/TF_GADT.hs
+++ b/testsuite/tests/indexed-types/should_compile/TF_GADT.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/all.T b/testsuite/tests/indexed-types/should_compile/all.T
index 241bbe49c6..241bbe49c6 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/all.T
+++ b/testsuite/tests/indexed-types/should_compile/all.T
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/impexp.stderr b/testsuite/tests/indexed-types/should_compile/impexp.stderr
index 7ebebe9e03..7ebebe9e03 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/impexp.stderr
+++ b/testsuite/tests/indexed-types/should_compile/impexp.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/ind1.hs b/testsuite/tests/indexed-types/should_compile/ind1.hs
index 48203a1519..48203a1519 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/ind1.hs
+++ b/testsuite/tests/indexed-types/should_compile/ind1.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_compile/ind2.hs b/testsuite/tests/indexed-types/should_compile/ind2.hs
index de5d9d6a86..de5d9d6a86 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_compile/ind2.hs
+++ b/testsuite/tests/indexed-types/should_compile/ind2.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/DerivUnsatFam.hs b/testsuite/tests/indexed-types/should_fail/DerivUnsatFam.hs
index d401356326..d401356326 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/DerivUnsatFam.hs
+++ b/testsuite/tests/indexed-types/should_fail/DerivUnsatFam.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/DerivUnsatFam.stderr b/testsuite/tests/indexed-types/should_fail/DerivUnsatFam.stderr
index 63c1262147..63c1262147 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/DerivUnsatFam.stderr
+++ b/testsuite/tests/indexed-types/should_fail/DerivUnsatFam.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/GADTwrong1.hs b/testsuite/tests/indexed-types/should_fail/GADTwrong1.hs
index 7295090439..7295090439 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/GADTwrong1.hs
+++ b/testsuite/tests/indexed-types/should_fail/GADTwrong1.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/GADTwrong1.stderr b/testsuite/tests/indexed-types/should_fail/GADTwrong1.stderr
index e565aa6cde..e565aa6cde 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/GADTwrong1.stderr
+++ b/testsuite/tests/indexed-types/should_fail/GADTwrong1.stderr
diff --git a/testsuite/tests/indexed-types/should_fail/Makefile b/testsuite/tests/indexed-types/should_fail/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/indexed-types/should_fail/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/NoMatchErr.hs b/testsuite/tests/indexed-types/should_fail/NoMatchErr.hs
index 304e11613e..304e11613e 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/NoMatchErr.hs
+++ b/testsuite/tests/indexed-types/should_fail/NoMatchErr.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/NoMatchErr.stderr b/testsuite/tests/indexed-types/should_fail/NoMatchErr.stderr
index 38c8cf6b2f..38c8cf6b2f 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/NoMatchErr.stderr
+++ b/testsuite/tests/indexed-types/should_fail/NoMatchErr.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/NonLinearSigErr.hs b/testsuite/tests/indexed-types/should_fail/NonLinearSigErr.hs
index 34a9fd3ff6..34a9fd3ff6 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/NonLinearSigErr.hs
+++ b/testsuite/tests/indexed-types/should_fail/NonLinearSigErr.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/NonLinearSigErr.stderr b/testsuite/tests/indexed-types/should_fail/NonLinearSigErr.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/NonLinearSigErr.stderr
+++ b/testsuite/tests/indexed-types/should_fail/NonLinearSigErr.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/NotRelaxedExamples.hs b/testsuite/tests/indexed-types/should_fail/NotRelaxedExamples.hs
index d41f86b3a1..d41f86b3a1 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/NotRelaxedExamples.hs
+++ b/testsuite/tests/indexed-types/should_fail/NotRelaxedExamples.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/NotRelaxedExamples.stderr b/testsuite/tests/indexed-types/should_fail/NotRelaxedExamples.stderr
index dbc83696ee..dbc83696ee 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/NotRelaxedExamples.stderr
+++ b/testsuite/tests/indexed-types/should_fail/NotRelaxedExamples.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/Over.stderr b/testsuite/tests/indexed-types/should_fail/Over.stderr
index bb973eee08..bb973eee08 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/Over.stderr
+++ b/testsuite/tests/indexed-types/should_fail/Over.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/OverA.hs b/testsuite/tests/indexed-types/should_fail/OverA.hs
index 0f0573782f..0f0573782f 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/OverA.hs
+++ b/testsuite/tests/indexed-types/should_fail/OverA.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/OverB.hs b/testsuite/tests/indexed-types/should_fail/OverB.hs
index 6f1546d19f..6f1546d19f 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/OverB.hs
+++ b/testsuite/tests/indexed-types/should_fail/OverB.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/OverC.hs b/testsuite/tests/indexed-types/should_fail/OverC.hs
index 01f82d9170..01f82d9170 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/OverC.hs
+++ b/testsuite/tests/indexed-types/should_fail/OverC.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/OverD.hs b/testsuite/tests/indexed-types/should_fail/OverD.hs
index 3bce8de55e..3bce8de55e 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/OverD.hs
+++ b/testsuite/tests/indexed-types/should_fail/OverD.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail10.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail10.hs
index 7235f67e02..7235f67e02 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail10.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail10.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail10.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail10.stderr
index 5fe00056b3..5fe00056b3 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail10.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail10.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail11a.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail11a.hs
index 830b05fc75..830b05fc75 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail11a.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail11a.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail11a.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail11a.stderr
index 23a8fd957d..23a8fd957d 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail11a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail11a.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail11b.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail11b.hs
index f6aa7aa3b0..f6aa7aa3b0 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail11b.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail11b.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail11b.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail11b.stderr
index f32fe3a2bb..f32fe3a2bb 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail11b.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail11b.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail11c.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail11c.hs
index 21d3f2b4ea..21d3f2b4ea 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail11c.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail11c.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail11c.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail11c.stderr
index ccc897a626..ccc897a626 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail11c.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail11c.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail11d.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail11d.hs
index b0457a6933..b0457a6933 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail11d.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail11d.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail11d.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail11d.stderr
index 1847565329..1847565329 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail11d.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail11d.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail12.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail12.hs
index 0c8ffefefe..0c8ffefefe 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail12.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail12.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail12.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail12.stderr
index 24ac5f10a1..24ac5f10a1 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail12.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail12.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail13.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail13.hs
index bc94e2115a..bc94e2115a 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail13.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail13.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail13.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail13.stderr
index f87d4059ae..f87d4059ae 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail13.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail13.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail14.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail14.hs
index a25d81d3ba..a25d81d3ba 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail14.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail14.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail14.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail14.stderr
index e11f9500fb..e11f9500fb 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail14.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail14.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail15.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail15.hs
index 586403937b..586403937b 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail15.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail15.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail15.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail15.stderr
index 8f97746510..8f97746510 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail15.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail15.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail16.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail16.hs
index fc70df1fd8..fc70df1fd8 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail16.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail16.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail16.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail16.stderr
index 0573e15aea..0573e15aea 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail16.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail16.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail1a.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail1a.hs
index a87d5e515d..a87d5e515d 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail1a.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail1a.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail1a.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail1a.stderr
index 6bbbb32da9..6bbbb32da9 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail1a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail1a.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail1b.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail1b.hs
index 71ede91143..71ede91143 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail1b.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail1b.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail1b.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail1b.stderr
index e4db86bdf1..e4db86bdf1 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail1b.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail1b.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail2a.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail2a.hs
index 011426fe3b..011426fe3b 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail2a.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail2a.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail2a.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail2a.stderr
index 56e06e3145..56e06e3145 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail2a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail2a.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail2b.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail2b.hs
index 031b170a1a..031b170a1a 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail2b.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail2b.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail2b.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail2b.stderr
index cdb91dea58..cdb91dea58 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail2b.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail2b.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail3a.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail3a.hs
index 87f68ab124..87f68ab124 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail3a.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail3a.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail3a.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail3a.stderr
index 9a93d9fc90..9a93d9fc90 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail3a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail3a.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail3b.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail3b.stderr
index 419fe91492..419fe91492 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail3b.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail3b.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail4.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail4.hs
index de674a39fd..de674a39fd 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail4.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail4.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail4.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail4.stderr
index 0f42d5a572..0f42d5a572 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail4.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail4.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail5a.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail5a.hs
index e50250d4e7..e50250d4e7 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail5a.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail5a.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail5a.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail5a.stderr
index 861ef5c869..861ef5c869 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail5a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail5a.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail5b.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail5b.hs
index d05b3bcb36..d05b3bcb36 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail5b.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail5b.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail5b.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail5b.stderr
index 5a9d279860..5a9d279860 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail5b.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail5b.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail6.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail6.hs
index 8a39e6042d..8a39e6042d 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail6.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail6.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail6.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail6.stderr
index c5c7e8a86a..c5c7e8a86a 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail6.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail6.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail7.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail7.hs
index 3d9a089381..3d9a089381 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail7.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail7.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail7.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail7.stderr
index 04131efe33..04131efe33 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail7.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail7.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail8.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail8.hs
index cefb00f5b0..cefb00f5b0 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail8.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail8.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail8.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail8.stderr
index 88c71b690c..88c71b690c 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail8.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail8.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail9.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail9.hs
index d45c9830a4..d45c9830a4 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail9.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail9.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail9.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail9.stderr
index fb04fa8af7..fb04fa8af7 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SimpleFail9.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail9.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SkolemOccursLoop.hs b/testsuite/tests/indexed-types/should_fail/SkolemOccursLoop.hs
index ce86d7beab..ce86d7beab 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SkolemOccursLoop.hs
+++ b/testsuite/tests/indexed-types/should_fail/SkolemOccursLoop.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/SkolemOccursLoop.stderr b/testsuite/tests/indexed-types/should_fail/SkolemOccursLoop.stderr
index 0900da8e33..0900da8e33 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/SkolemOccursLoop.stderr
+++ b/testsuite/tests/indexed-types/should_fail/SkolemOccursLoop.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T1900.hs b/testsuite/tests/indexed-types/should_fail/T1900.hs
index efcfbc1391..efcfbc1391 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T1900.hs
+++ b/testsuite/tests/indexed-types/should_fail/T1900.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T1900.stderr b/testsuite/tests/indexed-types/should_fail/T1900.stderr
index 4e3be835c4..4e3be835c4 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T1900.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T1900.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2157.hs b/testsuite/tests/indexed-types/should_fail/T2157.hs
index c9e562051e..c9e562051e 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2157.hs
+++ b/testsuite/tests/indexed-types/should_fail/T2157.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2157.stderr b/testsuite/tests/indexed-types/should_fail/T2157.stderr
index b28f879663..b28f879663 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2157.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2157.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2203a.hs b/testsuite/tests/indexed-types/should_fail/T2203a.hs
index 89ed37e3da..89ed37e3da 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2203a.hs
+++ b/testsuite/tests/indexed-types/should_fail/T2203a.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2203a.stderr b/testsuite/tests/indexed-types/should_fail/T2203a.stderr
index cd12f6a7be..cd12f6a7be 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2203a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2203a.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2239.hs b/testsuite/tests/indexed-types/should_fail/T2239.hs
index 750fdd941c..750fdd941c 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2239.hs
+++ b/testsuite/tests/indexed-types/should_fail/T2239.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2239.stderr b/testsuite/tests/indexed-types/should_fail/T2239.stderr
index b8d5fc7a36..b8d5fc7a36 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2239.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2239.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2334.hs b/testsuite/tests/indexed-types/should_fail/T2334.hs
index c73402e2d5..c73402e2d5 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2334.hs
+++ b/testsuite/tests/indexed-types/should_fail/T2334.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2334.stderr b/testsuite/tests/indexed-types/should_fail/T2334.stderr
index 5bb3e24c22..5bb3e24c22 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2334.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2334.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2544.hs b/testsuite/tests/indexed-types/should_fail/T2544.hs
index 22f3995286..22f3995286 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2544.hs
+++ b/testsuite/tests/indexed-types/should_fail/T2544.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2544.stderr b/testsuite/tests/indexed-types/should_fail/T2544.stderr
index 6c977bf833..6c977bf833 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2544.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2544.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2627b.hs b/testsuite/tests/indexed-types/should_fail/T2627b.hs
index 13dbd9cb26..13dbd9cb26 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2627b.hs
+++ b/testsuite/tests/indexed-types/should_fail/T2627b.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2627b.stderr b/testsuite/tests/indexed-types/should_fail/T2627b.stderr
index a8e232486b..a8e232486b 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2627b.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2627b.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2664.hs b/testsuite/tests/indexed-types/should_fail/T2664.hs
index d5b04a6380..d5b04a6380 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2664.hs
+++ b/testsuite/tests/indexed-types/should_fail/T2664.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2664.stderr b/testsuite/tests/indexed-types/should_fail/T2664.stderr
index b3b8428a55..b3b8428a55 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2664.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2664.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2664a.hs b/testsuite/tests/indexed-types/should_fail/T2664a.hs
index b7a3033723..b7a3033723 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2664a.hs
+++ b/testsuite/tests/indexed-types/should_fail/T2664a.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2677.hs b/testsuite/tests/indexed-types/should_fail/T2677.hs
index 93288ba40d..93288ba40d 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2677.hs
+++ b/testsuite/tests/indexed-types/should_fail/T2677.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2677.stderr b/testsuite/tests/indexed-types/should_fail/T2677.stderr
index e1c08e3b15..e1c08e3b15 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2677.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2677.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2693.hs b/testsuite/tests/indexed-types/should_fail/T2693.hs
index 5b0066e948..5b0066e948 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2693.hs
+++ b/testsuite/tests/indexed-types/should_fail/T2693.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2693.stderr b/testsuite/tests/indexed-types/should_fail/T2693.stderr
index 2072d53296..2072d53296 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2693.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2693.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2888.hs b/testsuite/tests/indexed-types/should_fail/T2888.hs
index 169eebb474..169eebb474 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T2888.hs
+++ b/testsuite/tests/indexed-types/should_fail/T2888.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3092.hs b/testsuite/tests/indexed-types/should_fail/T3092.hs
index e3a671e67e..e3a671e67e 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3092.hs
+++ b/testsuite/tests/indexed-types/should_fail/T3092.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3092.stderr b/testsuite/tests/indexed-types/should_fail/T3092.stderr
index ceea069f8f..ceea069f8f 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3092.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T3092.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3330a.hs b/testsuite/tests/indexed-types/should_fail/T3330a.hs
index c09eb0fd5c..c09eb0fd5c 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3330a.hs
+++ b/testsuite/tests/indexed-types/should_fail/T3330a.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3330a.stderr b/testsuite/tests/indexed-types/should_fail/T3330a.stderr
index cfe7f67270..cfe7f67270 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3330a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T3330a.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3330b.hs b/testsuite/tests/indexed-types/should_fail/T3330b.hs
index 05d2282304..05d2282304 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3330b.hs
+++ b/testsuite/tests/indexed-types/should_fail/T3330b.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3330b.stderr b/testsuite/tests/indexed-types/should_fail/T3330b.stderr
index 927bd5b483..927bd5b483 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3330b.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T3330b.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3330c.hs b/testsuite/tests/indexed-types/should_fail/T3330c.hs
index e6c4dfbb30..e6c4dfbb30 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3330c.hs
+++ b/testsuite/tests/indexed-types/should_fail/T3330c.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3330c.stderr b/testsuite/tests/indexed-types/should_fail/T3330c.stderr
index 4ca19f8a4e..4ca19f8a4e 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3330c.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T3330c.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3440.hs b/testsuite/tests/indexed-types/should_fail/T3440.hs
index 0bf1544009..0bf1544009 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3440.hs
+++ b/testsuite/tests/indexed-types/should_fail/T3440.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3440.stderr b/testsuite/tests/indexed-types/should_fail/T3440.stderr
index fe61b1da65..fe61b1da65 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T3440.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T3440.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4093a.hs b/testsuite/tests/indexed-types/should_fail/T4093a.hs
index 06168f577e..06168f577e 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4093a.hs
+++ b/testsuite/tests/indexed-types/should_fail/T4093a.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4093a.stderr b/testsuite/tests/indexed-types/should_fail/T4093a.stderr
index 0b36936be9..0b36936be9 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4093a.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4093a.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4093b.hs b/testsuite/tests/indexed-types/should_fail/T4093b.hs
index 2d9878541f..2d9878541f 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4093b.hs
+++ b/testsuite/tests/indexed-types/should_fail/T4093b.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4093b.stderr b/testsuite/tests/indexed-types/should_fail/T4093b.stderr
index 6818e006ef..6818e006ef 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4093b.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4093b.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4099.hs b/testsuite/tests/indexed-types/should_fail/T4099.hs
index 1ca3c7a4a5..1ca3c7a4a5 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4099.hs
+++ b/testsuite/tests/indexed-types/should_fail/T4099.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4099.stderr b/testsuite/tests/indexed-types/should_fail/T4099.stderr
index 1f5a917296..1f5a917296 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4099.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4099.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4174.hs b/testsuite/tests/indexed-types/should_fail/T4174.hs
index 784c0baa08..784c0baa08 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4174.hs
+++ b/testsuite/tests/indexed-types/should_fail/T4174.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4174.stderr b/testsuite/tests/indexed-types/should_fail/T4174.stderr
index 2a403786d9..2a403786d9 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4174.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4174.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4174.stderr-ghc-7.0 b/testsuite/tests/indexed-types/should_fail/T4174.stderr-ghc-7.0
index 81fb603dd8..81fb603dd8 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4174.stderr-ghc-7.0
+++ b/testsuite/tests/indexed-types/should_fail/T4174.stderr-ghc-7.0
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4179.hs b/testsuite/tests/indexed-types/should_fail/T4179.hs
index ee54100ccc..ee54100ccc 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4179.hs
+++ b/testsuite/tests/indexed-types/should_fail/T4179.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4179.stderr b/testsuite/tests/indexed-types/should_fail/T4179.stderr
index 50c1ad5365..50c1ad5365 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4179.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4179.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4246.hs b/testsuite/tests/indexed-types/should_fail/T4246.hs
index b5c37a68e3..b5c37a68e3 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4246.hs
+++ b/testsuite/tests/indexed-types/should_fail/T4246.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4246.stderr b/testsuite/tests/indexed-types/should_fail/T4246.stderr
index fe1cfce250..fe1cfce250 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4246.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4246.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4254.hs b/testsuite/tests/indexed-types/should_fail/T4254.hs
index b12ffb4f87..b12ffb4f87 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4254.hs
+++ b/testsuite/tests/indexed-types/should_fail/T4254.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4254.stderr b/testsuite/tests/indexed-types/should_fail/T4254.stderr
index 03aa80bdac..03aa80bdac 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4254.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4254.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4272.hs b/testsuite/tests/indexed-types/should_fail/T4272.hs
index 3370fc3637..3370fc3637 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4272.hs
+++ b/testsuite/tests/indexed-types/should_fail/T4272.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4272.stderr b/testsuite/tests/indexed-types/should_fail/T4272.stderr
index 792cde92b8..792cde92b8 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4272.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4272.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4485.hs b/testsuite/tests/indexed-types/should_fail/T4485.hs
index b48e8206f2..b48e8206f2 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4485.hs
+++ b/testsuite/tests/indexed-types/should_fail/T4485.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4485.stderr b/testsuite/tests/indexed-types/should_fail/T4485.stderr
index a9e9792cda..a9e9792cda 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/T4485.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T4485.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/TyFamArity1.hs b/testsuite/tests/indexed-types/should_fail/TyFamArity1.hs
index 4a35071e2f..4a35071e2f 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/TyFamArity1.hs
+++ b/testsuite/tests/indexed-types/should_fail/TyFamArity1.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/TyFamArity1.stderr b/testsuite/tests/indexed-types/should_fail/TyFamArity1.stderr
index 7ee60167e1..7ee60167e1 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/TyFamArity1.stderr
+++ b/testsuite/tests/indexed-types/should_fail/TyFamArity1.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/TyFamArity2.hs b/testsuite/tests/indexed-types/should_fail/TyFamArity2.hs
index 2bff129925..2bff129925 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/TyFamArity2.hs
+++ b/testsuite/tests/indexed-types/should_fail/TyFamArity2.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/TyFamArity2.stderr b/testsuite/tests/indexed-types/should_fail/TyFamArity2.stderr
index 30d0526664..30d0526664 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/TyFamArity2.stderr
+++ b/testsuite/tests/indexed-types/should_fail/TyFamArity2.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/TyFamUndec.hs b/testsuite/tests/indexed-types/should_fail/TyFamUndec.hs
index 2c81faab2d..2c81faab2d 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/TyFamUndec.hs
+++ b/testsuite/tests/indexed-types/should_fail/TyFamUndec.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/TyFamUndec.stderr b/testsuite/tests/indexed-types/should_fail/TyFamUndec.stderr
index 2fc8e1b078..2fc8e1b078 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/TyFamUndec.stderr
+++ b/testsuite/tests/indexed-types/should_fail/TyFamUndec.stderr
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_fail/all.T b/testsuite/tests/indexed-types/should_fail/all.T
index f2d904d32e..f2d904d32e 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_fail/all.T
+++ b/testsuite/tests/indexed-types/should_fail/all.T
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_run/GMapAssoc.hs b/testsuite/tests/indexed-types/should_run/GMapAssoc.hs
index 404818ea55..404818ea55 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_run/GMapAssoc.hs
+++ b/testsuite/tests/indexed-types/should_run/GMapAssoc.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_run/GMapAssoc.stdout b/testsuite/tests/indexed-types/should_run/GMapAssoc.stdout
index 27fa244dde..27fa244dde 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_run/GMapAssoc.stdout
+++ b/testsuite/tests/indexed-types/should_run/GMapAssoc.stdout
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_run/GMapTop.hs b/testsuite/tests/indexed-types/should_run/GMapTop.hs
index 9ce830950b..9ce830950b 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_run/GMapTop.hs
+++ b/testsuite/tests/indexed-types/should_run/GMapTop.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_run/GMapTop.stdout b/testsuite/tests/indexed-types/should_run/GMapTop.stdout
index 27fa244dde..27fa244dde 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_run/GMapTop.stdout
+++ b/testsuite/tests/indexed-types/should_run/GMapTop.stdout
diff --git a/testsuite/tests/indexed-types/should_run/Makefile b/testsuite/tests/indexed-types/should_run/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/indexed-types/should_run/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_run/T2985.hs b/testsuite/tests/indexed-types/should_run/T2985.hs
index 6ae6e12c50..6ae6e12c50 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_run/T2985.hs
+++ b/testsuite/tests/indexed-types/should_run/T2985.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_run/T2985.stdout b/testsuite/tests/indexed-types/should_run/T2985.stdout
index 2ba96498ec..2ba96498ec 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_run/T2985.stdout
+++ b/testsuite/tests/indexed-types/should_run/T2985.stdout
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_run/T4235.hs b/testsuite/tests/indexed-types/should_run/T4235.hs
index 45ba33df20..45ba33df20 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_run/T4235.hs
+++ b/testsuite/tests/indexed-types/should_run/T4235.hs
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_run/T4235.stdout b/testsuite/tests/indexed-types/should_run/T4235.stdout
index 3b5ac7194f..3b5ac7194f 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_run/T4235.stdout
+++ b/testsuite/tests/indexed-types/should_run/T4235.stdout
diff --git a/testsuite/tests/ghc-regress/indexed-types/should_run/all.T b/testsuite/tests/indexed-types/should_run/all.T
index 454e702c0e..454e702c0e 100644
--- a/testsuite/tests/ghc-regress/indexed-types/should_run/all.T
+++ b/testsuite/tests/indexed-types/should_run/all.T
diff --git a/testsuite/tests/layout/Makefile b/testsuite/tests/layout/Makefile
new file mode 100644
index 0000000000..c87b830cab
--- /dev/null
+++ b/testsuite/tests/layout/Makefile
@@ -0,0 +1,15 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+layout001 layout002 layout003 layout004 layout005 layout006 layout007 layout008 layout009: %:
+	$(RM) $*.hi $*.o
+	echo Running with -XNoAlternativeLayoutRule
+	-"$(TEST_HC)" $(TEST_HC_OPTS) -v0 -XNoAlternativeLayoutRule -c $*.hs 2>&1
+	$(RM) $*.hi $*.o
+	echo Running with -XAlternativeLayoutRule
+	-"$(TEST_HC)" $(TEST_HC_OPTS) -v0 -XAlternativeLayoutRule -c $*.hs 2>&1
+	$(RM) $*.hi $*.o
+	echo Running with -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional
+	-"$(TEST_HC)" $(TEST_HC_OPTS) -v0 -XAlternativeLayoutRule -XAlternativeLayoutRuleTransitional -c $*.hs 2>&1
+
diff --git a/testsuite/tests/ghc-regress/layout/all.T b/testsuite/tests/layout/all.T
index 026ad465a0..026ad465a0 100644
--- a/testsuite/tests/ghc-regress/layout/all.T
+++ b/testsuite/tests/layout/all.T
diff --git a/testsuite/tests/ghc-regress/layout/layout001.hs b/testsuite/tests/layout/layout001.hs
index 1bf76fd859..1bf76fd859 100644
--- a/testsuite/tests/ghc-regress/layout/layout001.hs
+++ b/testsuite/tests/layout/layout001.hs
diff --git a/testsuite/tests/ghc-regress/layout/layout001.stdout b/testsuite/tests/layout/layout001.stdout
index be1cd62b20..be1cd62b20 100644
--- a/testsuite/tests/ghc-regress/layout/layout001.stdout
+++ b/testsuite/tests/layout/layout001.stdout
diff --git a/testsuite/tests/ghc-regress/layout/layout002.hs b/testsuite/tests/layout/layout002.hs
index 17f895e092..17f895e092 100644
--- a/testsuite/tests/ghc-regress/layout/layout002.hs
+++ b/testsuite/tests/layout/layout002.hs
diff --git a/testsuite/tests/ghc-regress/layout/layout002.stdout b/testsuite/tests/layout/layout002.stdout
index 7197cdaa39..7197cdaa39 100644
--- a/testsuite/tests/ghc-regress/layout/layout002.stdout
+++ b/testsuite/tests/layout/layout002.stdout
diff --git a/testsuite/tests/ghc-regress/layout/layout003.hs b/testsuite/tests/layout/layout003.hs
index d9a99afdcb..d9a99afdcb 100644
--- a/testsuite/tests/ghc-regress/layout/layout003.hs
+++ b/testsuite/tests/layout/layout003.hs
diff --git a/testsuite/tests/ghc-regress/layout/layout003.stdout b/testsuite/tests/layout/layout003.stdout
index e40bac2077..e40bac2077 100644
--- a/testsuite/tests/ghc-regress/layout/layout003.stdout
+++ b/testsuite/tests/layout/layout003.stdout
diff --git a/testsuite/tests/ghc-regress/layout/layout004.hs b/testsuite/tests/layout/layout004.hs
index 46e47b13bd..46e47b13bd 100644
--- a/testsuite/tests/ghc-regress/layout/layout004.hs
+++ b/testsuite/tests/layout/layout004.hs
diff --git a/testsuite/tests/ghc-regress/layout/layout004.stdout b/testsuite/tests/layout/layout004.stdout
index bb5cb0661b..bb5cb0661b 100644
--- a/testsuite/tests/ghc-regress/layout/layout004.stdout
+++ b/testsuite/tests/layout/layout004.stdout
diff --git a/testsuite/tests/ghc-regress/layout/layout005.hs b/testsuite/tests/layout/layout005.hs
index df68795665..df68795665 100644
--- a/testsuite/tests/ghc-regress/layout/layout005.hs
+++ b/testsuite/tests/layout/layout005.hs
diff --git a/testsuite/tests/ghc-regress/layout/layout005.stdout b/testsuite/tests/layout/layout005.stdout
index 7197cdaa39..7197cdaa39 100644
--- a/testsuite/tests/ghc-regress/layout/layout005.stdout
+++ b/testsuite/tests/layout/layout005.stdout
diff --git a/testsuite/tests/ghc-regress/layout/layout006.hs b/testsuite/tests/layout/layout006.hs
index 70eacb42cf..70eacb42cf 100644
--- a/testsuite/tests/ghc-regress/layout/layout006.hs
+++ b/testsuite/tests/layout/layout006.hs
diff --git a/testsuite/tests/ghc-regress/layout/layout006.stdout b/testsuite/tests/layout/layout006.stdout
index ab33a6e1fe..ab33a6e1fe 100644
--- a/testsuite/tests/ghc-regress/layout/layout006.stdout
+++ b/testsuite/tests/layout/layout006.stdout
diff --git a/testsuite/tests/ghc-regress/layout/layout007.hs b/testsuite/tests/layout/layout007.hs
index f620bdb2e8..f620bdb2e8 100644
--- a/testsuite/tests/ghc-regress/layout/layout007.hs
+++ b/testsuite/tests/layout/layout007.hs
diff --git a/testsuite/tests/ghc-regress/layout/layout007.stdout b/testsuite/tests/layout/layout007.stdout
index 7197cdaa39..7197cdaa39 100644
--- a/testsuite/tests/ghc-regress/layout/layout007.stdout
+++ b/testsuite/tests/layout/layout007.stdout
diff --git a/testsuite/tests/ghc-regress/layout/layout008.hs b/testsuite/tests/layout/layout008.hs
index e484ebe44c..e484ebe44c 100644
--- a/testsuite/tests/ghc-regress/layout/layout008.hs
+++ b/testsuite/tests/layout/layout008.hs
diff --git a/testsuite/tests/ghc-regress/layout/layout008.stdout b/testsuite/tests/layout/layout008.stdout
index 7197cdaa39..7197cdaa39 100644
--- a/testsuite/tests/ghc-regress/layout/layout008.stdout
+++ b/testsuite/tests/layout/layout008.stdout
diff --git a/testsuite/tests/ghc-regress/layout/layout009.hs b/testsuite/tests/layout/layout009.hs
index 5383a4d80e..5383a4d80e 100644
--- a/testsuite/tests/ghc-regress/layout/layout009.hs
+++ b/testsuite/tests/layout/layout009.hs
diff --git a/testsuite/tests/ghc-regress/layout/layout009.stdout b/testsuite/tests/layout/layout009.stdout
index 7197cdaa39..7197cdaa39 100644
--- a/testsuite/tests/ghc-regress/layout/layout009.stdout
+++ b/testsuite/tests/layout/layout009.stdout
diff --git a/testsuite/tests/ghc-regress/lib/CPUTime/CPUTime001.hs b/testsuite/tests/lib/CPUTime/CPUTime001.hs
index 6c43c57ec5..6c43c57ec5 100644
--- a/testsuite/tests/ghc-regress/lib/CPUTime/CPUTime001.hs
+++ b/testsuite/tests/lib/CPUTime/CPUTime001.hs
diff --git a/testsuite/tests/ghc-regress/lib/CPUTime/CPUTime001.stdout b/testsuite/tests/lib/CPUTime/CPUTime001.stdout
index 032e7595f0..032e7595f0 100644
--- a/testsuite/tests/ghc-regress/lib/CPUTime/CPUTime001.stdout
+++ b/testsuite/tests/lib/CPUTime/CPUTime001.stdout
diff --git a/testsuite/tests/lib/CPUTime/Makefile b/testsuite/tests/lib/CPUTime/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/CPUTime/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/CPUTime/all.T b/testsuite/tests/lib/CPUTime/all.T
index d204b0a7aa..d204b0a7aa 100644
--- a/testsuite/tests/ghc-regress/lib/CPUTime/all.T
+++ b/testsuite/tests/lib/CPUTime/all.T
diff --git a/testsuite/tests/lib/Char/Makefile b/testsuite/tests/lib/Char/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/Char/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Char/all.T b/testsuite/tests/lib/Char/all.T
index 81ecb28f69..81ecb28f69 100644
--- a/testsuite/tests/ghc-regress/lib/Char/all.T
+++ b/testsuite/tests/lib/Char/all.T
diff --git a/testsuite/tests/ghc-regress/lib/Char/readLitChar.hs b/testsuite/tests/lib/Char/readLitChar.hs
index 7dc01e36e4..7dc01e36e4 100644
--- a/testsuite/tests/ghc-regress/lib/Char/readLitChar.hs
+++ b/testsuite/tests/lib/Char/readLitChar.hs
diff --git a/testsuite/tests/ghc-regress/lib/Char/readLitChar.stdout b/testsuite/tests/lib/Char/readLitChar.stdout
index 649c342e4a..649c342e4a 100644
--- a/testsuite/tests/ghc-regress/lib/Char/readLitChar.stdout
+++ b/testsuite/tests/lib/Char/readLitChar.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Char/unicode001.hs b/testsuite/tests/lib/Char/unicode001.hs
index 90da1d80ee..90da1d80ee 100644
--- a/testsuite/tests/ghc-regress/lib/Char/unicode001.hs
+++ b/testsuite/tests/lib/Char/unicode001.hs
diff --git a/testsuite/tests/ghc-regress/lib/Char/unicode001.stdout b/testsuite/tests/lib/Char/unicode001.stdout
index 86163abae1..86163abae1 100644
--- a/testsuite/tests/ghc-regress/lib/Char/unicode001.stdout
+++ b/testsuite/tests/lib/Char/unicode001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Char/unicode001.stdout-hugs b/testsuite/tests/lib/Char/unicode001.stdout-hugs
index 98c9568f8e..98c9568f8e 100644
--- a/testsuite/tests/ghc-regress/lib/Char/unicode001.stdout-hugs
+++ b/testsuite/tests/lib/Char/unicode001.stdout-hugs
diff --git a/testsuite/tests/ghc-regress/lib/Char/unicode002.hs b/testsuite/tests/lib/Char/unicode002.hs
index 50ed5ddf44..50ed5ddf44 100644
--- a/testsuite/tests/ghc-regress/lib/Char/unicode002.hs
+++ b/testsuite/tests/lib/Char/unicode002.hs
diff --git a/testsuite/tests/ghc-regress/lib/Char/unicode002.stdout b/testsuite/tests/lib/Char/unicode002.stdout
index 5c1f4c3342..5c1f4c3342 100644
--- a/testsuite/tests/ghc-regress/lib/Char/unicode002.stdout
+++ b/testsuite/tests/lib/Char/unicode002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Concurrent/4876.hs b/testsuite/tests/lib/Concurrent/4876.hs
index 68c2a871b8..68c2a871b8 100644
--- a/testsuite/tests/ghc-regress/lib/Concurrent/4876.hs
+++ b/testsuite/tests/lib/Concurrent/4876.hs
diff --git a/testsuite/tests/ghc-regress/lib/Concurrent/4876.stdout b/testsuite/tests/lib/Concurrent/4876.stdout
index 00750edc07..00750edc07 100644
--- a/testsuite/tests/ghc-regress/lib/Concurrent/4876.stdout
+++ b/testsuite/tests/lib/Concurrent/4876.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Concurrent/Chan001.hs b/testsuite/tests/lib/Concurrent/Chan001.hs
index e4b668ac48..e4b668ac48 100644
--- a/testsuite/tests/ghc-regress/lib/Concurrent/Chan001.hs
+++ b/testsuite/tests/lib/Concurrent/Chan001.hs
diff --git a/testsuite/tests/ghc-regress/lib/Concurrent/Chan001.stdout b/testsuite/tests/lib/Concurrent/Chan001.stdout
index 53bfa8a381..53bfa8a381 100644
--- a/testsuite/tests/ghc-regress/lib/Concurrent/Chan001.stdout
+++ b/testsuite/tests/lib/Concurrent/Chan001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Concurrent/MVar001.hs b/testsuite/tests/lib/Concurrent/MVar001.hs
index f787470c51..f787470c51 100644
--- a/testsuite/tests/ghc-regress/lib/Concurrent/MVar001.hs
+++ b/testsuite/tests/lib/Concurrent/MVar001.hs
diff --git a/testsuite/tests/ghc-regress/lib/Concurrent/MVar001.stdout b/testsuite/tests/lib/Concurrent/MVar001.stdout
index 65be56c733..65be56c733 100644
--- a/testsuite/tests/ghc-regress/lib/Concurrent/MVar001.stdout
+++ b/testsuite/tests/lib/Concurrent/MVar001.stdout
diff --git a/testsuite/tests/lib/Concurrent/Makefile b/testsuite/tests/lib/Concurrent/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/Concurrent/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Concurrent/QSem001.hs b/testsuite/tests/lib/Concurrent/QSem001.hs
index 1f255997e7..1f255997e7 100644
--- a/testsuite/tests/ghc-regress/lib/Concurrent/QSem001.hs
+++ b/testsuite/tests/lib/Concurrent/QSem001.hs
diff --git a/testsuite/tests/ghc-regress/lib/Concurrent/QSem001.stdout b/testsuite/tests/lib/Concurrent/QSem001.stdout
index 7288d19270..7288d19270 100644
--- a/testsuite/tests/ghc-regress/lib/Concurrent/QSem001.stdout
+++ b/testsuite/tests/lib/Concurrent/QSem001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Concurrent/QSemN001.hs b/testsuite/tests/lib/Concurrent/QSemN001.hs
index c31d6a6964..c31d6a6964 100644
--- a/testsuite/tests/ghc-regress/lib/Concurrent/QSemN001.hs
+++ b/testsuite/tests/lib/Concurrent/QSemN001.hs
diff --git a/testsuite/tests/ghc-regress/lib/Concurrent/QSemN001.stdout b/testsuite/tests/lib/Concurrent/QSemN001.stdout
index 7288d19270..7288d19270 100644
--- a/testsuite/tests/ghc-regress/lib/Concurrent/QSemN001.stdout
+++ b/testsuite/tests/lib/Concurrent/QSemN001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Concurrent/SampleVar001.hs b/testsuite/tests/lib/Concurrent/SampleVar001.hs
index def86c5d54..def86c5d54 100644
--- a/testsuite/tests/ghc-regress/lib/Concurrent/SampleVar001.hs
+++ b/testsuite/tests/lib/Concurrent/SampleVar001.hs
diff --git a/testsuite/tests/ghc-regress/lib/Concurrent/SampleVar001.stdout b/testsuite/tests/lib/Concurrent/SampleVar001.stdout
index 65be56c733..65be56c733 100644
--- a/testsuite/tests/ghc-regress/lib/Concurrent/SampleVar001.stdout
+++ b/testsuite/tests/lib/Concurrent/SampleVar001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Concurrent/ThreadDelay001.hs b/testsuite/tests/lib/Concurrent/ThreadDelay001.hs
index c60f997039..c60f997039 100644
--- a/testsuite/tests/ghc-regress/lib/Concurrent/ThreadDelay001.hs
+++ b/testsuite/tests/lib/Concurrent/ThreadDelay001.hs
diff --git a/testsuite/tests/ghc-regress/lib/Concurrent/all.T b/testsuite/tests/lib/Concurrent/all.T
index 004c6a1226..004c6a1226 100644
--- a/testsuite/tests/ghc-regress/lib/Concurrent/all.T
+++ b/testsuite/tests/lib/Concurrent/all.T
diff --git a/testsuite/tests/lib/Data.ByteString/Makefile b/testsuite/tests/lib/Data.ByteString/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/Data.ByteString/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Data.ByteString/all.T b/testsuite/tests/lib/Data.ByteString/all.T
index 75c5574302..75c5574302 100644
--- a/testsuite/tests/ghc-regress/lib/Data.ByteString/all.T
+++ b/testsuite/tests/lib/Data.ByteString/all.T
diff --git a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring001.hs b/testsuite/tests/lib/Data.ByteString/bytestring001.hs
index 00cfcb3763..00cfcb3763 100644
--- a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring001.hs
+++ b/testsuite/tests/lib/Data.ByteString/bytestring001.hs
diff --git a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring001.stdout b/testsuite/tests/lib/Data.ByteString/bytestring001.stdout
index e2b220dc41..e2b220dc41 100644
--- a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring001.stdout
+++ b/testsuite/tests/lib/Data.ByteString/bytestring001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring002.hs b/testsuite/tests/lib/Data.ByteString/bytestring002.hs
index 23d6cf270f..23d6cf270f 100644
--- a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring002.hs
+++ b/testsuite/tests/lib/Data.ByteString/bytestring002.hs
diff --git a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring002.stdin b/testsuite/tests/lib/Data.ByteString/bytestring002.stdin
index abffbabe44..abffbabe44 100644
--- a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring002.stdin
+++ b/testsuite/tests/lib/Data.ByteString/bytestring002.stdin
diff --git a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring002.stdout b/testsuite/tests/lib/Data.ByteString/bytestring002.stdout
index 83b33d238d..83b33d238d 100644
--- a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring002.stdout
+++ b/testsuite/tests/lib/Data.ByteString/bytestring002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring003.hs b/testsuite/tests/lib/Data.ByteString/bytestring003.hs
index c31ab8d17f..c31ab8d17f 100644
--- a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring003.hs
+++ b/testsuite/tests/lib/Data.ByteString/bytestring003.hs
diff --git a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring003.stdin b/testsuite/tests/lib/Data.ByteString/bytestring003.stdin
index 956aba1447..956aba1447 100644
--- a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring003.stdin
+++ b/testsuite/tests/lib/Data.ByteString/bytestring003.stdin
diff --git a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring003.stdout b/testsuite/tests/lib/Data.ByteString/bytestring003.stdout
index 1b79f38e25..1b79f38e25 100644
--- a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring003.stdout
+++ b/testsuite/tests/lib/Data.ByteString/bytestring003.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring004.hs b/testsuite/tests/lib/Data.ByteString/bytestring004.hs
index 5c4df86a90..5c4df86a90 100644
--- a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring004.hs
+++ b/testsuite/tests/lib/Data.ByteString/bytestring004.hs
diff --git a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring004.stdout b/testsuite/tests/lib/Data.ByteString/bytestring004.stdout
index cbc88dbf91..cbc88dbf91 100644
--- a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring004.stdout
+++ b/testsuite/tests/lib/Data.ByteString/bytestring004.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring005.hs b/testsuite/tests/lib/Data.ByteString/bytestring005.hs
index 7bd37da004..7bd37da004 100644
--- a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring005.hs
+++ b/testsuite/tests/lib/Data.ByteString/bytestring005.hs
diff --git a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring005.stdout b/testsuite/tests/lib/Data.ByteString/bytestring005.stdout
index 2efe5278dc..2efe5278dc 100644
--- a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring005.stdout
+++ b/testsuite/tests/lib/Data.ByteString/bytestring005.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring006.hs b/testsuite/tests/lib/Data.ByteString/bytestring006.hs
index d58147a485..d58147a485 100644
--- a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring006.hs
+++ b/testsuite/tests/lib/Data.ByteString/bytestring006.hs
diff --git a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring006.stdout b/testsuite/tests/lib/Data.ByteString/bytestring006.stdout
index 240d746197..240d746197 100644
--- a/testsuite/tests/ghc-regress/lib/Data.ByteString/bytestring006.stdout
+++ b/testsuite/tests/lib/Data.ByteString/bytestring006.stdout
diff --git a/testsuite/tests/lib/Data.Fixed/Makefile b/testsuite/tests/lib/Data.Fixed/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/Data.Fixed/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Data.Fixed/all.T b/testsuite/tests/lib/Data.Fixed/all.T
index c4d77d28c8..c4d77d28c8 100644
--- a/testsuite/tests/ghc-regress/lib/Data.Fixed/all.T
+++ b/testsuite/tests/lib/Data.Fixed/all.T
diff --git a/testsuite/tests/ghc-regress/lib/Data.Fixed/data-fixed-show-read.hs b/testsuite/tests/lib/Data.Fixed/data-fixed-show-read.hs
index 349f639f2c..349f639f2c 100644
--- a/testsuite/tests/ghc-regress/lib/Data.Fixed/data-fixed-show-read.hs
+++ b/testsuite/tests/lib/Data.Fixed/data-fixed-show-read.hs
diff --git a/testsuite/tests/ghc-regress/lib/Data.Fixed/data-fixed-show-read.stdout b/testsuite/tests/lib/Data.Fixed/data-fixed-show-read.stdout
index 0e5d7caef5..0e5d7caef5 100644
--- a/testsuite/tests/ghc-regress/lib/Data.Fixed/data-fixed-show-read.stdout
+++ b/testsuite/tests/lib/Data.Fixed/data-fixed-show-read.stdout
diff --git a/testsuite/tests/lib/Data.HashTable/Makefile b/testsuite/tests/lib/Data.HashTable/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/Data.HashTable/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Data.HashTable/all.T b/testsuite/tests/lib/Data.HashTable/all.T
index 20b60f27cc..20b60f27cc 100644
--- a/testsuite/tests/ghc-regress/lib/Data.HashTable/all.T
+++ b/testsuite/tests/lib/Data.HashTable/all.T
diff --git a/testsuite/tests/ghc-regress/lib/Data.HashTable/hash001.hs b/testsuite/tests/lib/Data.HashTable/hash001.hs
index 727f488eb3..727f488eb3 100644
--- a/testsuite/tests/ghc-regress/lib/Data.HashTable/hash001.hs
+++ b/testsuite/tests/lib/Data.HashTable/hash001.hs
diff --git a/testsuite/tests/lib/Data.Ix/Makefile b/testsuite/tests/lib/Data.Ix/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/Data.Ix/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Data.Ix/all.T b/testsuite/tests/lib/Data.Ix/all.T
index 972be5dc08..972be5dc08 100644
--- a/testsuite/tests/ghc-regress/lib/Data.Ix/all.T
+++ b/testsuite/tests/lib/Data.Ix/all.T
diff --git a/testsuite/tests/ghc-regress/lib/Data.Ix/ix001.hs b/testsuite/tests/lib/Data.Ix/ix001.hs
index c723472bce..c723472bce 100644
--- a/testsuite/tests/ghc-regress/lib/Data.Ix/ix001.hs
+++ b/testsuite/tests/lib/Data.Ix/ix001.hs
diff --git a/testsuite/tests/ghc-regress/lib/Data.Ix/ix001.stdout b/testsuite/tests/lib/Data.Ix/ix001.stdout
index 7a53b35687..7a53b35687 100644
--- a/testsuite/tests/ghc-regress/lib/Data.Ix/ix001.stdout
+++ b/testsuite/tests/lib/Data.Ix/ix001.stdout
diff --git a/testsuite/tests/lib/Data.List/Makefile b/testsuite/tests/lib/Data.List/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/Data.List/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Data.List/all.T b/testsuite/tests/lib/Data.List/all.T
index 125734882a..125734882a 100644
--- a/testsuite/tests/ghc-regress/lib/Data.List/all.T
+++ b/testsuite/tests/lib/Data.List/all.T
diff --git a/testsuite/tests/ghc-regress/lib/Data.List/genericNegative001.hs b/testsuite/tests/lib/Data.List/genericNegative001.hs
index f59a42ffbc..f59a42ffbc 100644
--- a/testsuite/tests/ghc-regress/lib/Data.List/genericNegative001.hs
+++ b/testsuite/tests/lib/Data.List/genericNegative001.hs
diff --git a/testsuite/tests/ghc-regress/lib/Data.List/genericNegative001.stdout b/testsuite/tests/lib/Data.List/genericNegative001.stdout
index b8a090716c..b8a090716c 100644
--- a/testsuite/tests/ghc-regress/lib/Data.List/genericNegative001.stdout
+++ b/testsuite/tests/lib/Data.List/genericNegative001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Data.List/take001.hs b/testsuite/tests/lib/Data.List/take001.hs
index a7a531480a..a7a531480a 100644
--- a/testsuite/tests/ghc-regress/lib/Data.List/take001.hs
+++ b/testsuite/tests/lib/Data.List/take001.hs
diff --git a/testsuite/tests/ghc-regress/lib/Data.List/take001.stdout b/testsuite/tests/lib/Data.List/take001.stdout
index 92232f694a..92232f694a 100644
--- a/testsuite/tests/ghc-regress/lib/Data.List/take001.stdout
+++ b/testsuite/tests/lib/Data.List/take001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/2122.hs b/testsuite/tests/lib/IO/2122.hs
index 6807f3476a..6807f3476a 100644
--- a/testsuite/tests/ghc-regress/lib/IO/2122.hs
+++ b/testsuite/tests/lib/IO/2122.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/3307.hs b/testsuite/tests/lib/IO/3307.hs
index fb1a360ea2..fb1a360ea2 100644
--- a/testsuite/tests/ghc-regress/lib/IO/3307.hs
+++ b/testsuite/tests/lib/IO/3307.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/3307.stdout b/testsuite/tests/lib/IO/3307.stdout
index 8b26b5ff1d..8b26b5ff1d 100644
--- a/testsuite/tests/ghc-regress/lib/IO/3307.stdout
+++ b/testsuite/tests/lib/IO/3307.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/4808.hs b/testsuite/tests/lib/IO/4808.hs
index 97ca344bb4..97ca344bb4 100644
--- a/testsuite/tests/ghc-regress/lib/IO/4808.hs
+++ b/testsuite/tests/lib/IO/4808.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/4808.stderr b/testsuite/tests/lib/IO/4808.stderr
index cccd936d05..cccd936d05 100644
--- a/testsuite/tests/ghc-regress/lib/IO/4808.stderr
+++ b/testsuite/tests/lib/IO/4808.stderr
diff --git a/testsuite/tests/ghc-regress/lib/IO/4808.stdout b/testsuite/tests/lib/IO/4808.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/lib/IO/4808.stdout
+++ b/testsuite/tests/lib/IO/4808.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/4855.hs b/testsuite/tests/lib/IO/4855.hs
index fa862aaf14..fa862aaf14 100644
--- a/testsuite/tests/ghc-regress/lib/IO/4855.hs
+++ b/testsuite/tests/lib/IO/4855.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/4855.stderr b/testsuite/tests/lib/IO/4855.stderr
index 558550e229..558550e229 100644
--- a/testsuite/tests/ghc-regress/lib/IO/4855.stderr
+++ b/testsuite/tests/lib/IO/4855.stderr
diff --git a/testsuite/tests/ghc-regress/lib/IO/4895.hs b/testsuite/tests/lib/IO/4895.hs
index bb37915e19..bb37915e19 100644
--- a/testsuite/tests/ghc-regress/lib/IO/4895.hs
+++ b/testsuite/tests/lib/IO/4895.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/4895.stdout b/testsuite/tests/lib/IO/4895.stdout
index f599e28b8a..f599e28b8a 100644
--- a/testsuite/tests/ghc-regress/lib/IO/4895.stdout
+++ b/testsuite/tests/lib/IO/4895.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/IOError001.hs b/testsuite/tests/lib/IO/IOError001.hs
index dee7f31e29..dee7f31e29 100644
--- a/testsuite/tests/ghc-regress/lib/IO/IOError001.hs
+++ b/testsuite/tests/lib/IO/IOError001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/IOError001.stdout b/testsuite/tests/lib/IO/IOError001.stdout
index 1e689bb0f9..1e689bb0f9 100644
--- a/testsuite/tests/ghc-regress/lib/IO/IOError001.stdout
+++ b/testsuite/tests/lib/IO/IOError001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/IOError001.stdout-hugs b/testsuite/tests/lib/IO/IOError001.stdout-hugs
index 036084a006..036084a006 100644
--- a/testsuite/tests/ghc-regress/lib/IO/IOError001.stdout-hugs
+++ b/testsuite/tests/lib/IO/IOError001.stdout-hugs
diff --git a/testsuite/tests/ghc-regress/lib/IO/IOError002.hs b/testsuite/tests/lib/IO/IOError002.hs
index 144e62783b..144e62783b 100644
--- a/testsuite/tests/ghc-regress/lib/IO/IOError002.hs
+++ b/testsuite/tests/lib/IO/IOError002.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/IOError002.stdout b/testsuite/tests/lib/IO/IOError002.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/lib/IO/IOError002.stdout
+++ b/testsuite/tests/lib/IO/IOError002.stdout
diff --git a/testsuite/tests/lib/IO/Makefile b/testsuite/tests/lib/IO/Makefile
new file mode 100644
index 0000000000..6808f5f868
--- /dev/null
+++ b/testsuite/tests/lib/IO/Makefile
@@ -0,0 +1,48 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+test.concio001:
+	$(TEST_HC) $(TEST_HC_OPTS) --make -fforce-recomp -v0 concio001 -o concio001 
+	(sleep 1; echo x) | ./concio001
+
+test.concio001.thr:
+	$(TEST_HC) $(TEST_HC_OPTS) --make -fforce-recomp -v0 -threaded concio001 -o concio001 
+	(sleep 1; echo x) | ./concio001
+
+# NB. utf8-test should *not* have a final newline.  The last char should be 'X'.
+utf16-test: utf8-test
+	iconv -f UTF-8 -t UTF-16 <utf8-test >utf16-test
+
+utf16le-test: utf8-test
+	iconv -f UTF-8 -t UTF-16LE <utf8-test >utf16le-test
+
+utf16be-test: utf8-test
+	iconv -f UTF-8 -t UTF-16BE <utf8-test >utf16be-test
+
+utf32-test: utf8-test
+	iconv -f UTF-8 -t UTF-32 <utf8-test >utf32-test
+
+utf32le-test: utf8-test
+	iconv -f UTF-8 -t UTF-32LE <utf8-test >utf32le-test
+
+utf32be-test: utf8-test
+	iconv -f UTF-8 -t UTF-32BE <utf8-test >utf32be-test
+
+utf8-bom-test: utf16-test
+	iconv -f UTF-16LE -t UTF-8 <utf16-test >utf8-bom-test
+
+hSetEncoding001.in : latin1 utf8-test utf16le-test utf16be-test utf16-test utf32le-test utf32be-test utf32-test utf8-bom-test
+	cat >$@ latin1 utf8-test utf16le-test utf16be-test utf16-test utf32-test utf32le-test utf32be-test utf8-bom-test
+
+environment001-test:
+	"$(TEST_HC)" --make -fforce-recomp -v0 environment001.hs -o environment001 
+	GHC_TEST=马克斯 ./environment001 说
+
+3307-test:
+	"$(TEST_HC)" --make -fforce-recomp -v0 3307.hs -o 3307
+	echo Ni hao > chinese-file-小说
+	echo chinese-file-小说 > chinese-name
+	# The tests are run in whatever the default locale is. This is almost always UTF-8,
+	# but in cmd on Windows it will be the non-Unicode CP850 locale.
+	./3307 chinese-file-小说
diff --git a/testsuite/tests/ghc-regress/lib/IO/T4113.hs b/testsuite/tests/lib/IO/T4113.hs
index 3bc8096baa..3bc8096baa 100644
--- a/testsuite/tests/ghc-regress/lib/IO/T4113.hs
+++ b/testsuite/tests/lib/IO/T4113.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/T4113.stdout b/testsuite/tests/lib/IO/T4113.stdout
index 86a7e9e295..86a7e9e295 100644
--- a/testsuite/tests/ghc-regress/lib/IO/T4113.stdout
+++ b/testsuite/tests/lib/IO/T4113.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/T4113.stdout-i386-unknown-mingw32 b/testsuite/tests/lib/IO/T4113.stdout-i386-unknown-mingw32
index 16f302c475..16f302c475 100644
--- a/testsuite/tests/ghc-regress/lib/IO/T4113.stdout-i386-unknown-mingw32
+++ b/testsuite/tests/lib/IO/T4113.stdout-i386-unknown-mingw32
diff --git a/testsuite/tests/ghc-regress/lib/IO/T4144.hs b/testsuite/tests/lib/IO/T4144.hs
index ca14363682..ca14363682 100644
--- a/testsuite/tests/ghc-regress/lib/IO/T4144.hs
+++ b/testsuite/tests/lib/IO/T4144.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/T4144.stdout b/testsuite/tests/lib/IO/T4144.stdout
index 8b8441b91d..8b8441b91d 100644
--- a/testsuite/tests/ghc-regress/lib/IO/T4144.stdout
+++ b/testsuite/tests/lib/IO/T4144.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/all.T b/testsuite/tests/lib/IO/all.T
index cf557a6b96..cf557a6b96 100644
--- a/testsuite/tests/ghc-regress/lib/IO/all.T
+++ b/testsuite/tests/lib/IO/all.T
diff --git a/testsuite/tests/ghc-regress/lib/IO/concio001.hs b/testsuite/tests/lib/IO/concio001.hs
index 786a311ce5..786a311ce5 100644
--- a/testsuite/tests/ghc-regress/lib/IO/concio001.hs
+++ b/testsuite/tests/lib/IO/concio001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/concio001.stdout b/testsuite/tests/lib/IO/concio001.stdout
index 141a8cd80c..141a8cd80c 100644
--- a/testsuite/tests/ghc-regress/lib/IO/concio001.stdout
+++ b/testsuite/tests/lib/IO/concio001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/concio001.thr.stdout b/testsuite/tests/lib/IO/concio001.thr.stdout
index 141a8cd80c..141a8cd80c 100644
--- a/testsuite/tests/ghc-regress/lib/IO/concio001.thr.stdout
+++ b/testsuite/tests/lib/IO/concio001.thr.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/concio002.hs b/testsuite/tests/lib/IO/concio002.hs
index 60a2ed2a89..60a2ed2a89 100644
--- a/testsuite/tests/ghc-regress/lib/IO/concio002.hs
+++ b/testsuite/tests/lib/IO/concio002.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/concio002.stdout b/testsuite/tests/lib/IO/concio002.stdout
index 32640aede5..32640aede5 100644
--- a/testsuite/tests/ghc-regress/lib/IO/concio002.stdout
+++ b/testsuite/tests/lib/IO/concio002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/countReaders001.hs b/testsuite/tests/lib/IO/countReaders001.hs
index 2648ae77ae..2648ae77ae 100644
--- a/testsuite/tests/ghc-regress/lib/IO/countReaders001.hs
+++ b/testsuite/tests/lib/IO/countReaders001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/countReaders001.stdout b/testsuite/tests/lib/IO/countReaders001.stdout
index 41644bff37..41644bff37 100644
--- a/testsuite/tests/ghc-regress/lib/IO/countReaders001.stdout
+++ b/testsuite/tests/lib/IO/countReaders001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/countReaders001.stdout-i386-unknown-mingw32 b/testsuite/tests/lib/IO/countReaders001.stdout-i386-unknown-mingw32
index bf80d9dc12..bf80d9dc12 100644
--- a/testsuite/tests/ghc-regress/lib/IO/countReaders001.stdout-i386-unknown-mingw32
+++ b/testsuite/tests/lib/IO/countReaders001.stdout-i386-unknown-mingw32
diff --git a/testsuite/tests/ghc-regress/lib/IO/decodingerror001.hs b/testsuite/tests/lib/IO/decodingerror001.hs
index 6c9dca1489..6c9dca1489 100644
--- a/testsuite/tests/ghc-regress/lib/IO/decodingerror001.hs
+++ b/testsuite/tests/lib/IO/decodingerror001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/decodingerror001.in1 b/testsuite/tests/lib/IO/decodingerror001.in1
index 7686e7b2f4..7686e7b2f4 100644
--- a/testsuite/tests/ghc-regress/lib/IO/decodingerror001.in1
+++ b/testsuite/tests/lib/IO/decodingerror001.in1
diff --git a/testsuite/tests/ghc-regress/lib/IO/decodingerror001.in2 b/testsuite/tests/lib/IO/decodingerror001.in2
index fe33bd3883..fe33bd3883 100644
--- a/testsuite/tests/ghc-regress/lib/IO/decodingerror001.in2
+++ b/testsuite/tests/lib/IO/decodingerror001.in2
diff --git a/testsuite/tests/ghc-regress/lib/IO/decodingerror001.stdout b/testsuite/tests/lib/IO/decodingerror001.stdout
index 21e5208c79..21e5208c79 100644
--- a/testsuite/tests/ghc-regress/lib/IO/decodingerror001.stdout
+++ b/testsuite/tests/lib/IO/decodingerror001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/encoding001.hs b/testsuite/tests/lib/IO/encoding001.hs
index 3135155feb..3135155feb 100644
--- a/testsuite/tests/ghc-regress/lib/IO/encoding001.hs
+++ b/testsuite/tests/lib/IO/encoding001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/encoding002.hs b/testsuite/tests/lib/IO/encoding002.hs
index 65d60a3993..65d60a3993 100644
--- a/testsuite/tests/ghc-regress/lib/IO/encoding002.hs
+++ b/testsuite/tests/lib/IO/encoding002.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/encoding002.stdout b/testsuite/tests/lib/IO/encoding002.stdout
index 70addd37f5..70addd37f5 100644
--- a/testsuite/tests/ghc-regress/lib/IO/encoding002.stdout
+++ b/testsuite/tests/lib/IO/encoding002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/encodingerror001.hs b/testsuite/tests/lib/IO/encodingerror001.hs
index 327b490adb..327b490adb 100644
--- a/testsuite/tests/ghc-regress/lib/IO/encodingerror001.hs
+++ b/testsuite/tests/lib/IO/encodingerror001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/encodingerror001.stdout b/testsuite/tests/lib/IO/encodingerror001.stdout
index 7406cd9168..7406cd9168 100644
--- a/testsuite/tests/ghc-regress/lib/IO/encodingerror001.stdout
+++ b/testsuite/tests/lib/IO/encodingerror001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/environment001.hs b/testsuite/tests/lib/IO/environment001.hs
index 11d7912cdd..11d7912cdd 100644
--- a/testsuite/tests/ghc-regress/lib/IO/environment001.hs
+++ b/testsuite/tests/lib/IO/environment001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/environment001.stdout b/testsuite/tests/lib/IO/environment001.stdout
index 2434d0c14d..2434d0c14d 100644
--- a/testsuite/tests/ghc-regress/lib/IO/environment001.stdout
+++ b/testsuite/tests/lib/IO/environment001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/finalization001.hs b/testsuite/tests/lib/IO/finalization001.hs
index 2bf6353453..2bf6353453 100644
--- a/testsuite/tests/ghc-regress/lib/IO/finalization001.hs
+++ b/testsuite/tests/lib/IO/finalization001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/finalization001.stdout b/testsuite/tests/lib/IO/finalization001.stdout
index ec04732f97..ec04732f97 100644
--- a/testsuite/tests/ghc-regress/lib/IO/finalization001.stdout
+++ b/testsuite/tests/lib/IO/finalization001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hClose001.hs b/testsuite/tests/lib/IO/hClose001.hs
index 8d31447e95..8d31447e95 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hClose001.hs
+++ b/testsuite/tests/lib/IO/hClose001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hClose001.stdout b/testsuite/tests/lib/IO/hClose001.stdout
index 1ddd42bbe7..1ddd42bbe7 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hClose001.stdout
+++ b/testsuite/tests/lib/IO/hClose001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hClose002.hs b/testsuite/tests/lib/IO/hClose002.hs
index ebf26b4663..ebf26b4663 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hClose002.hs
+++ b/testsuite/tests/lib/IO/hClose002.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hClose002.stdout b/testsuite/tests/lib/IO/hClose002.stdout
index f26be4ab07..f26be4ab07 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hClose002.stdout
+++ b/testsuite/tests/lib/IO/hClose002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hClose002.stdout-i386-unknown-solaris2 b/testsuite/tests/lib/IO/hClose002.stdout-i386-unknown-solaris2
index 39a24de031..39a24de031 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hClose002.stdout-i386-unknown-solaris2
+++ b/testsuite/tests/lib/IO/hClose002.stdout-i386-unknown-solaris2
diff --git a/testsuite/tests/ghc-regress/lib/IO/hClose003.hs b/testsuite/tests/lib/IO/hClose003.hs
index cbaf49d6db..cbaf49d6db 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hClose003.hs
+++ b/testsuite/tests/lib/IO/hClose003.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hClose003.stdout b/testsuite/tests/lib/IO/hClose003.stdout
index d12f84d7d7..d12f84d7d7 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hClose003.stdout
+++ b/testsuite/tests/lib/IO/hClose003.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hDuplicateTo001.hs b/testsuite/tests/lib/IO/hDuplicateTo001.hs
index 5a1484a012..5a1484a012 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hDuplicateTo001.hs
+++ b/testsuite/tests/lib/IO/hDuplicateTo001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hDuplicateTo001.stderr b/testsuite/tests/lib/IO/hDuplicateTo001.stderr
index 14a31438a6..14a31438a6 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hDuplicateTo001.stderr
+++ b/testsuite/tests/lib/IO/hDuplicateTo001.stderr
diff --git a/testsuite/tests/ghc-regress/lib/IO/hFileSize001.hs b/testsuite/tests/lib/IO/hFileSize001.hs
index 62b3e88b9c..62b3e88b9c 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hFileSize001.hs
+++ b/testsuite/tests/lib/IO/hFileSize001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hFileSize001.stdout b/testsuite/tests/lib/IO/hFileSize001.stdout
index 94361d49fd..94361d49fd 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hFileSize001.stdout
+++ b/testsuite/tests/lib/IO/hFileSize001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hFileSize001.stdout-mingw b/testsuite/tests/lib/IO/hFileSize001.stdout-mingw
index 6a4573e805..6a4573e805 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hFileSize001.stdout-mingw
+++ b/testsuite/tests/lib/IO/hFileSize001.stdout-mingw
diff --git a/testsuite/tests/ghc-regress/lib/IO/hFileSize002.hs b/testsuite/tests/lib/IO/hFileSize002.hs
index 6c1ad2f57a..6c1ad2f57a 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hFileSize002.hs
+++ b/testsuite/tests/lib/IO/hFileSize002.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hFileSize002.stdout b/testsuite/tests/lib/IO/hFileSize002.stdout
index 23dd734048..23dd734048 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hFileSize002.stdout
+++ b/testsuite/tests/lib/IO/hFileSize002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hFlush001.hs b/testsuite/tests/lib/IO/hFlush001.hs
index 78c7b7eeb3..78c7b7eeb3 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hFlush001.hs
+++ b/testsuite/tests/lib/IO/hFlush001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hFlush001.stdout b/testsuite/tests/lib/IO/hFlush001.stdout
index 0954a7a0b4..0954a7a0b4 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hFlush001.stdout
+++ b/testsuite/tests/lib/IO/hFlush001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetBuf001.hs b/testsuite/tests/lib/IO/hGetBuf001.hs
index eea599ea74..eea599ea74 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetBuf001.hs
+++ b/testsuite/tests/lib/IO/hGetBuf001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetBuf001.stdout b/testsuite/tests/lib/IO/hGetBuf001.stdout
index 694ff4eedf..694ff4eedf 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetBuf001.stdout
+++ b/testsuite/tests/lib/IO/hGetBuf001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetBuffering001.hs b/testsuite/tests/lib/IO/hGetBuffering001.hs
index 83188b2796..83188b2796 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetBuffering001.hs
+++ b/testsuite/tests/lib/IO/hGetBuffering001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetBuffering001.stdout b/testsuite/tests/lib/IO/hGetBuffering001.stdout
index 75b9a133d9..75b9a133d9 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetBuffering001.stdout
+++ b/testsuite/tests/lib/IO/hGetBuffering001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetChar001.hs b/testsuite/tests/lib/IO/hGetChar001.hs
index f5ca666828..f5ca666828 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetChar001.hs
+++ b/testsuite/tests/lib/IO/hGetChar001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetChar001.stdin b/testsuite/tests/lib/IO/hGetChar001.stdin
index 2510fcaec3..2510fcaec3 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetChar001.stdin
+++ b/testsuite/tests/lib/IO/hGetChar001.stdin
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetChar001.stdout b/testsuite/tests/lib/IO/hGetChar001.stdout
index 47d4185c64..47d4185c64 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetChar001.stdout
+++ b/testsuite/tests/lib/IO/hGetChar001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetLine001.hs b/testsuite/tests/lib/IO/hGetLine001.hs
index b5950623ea..b5950623ea 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetLine001.hs
+++ b/testsuite/tests/lib/IO/hGetLine001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetLine001.stdout b/testsuite/tests/lib/IO/hGetLine001.stdout
index 3e023db8f5..3e023db8f5 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetLine001.stdout
+++ b/testsuite/tests/lib/IO/hGetLine001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetLine002.hs b/testsuite/tests/lib/IO/hGetLine002.hs
index 5c08b716d1..5c08b716d1 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetLine002.hs
+++ b/testsuite/tests/lib/IO/hGetLine002.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetLine002.stdin b/testsuite/tests/lib/IO/hGetLine002.stdin
index 808eafd54b..808eafd54b 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetLine002.stdin
+++ b/testsuite/tests/lib/IO/hGetLine002.stdin
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetLine002.stdout b/testsuite/tests/lib/IO/hGetLine002.stdout
index 0ec29ade8f..0ec29ade8f 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetLine002.stdout
+++ b/testsuite/tests/lib/IO/hGetLine002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetLine002.stdout-hugs b/testsuite/tests/lib/IO/hGetLine002.stdout-hugs
index ed871357b7..ed871357b7 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetLine002.stdout-hugs
+++ b/testsuite/tests/lib/IO/hGetLine002.stdout-hugs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetLine003.hs b/testsuite/tests/lib/IO/hGetLine003.hs
index cc03c604aa..cc03c604aa 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetLine003.hs
+++ b/testsuite/tests/lib/IO/hGetLine003.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetLine003.stdin b/testsuite/tests/lib/IO/hGetLine003.stdin
index b8b74a4b1e..b8b74a4b1e 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetLine003.stdin
+++ b/testsuite/tests/lib/IO/hGetLine003.stdin
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetLine003.stdout b/testsuite/tests/lib/IO/hGetLine003.stdout
index 6daac48252..6daac48252 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetLine003.stdout
+++ b/testsuite/tests/lib/IO/hGetLine003.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetPosn001.hs b/testsuite/tests/lib/IO/hGetPosn001.hs
index 5a0d7d4827..5a0d7d4827 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetPosn001.hs
+++ b/testsuite/tests/lib/IO/hGetPosn001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetPosn001.in b/testsuite/tests/lib/IO/hGetPosn001.in
index 2e2537150f..2e2537150f 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetPosn001.in
+++ b/testsuite/tests/lib/IO/hGetPosn001.in
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetPosn001.stdout b/testsuite/tests/lib/IO/hGetPosn001.stdout
index 10adafd933..10adafd933 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetPosn001.stdout
+++ b/testsuite/tests/lib/IO/hGetPosn001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hGetPosn001.stdout-hugs b/testsuite/tests/lib/IO/hGetPosn001.stdout-hugs
index 56e989c493..56e989c493 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hGetPosn001.stdout-hugs
+++ b/testsuite/tests/lib/IO/hGetPosn001.stdout-hugs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hIsEOF001.hs b/testsuite/tests/lib/IO/hIsEOF001.hs
index 2e5dbdcb0a..2e5dbdcb0a 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hIsEOF001.hs
+++ b/testsuite/tests/lib/IO/hIsEOF001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hIsEOF001.stdout b/testsuite/tests/lib/IO/hIsEOF001.stdout
index 76460ac50a..76460ac50a 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hIsEOF001.stdout
+++ b/testsuite/tests/lib/IO/hIsEOF001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hIsEOF002.hs b/testsuite/tests/lib/IO/hIsEOF002.hs
index 26f5abd9a7..26f5abd9a7 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hIsEOF002.hs
+++ b/testsuite/tests/lib/IO/hIsEOF002.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hIsEOF002.stdout b/testsuite/tests/lib/IO/hIsEOF002.stdout
index 3aa5e1a64d..3aa5e1a64d 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hIsEOF002.stdout
+++ b/testsuite/tests/lib/IO/hIsEOF002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hReady001.hs b/testsuite/tests/lib/IO/hReady001.hs
index 00888dac2d..00888dac2d 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hReady001.hs
+++ b/testsuite/tests/lib/IO/hReady001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hReady001.stdout b/testsuite/tests/lib/IO/hReady001.stdout
index af35f80533..af35f80533 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hReady001.stdout
+++ b/testsuite/tests/lib/IO/hReady001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hReady002.hs b/testsuite/tests/lib/IO/hReady002.hs
index 6db22a13fc..6db22a13fc 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hReady002.hs
+++ b/testsuite/tests/lib/IO/hReady002.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hReady002.stdout b/testsuite/tests/lib/IO/hReady002.stdout
index 6217d00e10..6217d00e10 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hReady002.stdout
+++ b/testsuite/tests/lib/IO/hReady002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSeek001.hs b/testsuite/tests/lib/IO/hSeek001.hs
index d05068e955..d05068e955 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSeek001.hs
+++ b/testsuite/tests/lib/IO/hSeek001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSeek001.in b/testsuite/tests/lib/IO/hSeek001.in
index e85d5b4528..e85d5b4528 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSeek001.in
+++ b/testsuite/tests/lib/IO/hSeek001.in
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSeek001.stdout b/testsuite/tests/lib/IO/hSeek001.stdout
index ab6c1d751b..ab6c1d751b 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSeek001.stdout
+++ b/testsuite/tests/lib/IO/hSeek001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSeek002.hs b/testsuite/tests/lib/IO/hSeek002.hs
index 8c9153cfaa..8c9153cfaa 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSeek002.hs
+++ b/testsuite/tests/lib/IO/hSeek002.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSeek002.stdout b/testsuite/tests/lib/IO/hSeek002.stdout
index 8069fe32b0..8069fe32b0 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSeek002.stdout
+++ b/testsuite/tests/lib/IO/hSeek002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSeek003.hs b/testsuite/tests/lib/IO/hSeek003.hs
index 03400573c4..03400573c4 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSeek003.hs
+++ b/testsuite/tests/lib/IO/hSeek003.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSeek003.stdout b/testsuite/tests/lib/IO/hSeek003.stdout
index 7c765c5bc5..7c765c5bc5 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSeek003.stdout
+++ b/testsuite/tests/lib/IO/hSeek003.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSeek004.hs b/testsuite/tests/lib/IO/hSeek004.hs
index 9ad7c13e7f..9ad7c13e7f 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSeek004.hs
+++ b/testsuite/tests/lib/IO/hSeek004.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSeek004.stdout b/testsuite/tests/lib/IO/hSeek004.stdout
index d2671a6361..d2671a6361 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSeek004.stdout
+++ b/testsuite/tests/lib/IO/hSeek004.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSeek004.stdout-mingw b/testsuite/tests/lib/IO/hSeek004.stdout-mingw
index 7d8e7076ee..7d8e7076ee 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSeek004.stdout-mingw
+++ b/testsuite/tests/lib/IO/hSeek004.stdout-mingw
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSetBuffering002.hs b/testsuite/tests/lib/IO/hSetBuffering002.hs
index 3f553029da..3f553029da 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSetBuffering002.hs
+++ b/testsuite/tests/lib/IO/hSetBuffering002.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSetBuffering002.stdout b/testsuite/tests/lib/IO/hSetBuffering002.stdout
index 3f553029da..3f553029da 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSetBuffering002.stdout
+++ b/testsuite/tests/lib/IO/hSetBuffering002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSetBuffering003.hs b/testsuite/tests/lib/IO/hSetBuffering003.hs
index 74d399e4ff..74d399e4ff 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSetBuffering003.hs
+++ b/testsuite/tests/lib/IO/hSetBuffering003.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSetBuffering003.stderr b/testsuite/tests/lib/IO/hSetBuffering003.stderr
index a4cf8779b4..a4cf8779b4 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSetBuffering003.stderr
+++ b/testsuite/tests/lib/IO/hSetBuffering003.stderr
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSetBuffering003.stdout b/testsuite/tests/lib/IO/hSetBuffering003.stdout
index 7768773198..7768773198 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSetBuffering003.stdout
+++ b/testsuite/tests/lib/IO/hSetBuffering003.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSetBuffering004.hs b/testsuite/tests/lib/IO/hSetBuffering004.hs
index eaee6826d2..eaee6826d2 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSetBuffering004.hs
+++ b/testsuite/tests/lib/IO/hSetBuffering004.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSetBuffering004.stdout b/testsuite/tests/lib/IO/hSetBuffering004.stdout
index 7766eec971..7766eec971 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSetBuffering004.stdout
+++ b/testsuite/tests/lib/IO/hSetBuffering004.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSetEncoding001.hs b/testsuite/tests/lib/IO/hSetEncoding001.hs
index 95f570d094..95f570d094 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSetEncoding001.hs
+++ b/testsuite/tests/lib/IO/hSetEncoding001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSetEncoding001.in b/testsuite/tests/lib/IO/hSetEncoding001.in
index 03f297441d..03f297441d 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSetEncoding001.in
+++ b/testsuite/tests/lib/IO/hSetEncoding001.in
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSetEncoding001.stdout b/testsuite/tests/lib/IO/hSetEncoding001.stdout
index a1d38ffd77..a1d38ffd77 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSetEncoding001.stdout
+++ b/testsuite/tests/lib/IO/hSetEncoding001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSetEncoding002.hs b/testsuite/tests/lib/IO/hSetEncoding002.hs
index 35c4e1ce19..35c4e1ce19 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSetEncoding002.hs
+++ b/testsuite/tests/lib/IO/hSetEncoding002.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/hSetEncoding002.stdout b/testsuite/tests/lib/IO/hSetEncoding002.stdout
index d3b4b915a1..d3b4b915a1 100644
--- a/testsuite/tests/ghc-regress/lib/IO/hSetEncoding002.stdout
+++ b/testsuite/tests/lib/IO/hSetEncoding002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/ioeGetErrorString001.hs b/testsuite/tests/lib/IO/ioeGetErrorString001.hs
index 5621136a55..5621136a55 100644
--- a/testsuite/tests/ghc-regress/lib/IO/ioeGetErrorString001.hs
+++ b/testsuite/tests/lib/IO/ioeGetErrorString001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/ioeGetErrorString001.stdout b/testsuite/tests/lib/IO/ioeGetErrorString001.stdout
index 0b8daea55a..0b8daea55a 100644
--- a/testsuite/tests/ghc-regress/lib/IO/ioeGetErrorString001.stdout
+++ b/testsuite/tests/lib/IO/ioeGetErrorString001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/ioeGetFileName001.hs b/testsuite/tests/lib/IO/ioeGetFileName001.hs
index 12c70c98b4..12c70c98b4 100644
--- a/testsuite/tests/ghc-regress/lib/IO/ioeGetFileName001.hs
+++ b/testsuite/tests/lib/IO/ioeGetFileName001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/ioeGetFileName001.stdout b/testsuite/tests/lib/IO/ioeGetFileName001.stdout
index 7377ad409d..7377ad409d 100644
--- a/testsuite/tests/ghc-regress/lib/IO/ioeGetFileName001.stdout
+++ b/testsuite/tests/lib/IO/ioeGetFileName001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/ioeGetHandle001.hs b/testsuite/tests/lib/IO/ioeGetHandle001.hs
index a9ef58a8ca..a9ef58a8ca 100644
--- a/testsuite/tests/ghc-regress/lib/IO/ioeGetHandle001.hs
+++ b/testsuite/tests/lib/IO/ioeGetHandle001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/ioeGetHandle001.stdout b/testsuite/tests/lib/IO/ioeGetHandle001.stdout
index 90b5016eff..90b5016eff 100644
--- a/testsuite/tests/ghc-regress/lib/IO/ioeGetHandle001.stdout
+++ b/testsuite/tests/lib/IO/ioeGetHandle001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/isEOF001.hs b/testsuite/tests/lib/IO/isEOF001.hs
index bb205703f8..bb205703f8 100644
--- a/testsuite/tests/ghc-regress/lib/IO/isEOF001.hs
+++ b/testsuite/tests/lib/IO/isEOF001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/isEOF001.stdout b/testsuite/tests/lib/IO/isEOF001.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/lib/IO/isEOF001.stdout
+++ b/testsuite/tests/lib/IO/isEOF001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/latin1 b/testsuite/tests/lib/IO/latin1
index a634257fbf..a634257fbf 100644
--- a/testsuite/tests/ghc-regress/lib/IO/latin1
+++ b/testsuite/tests/lib/IO/latin1
diff --git a/testsuite/tests/ghc-regress/lib/IO/misc001.hs b/testsuite/tests/lib/IO/misc001.hs
index 9f9f3e98d0..9f9f3e98d0 100644
--- a/testsuite/tests/ghc-regress/lib/IO/misc001.hs
+++ b/testsuite/tests/lib/IO/misc001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/misc001.stdout b/testsuite/tests/lib/IO/misc001.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/lib/IO/misc001.stdout
+++ b/testsuite/tests/lib/IO/misc001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/newline001.hs b/testsuite/tests/lib/IO/newline001.hs
index b12a65bcaa..b12a65bcaa 100644
--- a/testsuite/tests/ghc-regress/lib/IO/newline001.hs
+++ b/testsuite/tests/lib/IO/newline001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile001.hs b/testsuite/tests/lib/IO/openFile001.hs
index f34f093d38..f34f093d38 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile001.hs
+++ b/testsuite/tests/lib/IO/openFile001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile001.stdout b/testsuite/tests/lib/IO/openFile001.stdout
index 90b5016eff..90b5016eff 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile001.stdout
+++ b/testsuite/tests/lib/IO/openFile001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile002.hs b/testsuite/tests/lib/IO/openFile002.hs
index 83822621f6..83822621f6 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile002.hs
+++ b/testsuite/tests/lib/IO/openFile002.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile002.stderr b/testsuite/tests/lib/IO/openFile002.stderr
index b011f34146..b011f34146 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile002.stderr
+++ b/testsuite/tests/lib/IO/openFile002.stderr
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile002.stderr-hugs b/testsuite/tests/lib/IO/openFile002.stderr-hugs
index aa76710e44..aa76710e44 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile002.stderr-hugs
+++ b/testsuite/tests/lib/IO/openFile002.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile003.hs b/testsuite/tests/lib/IO/openFile003.hs
index 81b69c40ec..81b69c40ec 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile003.hs
+++ b/testsuite/tests/lib/IO/openFile003.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile003.stdout b/testsuite/tests/lib/IO/openFile003.stdout
index 57288459bd..57288459bd 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile003.stdout
+++ b/testsuite/tests/lib/IO/openFile003.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile003.stdout-i386-unknown-mingw32 b/testsuite/tests/lib/IO/openFile003.stdout-i386-unknown-mingw32
index 08eaf891f1..08eaf891f1 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile003.stdout-i386-unknown-mingw32
+++ b/testsuite/tests/lib/IO/openFile003.stdout-i386-unknown-mingw32
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile003.stdout-i386-unknown-solaris2 b/testsuite/tests/lib/IO/openFile003.stdout-i386-unknown-solaris2
index 2cbf46b25f..2cbf46b25f 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile003.stdout-i386-unknown-solaris2
+++ b/testsuite/tests/lib/IO/openFile003.stdout-i386-unknown-solaris2
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile003.stdout-mingw b/testsuite/tests/lib/IO/openFile003.stdout-mingw
index f7d4410620..f7d4410620 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile003.stdout-mingw
+++ b/testsuite/tests/lib/IO/openFile003.stdout-mingw
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile003.stdout-mips-sgi-irix b/testsuite/tests/lib/IO/openFile003.stdout-mips-sgi-irix
index 2cbf46b25f..2cbf46b25f 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile003.stdout-mips-sgi-irix
+++ b/testsuite/tests/lib/IO/openFile003.stdout-mips-sgi-irix
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile003.stdout-sparc-sun-solaris2 b/testsuite/tests/lib/IO/openFile003.stdout-sparc-sun-solaris2
index 2cbf46b25f..2cbf46b25f 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile003.stdout-sparc-sun-solaris2
+++ b/testsuite/tests/lib/IO/openFile003.stdout-sparc-sun-solaris2
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile004.hs b/testsuite/tests/lib/IO/openFile004.hs
index 4124abb0de..4124abb0de 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile004.hs
+++ b/testsuite/tests/lib/IO/openFile004.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile004.stdout b/testsuite/tests/lib/IO/openFile004.stdout
index 3b18e512db..3b18e512db 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile004.stdout
+++ b/testsuite/tests/lib/IO/openFile004.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile005.hs b/testsuite/tests/lib/IO/openFile005.hs
index d8a8f83453..d8a8f83453 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile005.hs
+++ b/testsuite/tests/lib/IO/openFile005.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile005.stdout b/testsuite/tests/lib/IO/openFile005.stdout
index 1a4b843be0..1a4b843be0 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile005.stdout
+++ b/testsuite/tests/lib/IO/openFile005.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile005.stdout-i386-unknown-mingw32 b/testsuite/tests/lib/IO/openFile005.stdout-i386-unknown-mingw32
index bf227989a9..bf227989a9 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile005.stdout-i386-unknown-mingw32
+++ b/testsuite/tests/lib/IO/openFile005.stdout-i386-unknown-mingw32
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile006.hs b/testsuite/tests/lib/IO/openFile006.hs
index 63cfea1a87..63cfea1a87 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile006.hs
+++ b/testsuite/tests/lib/IO/openFile006.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile006.stdout b/testsuite/tests/lib/IO/openFile006.stdout
index 368283eb3d..368283eb3d 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile006.stdout
+++ b/testsuite/tests/lib/IO/openFile006.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile007.hs b/testsuite/tests/lib/IO/openFile007.hs
index e39ed6538f..e39ed6538f 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile007.hs
+++ b/testsuite/tests/lib/IO/openFile007.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile007.stdout b/testsuite/tests/lib/IO/openFile007.stdout
index 49669047ff..49669047ff 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile007.stdout
+++ b/testsuite/tests/lib/IO/openFile007.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile007.stdout-i386-unknown-mingw32 b/testsuite/tests/lib/IO/openFile007.stdout-i386-unknown-mingw32
index 26f0afe2b2..26f0afe2b2 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile007.stdout-i386-unknown-mingw32
+++ b/testsuite/tests/lib/IO/openFile007.stdout-i386-unknown-mingw32
diff --git a/testsuite/tests/ghc-regress/lib/IO/openFile008.hs b/testsuite/tests/lib/IO/openFile008.hs
index 9c1a1c47f8..9c1a1c47f8 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openFile008.hs
+++ b/testsuite/tests/lib/IO/openFile008.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/openTempFile001.hs b/testsuite/tests/lib/IO/openTempFile001.hs
index 36598e6d5b..36598e6d5b 100644
--- a/testsuite/tests/ghc-regress/lib/IO/openTempFile001.hs
+++ b/testsuite/tests/lib/IO/openTempFile001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/putStr001.hs b/testsuite/tests/lib/IO/putStr001.hs
index 48b3add3f3..48b3add3f3 100644
--- a/testsuite/tests/ghc-regress/lib/IO/putStr001.hs
+++ b/testsuite/tests/lib/IO/putStr001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/putStr001.stdout b/testsuite/tests/lib/IO/putStr001.stdout
index a5c1966771..a5c1966771 100644
--- a/testsuite/tests/ghc-regress/lib/IO/putStr001.stdout
+++ b/testsuite/tests/lib/IO/putStr001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/readFile001.hs b/testsuite/tests/lib/IO/readFile001.hs
index e4a2b34cb7..e4a2b34cb7 100644
--- a/testsuite/tests/ghc-regress/lib/IO/readFile001.hs
+++ b/testsuite/tests/lib/IO/readFile001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/readFile001.stdout b/testsuite/tests/lib/IO/readFile001.stdout
index cfb75708f9..cfb75708f9 100644
--- a/testsuite/tests/ghc-regress/lib/IO/readFile001.stdout
+++ b/testsuite/tests/lib/IO/readFile001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/readFile001.stdout-i386-unknown-mingw32 b/testsuite/tests/lib/IO/readFile001.stdout-i386-unknown-mingw32
index d086f3a209..d086f3a209 100644
--- a/testsuite/tests/ghc-regress/lib/IO/readFile001.stdout-i386-unknown-mingw32
+++ b/testsuite/tests/lib/IO/readFile001.stdout-i386-unknown-mingw32
diff --git a/testsuite/tests/ghc-regress/lib/IO/readwrite001.hs b/testsuite/tests/lib/IO/readwrite001.hs
index 4a94ef10eb..4a94ef10eb 100644
--- a/testsuite/tests/ghc-regress/lib/IO/readwrite001.hs
+++ b/testsuite/tests/lib/IO/readwrite001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/readwrite001.stdout b/testsuite/tests/lib/IO/readwrite001.stdout
index e33ba0613d..e33ba0613d 100644
--- a/testsuite/tests/ghc-regress/lib/IO/readwrite001.stdout
+++ b/testsuite/tests/lib/IO/readwrite001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/readwrite002.hs b/testsuite/tests/lib/IO/readwrite002.hs
index 4bb607e395..4bb607e395 100644
--- a/testsuite/tests/ghc-regress/lib/IO/readwrite002.hs
+++ b/testsuite/tests/lib/IO/readwrite002.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/readwrite002.stdout b/testsuite/tests/lib/IO/readwrite002.stdout
index 9aed0284d7..9aed0284d7 100644
--- a/testsuite/tests/ghc-regress/lib/IO/readwrite002.stdout
+++ b/testsuite/tests/lib/IO/readwrite002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/readwrite003.hs b/testsuite/tests/lib/IO/readwrite003.hs
index d7ee78d637..d7ee78d637 100644
--- a/testsuite/tests/ghc-regress/lib/IO/readwrite003.hs
+++ b/testsuite/tests/lib/IO/readwrite003.hs
diff --git a/testsuite/tests/ghc-regress/lib/IO/readwrite003.stdout b/testsuite/tests/lib/IO/readwrite003.stdout
index 6b4522804e..6b4522804e 100644
--- a/testsuite/tests/ghc-regress/lib/IO/readwrite003.stdout
+++ b/testsuite/tests/lib/IO/readwrite003.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IO/utf8-test b/testsuite/tests/lib/IO/utf8-test
index 7d0f35a448..7d0f35a448 100644
--- a/testsuite/tests/ghc-regress/lib/IO/utf8-test
+++ b/testsuite/tests/lib/IO/utf8-test
diff --git a/testsuite/tests/lib/IOExts/Makefile b/testsuite/tests/lib/IOExts/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/IOExts/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/all.T b/testsuite/tests/lib/IOExts/all.T
index 518c8cccbd..518c8cccbd 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/all.T
+++ b/testsuite/tests/lib/IOExts/all.T
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/echo001.hs b/testsuite/tests/lib/IOExts/echo001.hs
index 7c803589bf..7c803589bf 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/echo001.hs
+++ b/testsuite/tests/lib/IOExts/echo001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/echo001.stdout b/testsuite/tests/lib/IOExts/echo001.stdout
index a9d7699954..a9d7699954 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/echo001.stdout
+++ b/testsuite/tests/lib/IOExts/echo001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/hGetBuf002.hs b/testsuite/tests/lib/IOExts/hGetBuf002.hs
index 525eeb8e36..525eeb8e36 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/hGetBuf002.hs
+++ b/testsuite/tests/lib/IOExts/hGetBuf002.hs
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/hGetBuf002.stdout b/testsuite/tests/lib/IOExts/hGetBuf002.stdout
index 9cbe498c5c..9cbe498c5c 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/hGetBuf002.stdout
+++ b/testsuite/tests/lib/IOExts/hGetBuf002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/hGetBuf003.hs b/testsuite/tests/lib/IOExts/hGetBuf003.hs
index 6eefdf90e8..6eefdf90e8 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/hGetBuf003.hs
+++ b/testsuite/tests/lib/IOExts/hGetBuf003.hs
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/hGetBuf003.stdout b/testsuite/tests/lib/IOExts/hGetBuf003.stdout
index ffeb291563..ffeb291563 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/hGetBuf003.stdout
+++ b/testsuite/tests/lib/IOExts/hGetBuf003.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/hPutBuf001.hs b/testsuite/tests/lib/IOExts/hPutBuf001.hs
index fa7e076d41..fa7e076d41 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/hPutBuf001.hs
+++ b/testsuite/tests/lib/IOExts/hPutBuf001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/hPutBuf001.stdout b/testsuite/tests/lib/IOExts/hPutBuf001.stdout
index 3b18e512db..3b18e512db 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/hPutBuf001.stdout
+++ b/testsuite/tests/lib/IOExts/hPutBuf001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/hPutBuf002.hs b/testsuite/tests/lib/IOExts/hPutBuf002.hs
index a7ea2eed03..a7ea2eed03 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/hPutBuf002.hs
+++ b/testsuite/tests/lib/IOExts/hPutBuf002.hs
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/hPutBuf002.stdout b/testsuite/tests/lib/IOExts/hPutBuf002.stdout
index 48082f72f0..48082f72f0 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/hPutBuf002.stdout
+++ b/testsuite/tests/lib/IOExts/hPutBuf002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/hTell001.hs b/testsuite/tests/lib/IOExts/hTell001.hs
index 6b26eecb97..6b26eecb97 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/hTell001.hs
+++ b/testsuite/tests/lib/IOExts/hTell001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/hTell001.stdout b/testsuite/tests/lib/IOExts/hTell001.stdout
index 7e22e69a93..7e22e69a93 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/hTell001.stdout
+++ b/testsuite/tests/lib/IOExts/hTell001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/hTell002.hs b/testsuite/tests/lib/IOExts/hTell002.hs
index b790db8fe8..b790db8fe8 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/hTell002.hs
+++ b/testsuite/tests/lib/IOExts/hTell002.hs
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/hTell002.stdout b/testsuite/tests/lib/IOExts/hTell002.stdout
index 52696f8a2c..52696f8a2c 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/hTell002.stdout
+++ b/testsuite/tests/lib/IOExts/hTell002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/performGC001.hs b/testsuite/tests/lib/IOExts/performGC001.hs
index f14dab004c..f14dab004c 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/performGC001.hs
+++ b/testsuite/tests/lib/IOExts/performGC001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/performGC001.stdout b/testsuite/tests/lib/IOExts/performGC001.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/performGC001.stdout
+++ b/testsuite/tests/lib/IOExts/performGC001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/trace001.hs b/testsuite/tests/lib/IOExts/trace001.hs
index 2ed61d486e..2ed61d486e 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/trace001.hs
+++ b/testsuite/tests/lib/IOExts/trace001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/trace001.stderr b/testsuite/tests/lib/IOExts/trace001.stderr
index dfe965af21..dfe965af21 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/trace001.stderr
+++ b/testsuite/tests/lib/IOExts/trace001.stderr
diff --git a/testsuite/tests/ghc-regress/lib/IOExts/trace001.stdout b/testsuite/tests/lib/IOExts/trace001.stdout
index 23ddbb4550..23ddbb4550 100644
--- a/testsuite/tests/ghc-regress/lib/IOExts/trace001.stdout
+++ b/testsuite/tests/lib/IOExts/trace001.stdout
diff --git a/testsuite/tests/lib/IORef/Makefile b/testsuite/tests/lib/IORef/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/IORef/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/IORef/all.T b/testsuite/tests/lib/IORef/all.T
index cb41d73fa1..cb41d73fa1 100644
--- a/testsuite/tests/ghc-regress/lib/IORef/all.T
+++ b/testsuite/tests/lib/IORef/all.T
diff --git a/testsuite/tests/ghc-regress/lib/IORef/ioref001.hs b/testsuite/tests/lib/IORef/ioref001.hs
index 837b82e0c1..837b82e0c1 100644
--- a/testsuite/tests/ghc-regress/lib/IORef/ioref001.hs
+++ b/testsuite/tests/lib/IORef/ioref001.hs
diff --git a/testsuite/tests/ghc-regress/lib/IORef/ioref001.stdout b/testsuite/tests/lib/IORef/ioref001.stdout
index 19f86f493a..19f86f493a 100644
--- a/testsuite/tests/ghc-regress/lib/IORef/ioref001.stdout
+++ b/testsuite/tests/lib/IORef/ioref001.stdout
diff --git a/testsuite/tests/lib/Lex/Makefile b/testsuite/tests/lib/Lex/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/Lex/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Lex/all.T b/testsuite/tests/lib/Lex/all.T
index 8c198fb90c..8c198fb90c 100644
--- a/testsuite/tests/ghc-regress/lib/Lex/all.T
+++ b/testsuite/tests/lib/Lex/all.T
diff --git a/testsuite/tests/ghc-regress/lib/Lex/lexNum.hs b/testsuite/tests/lib/Lex/lexNum.hs
index fb63034b52..fb63034b52 100644
--- a/testsuite/tests/ghc-regress/lib/Lex/lexNum.hs
+++ b/testsuite/tests/lib/Lex/lexNum.hs
diff --git a/testsuite/tests/ghc-regress/lib/Lex/lexNum.stdout b/testsuite/tests/lib/Lex/lexNum.stdout
index 92cb063178..92cb063178 100644
--- a/testsuite/tests/ghc-regress/lib/Lex/lexNum.stdout
+++ b/testsuite/tests/lib/Lex/lexNum.stdout
diff --git a/testsuite/tests/lib/Makefile b/testsuite/tests/lib/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/lib/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/lib/Numeric/Makefile b/testsuite/tests/lib/Numeric/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/Numeric/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/all.T b/testsuite/tests/lib/Numeric/all.T
index d6237fbee8..d6237fbee8 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/all.T
+++ b/testsuite/tests/lib/Numeric/all.T
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num001.hs b/testsuite/tests/lib/Numeric/num001.hs
index 8a8c97a11b..8a8c97a11b 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num001.hs
+++ b/testsuite/tests/lib/Numeric/num001.hs
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num001.stdout b/testsuite/tests/lib/Numeric/num001.stdout
index 6d2f0c7a77..6d2f0c7a77 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num001.stdout
+++ b/testsuite/tests/lib/Numeric/num001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num002.hs b/testsuite/tests/lib/Numeric/num002.hs
index 31ea76ced9..31ea76ced9 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num002.hs
+++ b/testsuite/tests/lib/Numeric/num002.hs
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num002.stdout b/testsuite/tests/lib/Numeric/num002.stdout
index ce14dec313..ce14dec313 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num002.stdout
+++ b/testsuite/tests/lib/Numeric/num002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num002.stdout-alpha-dec-osf3 b/testsuite/tests/lib/Numeric/num002.stdout-alpha-dec-osf3
index b81876f763..b81876f763 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num002.stdout-alpha-dec-osf3
+++ b/testsuite/tests/lib/Numeric/num002.stdout-alpha-dec-osf3
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num002.stdout-mips-sgi-irix b/testsuite/tests/lib/Numeric/num002.stdout-mips-sgi-irix
index b81876f763..b81876f763 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num002.stdout-mips-sgi-irix
+++ b/testsuite/tests/lib/Numeric/num002.stdout-mips-sgi-irix
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num002.stdout-ws-64 b/testsuite/tests/lib/Numeric/num002.stdout-ws-64
index b81876f763..b81876f763 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num002.stdout-ws-64
+++ b/testsuite/tests/lib/Numeric/num002.stdout-ws-64
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num002.stdout-x86_64-unknown-openbsd b/testsuite/tests/lib/Numeric/num002.stdout-x86_64-unknown-openbsd
index b81876f763..b81876f763 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num002.stdout-x86_64-unknown-openbsd
+++ b/testsuite/tests/lib/Numeric/num002.stdout-x86_64-unknown-openbsd
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num003.hs b/testsuite/tests/lib/Numeric/num003.hs
index 368be2599a..368be2599a 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num003.hs
+++ b/testsuite/tests/lib/Numeric/num003.hs
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num003.stdout b/testsuite/tests/lib/Numeric/num003.stdout
index 1266b608b3..1266b608b3 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num003.stdout
+++ b/testsuite/tests/lib/Numeric/num003.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num003.stdout-alpha-dec-osf3 b/testsuite/tests/lib/Numeric/num003.stdout-alpha-dec-osf3
index ae95d2aa0a..ae95d2aa0a 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num003.stdout-alpha-dec-osf3
+++ b/testsuite/tests/lib/Numeric/num003.stdout-alpha-dec-osf3
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num003.stdout-mips-sgi-irix b/testsuite/tests/lib/Numeric/num003.stdout-mips-sgi-irix
index ae95d2aa0a..ae95d2aa0a 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num003.stdout-mips-sgi-irix
+++ b/testsuite/tests/lib/Numeric/num003.stdout-mips-sgi-irix
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num003.stdout-ws-64 b/testsuite/tests/lib/Numeric/num003.stdout-ws-64
index ae95d2aa0a..ae95d2aa0a 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num003.stdout-ws-64
+++ b/testsuite/tests/lib/Numeric/num003.stdout-ws-64
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num003.stdout-x86_64-unknown-openbsd b/testsuite/tests/lib/Numeric/num003.stdout-x86_64-unknown-openbsd
index ae95d2aa0a..ae95d2aa0a 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num003.stdout-x86_64-unknown-openbsd
+++ b/testsuite/tests/lib/Numeric/num003.stdout-x86_64-unknown-openbsd
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num004.hs b/testsuite/tests/lib/Numeric/num004.hs
index 0eb2bee5b0..0eb2bee5b0 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num004.hs
+++ b/testsuite/tests/lib/Numeric/num004.hs
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num004.stdout b/testsuite/tests/lib/Numeric/num004.stdout
index 12610a153d..12610a153d 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num004.stdout
+++ b/testsuite/tests/lib/Numeric/num004.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num004.stdout-alpha-dec-osf3 b/testsuite/tests/lib/Numeric/num004.stdout-alpha-dec-osf3
index 150f98e1ea..150f98e1ea 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num004.stdout-alpha-dec-osf3
+++ b/testsuite/tests/lib/Numeric/num004.stdout-alpha-dec-osf3
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num004.stdout-mips-sgi-irix b/testsuite/tests/lib/Numeric/num004.stdout-mips-sgi-irix
index 150f98e1ea..150f98e1ea 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num004.stdout-mips-sgi-irix
+++ b/testsuite/tests/lib/Numeric/num004.stdout-mips-sgi-irix
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num004.stdout-ws-64 b/testsuite/tests/lib/Numeric/num004.stdout-ws-64
index 150f98e1ea..150f98e1ea 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num004.stdout-ws-64
+++ b/testsuite/tests/lib/Numeric/num004.stdout-ws-64
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num004.stdout-x86_64-unknown-openbsd b/testsuite/tests/lib/Numeric/num004.stdout-x86_64-unknown-openbsd
index 150f98e1ea..150f98e1ea 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num004.stdout-x86_64-unknown-openbsd
+++ b/testsuite/tests/lib/Numeric/num004.stdout-x86_64-unknown-openbsd
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num005.hs b/testsuite/tests/lib/Numeric/num005.hs
index ef647a6967..ef647a6967 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num005.hs
+++ b/testsuite/tests/lib/Numeric/num005.hs
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num005.stdout b/testsuite/tests/lib/Numeric/num005.stdout
index f6ba218eb8..f6ba218eb8 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num005.stdout
+++ b/testsuite/tests/lib/Numeric/num005.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num005.stdout-alpha-dec-osf3 b/testsuite/tests/lib/Numeric/num005.stdout-alpha-dec-osf3
index 35678af82f..35678af82f 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num005.stdout-alpha-dec-osf3
+++ b/testsuite/tests/lib/Numeric/num005.stdout-alpha-dec-osf3
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num005.stdout-mips-sgi-irix b/testsuite/tests/lib/Numeric/num005.stdout-mips-sgi-irix
index 35678af82f..35678af82f 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num005.stdout-mips-sgi-irix
+++ b/testsuite/tests/lib/Numeric/num005.stdout-mips-sgi-irix
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num005.stdout-ws-64 b/testsuite/tests/lib/Numeric/num005.stdout-ws-64
index 35678af82f..35678af82f 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num005.stdout-ws-64
+++ b/testsuite/tests/lib/Numeric/num005.stdout-ws-64
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num005.stdout-x86_64-unknown-openbsd b/testsuite/tests/lib/Numeric/num005.stdout-x86_64-unknown-openbsd
index 35678af82f..35678af82f 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num005.stdout-x86_64-unknown-openbsd
+++ b/testsuite/tests/lib/Numeric/num005.stdout-x86_64-unknown-openbsd
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num006.hs b/testsuite/tests/lib/Numeric/num006.hs
index f421ed72a2..f421ed72a2 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num006.hs
+++ b/testsuite/tests/lib/Numeric/num006.hs
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num006.stdout b/testsuite/tests/lib/Numeric/num006.stdout
index e0c45403ec..e0c45403ec 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num006.stdout
+++ b/testsuite/tests/lib/Numeric/num006.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num007.hs b/testsuite/tests/lib/Numeric/num007.hs
index 1c40ecfdbd..1c40ecfdbd 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num007.hs
+++ b/testsuite/tests/lib/Numeric/num007.hs
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num007.stdout b/testsuite/tests/lib/Numeric/num007.stdout
index ef60021827..ef60021827 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num007.stdout
+++ b/testsuite/tests/lib/Numeric/num007.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num008.hs b/testsuite/tests/lib/Numeric/num008.hs
index 36158240b4..36158240b4 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num008.hs
+++ b/testsuite/tests/lib/Numeric/num008.hs
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num008.stdout b/testsuite/tests/lib/Numeric/num008.stdout
index 5086442f0f..5086442f0f 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num008.stdout
+++ b/testsuite/tests/lib/Numeric/num008.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num009.hs b/testsuite/tests/lib/Numeric/num009.hs
index 6910f2f840..6910f2f840 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num009.hs
+++ b/testsuite/tests/lib/Numeric/num009.hs
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num009.stdout b/testsuite/tests/lib/Numeric/num009.stdout
index a965a70ed4..a965a70ed4 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num009.stdout
+++ b/testsuite/tests/lib/Numeric/num009.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num010.hs b/testsuite/tests/lib/Numeric/num010.hs
index bf1d5a2734..bf1d5a2734 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num010.hs
+++ b/testsuite/tests/lib/Numeric/num010.hs
diff --git a/testsuite/tests/ghc-regress/lib/Numeric/num010.stdout b/testsuite/tests/lib/Numeric/num010.stdout
index 877d35c722..877d35c722 100644
--- a/testsuite/tests/ghc-regress/lib/Numeric/num010.stdout
+++ b/testsuite/tests/lib/Numeric/num010.stdout
diff --git a/testsuite/tests/lib/OldException/Makefile b/testsuite/tests/lib/OldException/Makefile
new file mode 100644
index 0000000000..4a268530f1
--- /dev/null
+++ b/testsuite/tests/lib/OldException/Makefile
@@ -0,0 +1,4 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
diff --git a/testsuite/tests/ghc-regress/lib/OldException/OldException001.hs b/testsuite/tests/lib/OldException/OldException001.hs
index 150dc2aba7..150dc2aba7 100644
--- a/testsuite/tests/ghc-regress/lib/OldException/OldException001.hs
+++ b/testsuite/tests/lib/OldException/OldException001.hs
diff --git a/testsuite/tests/ghc-regress/lib/OldException/OldException001.stdout b/testsuite/tests/lib/OldException/OldException001.stdout
index ba73072274..ba73072274 100644
--- a/testsuite/tests/ghc-regress/lib/OldException/OldException001.stdout
+++ b/testsuite/tests/lib/OldException/OldException001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/OldException/all.T b/testsuite/tests/lib/OldException/all.T
index 55459823eb..55459823eb 100644
--- a/testsuite/tests/ghc-regress/lib/OldException/all.T
+++ b/testsuite/tests/lib/OldException/all.T
diff --git a/testsuite/tests/lib/PrettyPrint/Makefile b/testsuite/tests/lib/PrettyPrint/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/PrettyPrint/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/PrettyPrint/T3911.hs b/testsuite/tests/lib/PrettyPrint/T3911.hs
index 01ccb22b01..01ccb22b01 100644
--- a/testsuite/tests/ghc-regress/lib/PrettyPrint/T3911.hs
+++ b/testsuite/tests/lib/PrettyPrint/T3911.hs
diff --git a/testsuite/tests/ghc-regress/lib/PrettyPrint/T3911.stdout b/testsuite/tests/lib/PrettyPrint/T3911.stdout
index 7677e8d6f4..7677e8d6f4 100644
--- a/testsuite/tests/ghc-regress/lib/PrettyPrint/T3911.stdout
+++ b/testsuite/tests/lib/PrettyPrint/T3911.stdout
diff --git a/testsuite/tests/ghc-regress/lib/PrettyPrint/all.T b/testsuite/tests/lib/PrettyPrint/all.T
index 5189843c15..5189843c15 100644
--- a/testsuite/tests/ghc-regress/lib/PrettyPrint/all.T
+++ b/testsuite/tests/lib/PrettyPrint/all.T
diff --git a/testsuite/tests/ghc-regress/lib/PrettyPrint/pp1.hs b/testsuite/tests/lib/PrettyPrint/pp1.hs
index 55cfba9d27..55cfba9d27 100644
--- a/testsuite/tests/ghc-regress/lib/PrettyPrint/pp1.hs
+++ b/testsuite/tests/lib/PrettyPrint/pp1.hs
diff --git a/testsuite/tests/ghc-regress/lib/PrettyPrint/pp1.stdout b/testsuite/tests/lib/PrettyPrint/pp1.stdout
index 6915311150..6915311150 100644
--- a/testsuite/tests/ghc-regress/lib/PrettyPrint/pp1.stdout
+++ b/testsuite/tests/lib/PrettyPrint/pp1.stdout
diff --git a/testsuite/tests/lib/Regex/Makefile b/testsuite/tests/lib/Regex/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/Regex/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Regex/all.T b/testsuite/tests/lib/Regex/all.T
index c69bfd665a..c69bfd665a 100644
--- a/testsuite/tests/ghc-regress/lib/Regex/all.T
+++ b/testsuite/tests/lib/Regex/all.T
diff --git a/testsuite/tests/ghc-regress/lib/Regex/regex001.hs b/testsuite/tests/lib/Regex/regex001.hs
index 1c9393c1b2..1c9393c1b2 100644
--- a/testsuite/tests/ghc-regress/lib/Regex/regex001.hs
+++ b/testsuite/tests/lib/Regex/regex001.hs
diff --git a/testsuite/tests/ghc-regress/lib/Regex/regex002.hs b/testsuite/tests/lib/Regex/regex002.hs
index 9a87a85618..9a87a85618 100644
--- a/testsuite/tests/ghc-regress/lib/Regex/regex002.hs
+++ b/testsuite/tests/lib/Regex/regex002.hs
diff --git a/testsuite/tests/ghc-regress/lib/Regex/regex002.stdout b/testsuite/tests/lib/Regex/regex002.stdout
index 99b5656f91..99b5656f91 100644
--- a/testsuite/tests/ghc-regress/lib/Regex/regex002.stdout
+++ b/testsuite/tests/lib/Regex/regex002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Regex/regex003.hs b/testsuite/tests/lib/Regex/regex003.hs
index 0aa51fe7aa..0aa51fe7aa 100644
--- a/testsuite/tests/ghc-regress/lib/Regex/regex003.hs
+++ b/testsuite/tests/lib/Regex/regex003.hs
diff --git a/testsuite/tests/ghc-regress/lib/Regex/regex003.stdout b/testsuite/tests/lib/Regex/regex003.stdout
index 49d7499e91..49d7499e91 100644
--- a/testsuite/tests/ghc-regress/lib/Regex/regex003.stdout
+++ b/testsuite/tests/lib/Regex/regex003.stdout
diff --git a/testsuite/tests/lib/Show/Makefile b/testsuite/tests/lib/Show/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/Show/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Show/all.T b/testsuite/tests/lib/Show/all.T
index 0e98a0e5a9..0e98a0e5a9 100644
--- a/testsuite/tests/ghc-regress/lib/Show/all.T
+++ b/testsuite/tests/lib/Show/all.T
diff --git a/testsuite/tests/ghc-regress/lib/Show/showDouble.hs b/testsuite/tests/lib/Show/showDouble.hs
index 399af28450..399af28450 100644
--- a/testsuite/tests/ghc-regress/lib/Show/showDouble.hs
+++ b/testsuite/tests/lib/Show/showDouble.hs
diff --git a/testsuite/tests/ghc-regress/lib/Show/showDouble.stdout b/testsuite/tests/lib/Show/showDouble.stdout
index fb1b4de5e4..fb1b4de5e4 100644
--- a/testsuite/tests/ghc-regress/lib/Show/showDouble.stdout
+++ b/testsuite/tests/lib/Show/showDouble.stdout
diff --git a/testsuite/tests/lib/System/Makefile b/testsuite/tests/lib/System/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/System/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/System/all.T b/testsuite/tests/lib/System/all.T
index 996946fd69..996946fd69 100644
--- a/testsuite/tests/ghc-regress/lib/System/all.T
+++ b/testsuite/tests/lib/System/all.T
diff --git a/testsuite/tests/ghc-regress/lib/System/exitWith001.hs b/testsuite/tests/lib/System/exitWith001.hs
index 38dc38a9d5..38dc38a9d5 100644
--- a/testsuite/tests/ghc-regress/lib/System/exitWith001.hs
+++ b/testsuite/tests/lib/System/exitWith001.hs
diff --git a/testsuite/tests/ghc-regress/lib/System/exitWith001.stdout b/testsuite/tests/lib/System/exitWith001.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/lib/System/exitWith001.stdout
+++ b/testsuite/tests/lib/System/exitWith001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/System/getArgs001.hs b/testsuite/tests/lib/System/getArgs001.hs
index 4b8df9101b..4b8df9101b 100644
--- a/testsuite/tests/ghc-regress/lib/System/getArgs001.hs
+++ b/testsuite/tests/lib/System/getArgs001.hs
diff --git a/testsuite/tests/ghc-regress/lib/System/getArgs001.stdout b/testsuite/tests/lib/System/getArgs001.stdout
index e732087713..e732087713 100644
--- a/testsuite/tests/ghc-regress/lib/System/getArgs001.stdout
+++ b/testsuite/tests/lib/System/getArgs001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/System/getEnv001.hs b/testsuite/tests/lib/System/getEnv001.hs
index 745f8eaa7f..745f8eaa7f 100644
--- a/testsuite/tests/ghc-regress/lib/System/getEnv001.hs
+++ b/testsuite/tests/lib/System/getEnv001.hs
diff --git a/testsuite/tests/ghc-regress/lib/System/getEnv001.stdout b/testsuite/tests/lib/System/getEnv001.stdout
index b191cc3dd1..b191cc3dd1 100644
--- a/testsuite/tests/ghc-regress/lib/System/getEnv001.stdout
+++ b/testsuite/tests/lib/System/getEnv001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/System/system001.hs b/testsuite/tests/lib/System/system001.hs
index 4237d526af..4237d526af 100644
--- a/testsuite/tests/ghc-regress/lib/System/system001.hs
+++ b/testsuite/tests/lib/System/system001.hs
diff --git a/testsuite/tests/ghc-regress/lib/System/system001.stdout b/testsuite/tests/lib/System/system001.stdout
index 4237d526af..4237d526af 100644
--- a/testsuite/tests/ghc-regress/lib/System/system001.stdout
+++ b/testsuite/tests/lib/System/system001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Text.Printf/1548.hs b/testsuite/tests/lib/Text.Printf/1548.hs
index 68cec0548f..68cec0548f 100644
--- a/testsuite/tests/ghc-regress/lib/Text.Printf/1548.hs
+++ b/testsuite/tests/lib/Text.Printf/1548.hs
diff --git a/testsuite/tests/ghc-regress/lib/Text.Printf/1548.stdout b/testsuite/tests/lib/Text.Printf/1548.stdout
index 4976334b4f..4976334b4f 100644
--- a/testsuite/tests/ghc-regress/lib/Text.Printf/1548.stdout
+++ b/testsuite/tests/lib/Text.Printf/1548.stdout
diff --git a/testsuite/tests/lib/Text.Printf/Makefile b/testsuite/tests/lib/Text.Printf/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/Text.Printf/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Text.Printf/all.T b/testsuite/tests/lib/Text.Printf/all.T
index aa26ff2d96..aa26ff2d96 100644
--- a/testsuite/tests/ghc-regress/lib/Text.Printf/all.T
+++ b/testsuite/tests/lib/Text.Printf/all.T
diff --git a/testsuite/tests/lib/Time/Makefile b/testsuite/tests/lib/Time/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/Time/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/Time/all.T b/testsuite/tests/lib/Time/all.T
index 25b40820c0..25b40820c0 100644
--- a/testsuite/tests/ghc-regress/lib/Time/all.T
+++ b/testsuite/tests/lib/Time/all.T
diff --git a/testsuite/tests/ghc-regress/lib/Time/time002.hs b/testsuite/tests/lib/Time/time002.hs
index e2f9bcb7a7..e2f9bcb7a7 100644
--- a/testsuite/tests/ghc-regress/lib/Time/time002.hs
+++ b/testsuite/tests/lib/Time/time002.hs
diff --git a/testsuite/tests/ghc-regress/lib/Time/time002.stdout b/testsuite/tests/lib/Time/time002.stdout
index 587579af91..587579af91 100644
--- a/testsuite/tests/ghc-regress/lib/Time/time002.stdout
+++ b/testsuite/tests/lib/Time/time002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Time/time003.hs b/testsuite/tests/lib/Time/time003.hs
index 4dda0e466f..4dda0e466f 100644
--- a/testsuite/tests/ghc-regress/lib/Time/time003.hs
+++ b/testsuite/tests/lib/Time/time003.hs
diff --git a/testsuite/tests/ghc-regress/lib/Time/time003.stdout b/testsuite/tests/lib/Time/time003.stdout
index dbde422651..dbde422651 100644
--- a/testsuite/tests/ghc-regress/lib/Time/time003.stdout
+++ b/testsuite/tests/lib/Time/time003.stdout
diff --git a/testsuite/tests/ghc-regress/lib/Time/time004.hs b/testsuite/tests/lib/Time/time004.hs
index 9a281a10da..9a281a10da 100644
--- a/testsuite/tests/ghc-regress/lib/Time/time004.hs
+++ b/testsuite/tests/lib/Time/time004.hs
diff --git a/testsuite/tests/ghc-regress/lib/Time/time004.stdout b/testsuite/tests/lib/Time/time004.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/lib/Time/time004.stdout
+++ b/testsuite/tests/lib/Time/time004.stdout
diff --git a/testsuite/tests/lib/exceptions/Makefile b/testsuite/tests/lib/exceptions/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/exceptions/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/exceptions/all.T b/testsuite/tests/lib/exceptions/all.T
index 04b3a7fce4..04b3a7fce4 100644
--- a/testsuite/tests/ghc-regress/lib/exceptions/all.T
+++ b/testsuite/tests/lib/exceptions/all.T
diff --git a/testsuite/tests/ghc-regress/lib/exceptions/exceptions001.hs b/testsuite/tests/lib/exceptions/exceptions001.hs
index f5fcbf0087..f5fcbf0087 100644
--- a/testsuite/tests/ghc-regress/lib/exceptions/exceptions001.hs
+++ b/testsuite/tests/lib/exceptions/exceptions001.hs
diff --git a/testsuite/tests/lib/haskell98/Makefile b/testsuite/tests/lib/haskell98/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/haskell98/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/haskell98/all.T b/testsuite/tests/lib/haskell98/all.T
index 85e226fdb7..85e226fdb7 100644
--- a/testsuite/tests/ghc-regress/lib/haskell98/all.T
+++ b/testsuite/tests/lib/haskell98/all.T
diff --git a/testsuite/tests/ghc-regress/lib/haskell98/instance-leaks.hs b/testsuite/tests/lib/haskell98/instance-leaks.hs
index 131d42cbd9..131d42cbd9 100644
--- a/testsuite/tests/ghc-regress/lib/haskell98/instance-leaks.hs
+++ b/testsuite/tests/lib/haskell98/instance-leaks.hs
diff --git a/testsuite/tests/lib/integer/Makefile b/testsuite/tests/lib/integer/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/integer/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/integer/all.T b/testsuite/tests/lib/integer/all.T
index a3568e7606..a3568e7606 100644
--- a/testsuite/tests/ghc-regress/lib/integer/all.T
+++ b/testsuite/tests/lib/integer/all.T
diff --git a/testsuite/tests/ghc-regress/lib/integer/integerBits.hs b/testsuite/tests/lib/integer/integerBits.hs
index d5538dd544..d5538dd544 100644
--- a/testsuite/tests/ghc-regress/lib/integer/integerBits.hs
+++ b/testsuite/tests/lib/integer/integerBits.hs
diff --git a/testsuite/tests/ghc-regress/lib/integer/integerBits.stdout b/testsuite/tests/lib/integer/integerBits.stdout
index 621e83f953..621e83f953 100644
--- a/testsuite/tests/ghc-regress/lib/integer/integerBits.stdout
+++ b/testsuite/tests/lib/integer/integerBits.stdout
diff --git a/testsuite/tests/ghc-regress/lib/integer/integerConversions.hs b/testsuite/tests/lib/integer/integerConversions.hs
index 9b10bbdff2..9b10bbdff2 100644
--- a/testsuite/tests/ghc-regress/lib/integer/integerConversions.hs
+++ b/testsuite/tests/lib/integer/integerConversions.hs
diff --git a/testsuite/tests/ghc-regress/lib/integer/integerConversions.stdout b/testsuite/tests/lib/integer/integerConversions.stdout
index 18af7927e1..18af7927e1 100644
--- a/testsuite/tests/ghc-regress/lib/integer/integerConversions.stdout
+++ b/testsuite/tests/lib/integer/integerConversions.stdout
diff --git a/testsuite/tests/ghc-regress/lib/integer/integerConversions.stdout-ws-64 b/testsuite/tests/lib/integer/integerConversions.stdout-ws-64
index 9dcd6d98c2..9dcd6d98c2 100644
--- a/testsuite/tests/ghc-regress/lib/integer/integerConversions.stdout-ws-64
+++ b/testsuite/tests/lib/integer/integerConversions.stdout-ws-64
diff --git a/testsuite/tests/lib/libposix/Makefile b/testsuite/tests/lib/libposix/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/libposix/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix001.hs b/testsuite/tests/lib/libposix/posix001.hs
index ed20df7939..ed20df7939 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix001.hs
+++ b/testsuite/tests/lib/libposix/posix001.hs
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix001.stdout b/testsuite/tests/lib/libposix/posix001.stdout
index c9cd245bbe..c9cd245bbe 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix001.stdout
+++ b/testsuite/tests/lib/libposix/posix001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix002.hs b/testsuite/tests/lib/libposix/posix002.hs
index 8d01e8b69f..8d01e8b69f 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix002.hs
+++ b/testsuite/tests/lib/libposix/posix002.hs
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix002.stdout b/testsuite/tests/lib/libposix/posix002.stdout
index 5e17a60f42..5e17a60f42 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix002.stdout
+++ b/testsuite/tests/lib/libposix/posix002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix003.hs b/testsuite/tests/lib/libposix/posix003.hs
index dbea5e1d9b..dbea5e1d9b 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix003.hs
+++ b/testsuite/tests/lib/libposix/posix003.hs
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix003.stdout b/testsuite/tests/lib/libposix/posix003.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix003.stdout
+++ b/testsuite/tests/lib/libposix/posix003.stdout
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix004.hs b/testsuite/tests/lib/libposix/posix004.hs
index 2423f3f77a..2423f3f77a 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix004.hs
+++ b/testsuite/tests/lib/libposix/posix004.hs
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix004.stdout b/testsuite/tests/lib/libposix/posix004.stdout
index 8ed7ee54d5..8ed7ee54d5 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix004.stdout
+++ b/testsuite/tests/lib/libposix/posix004.stdout
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix005.hs b/testsuite/tests/lib/libposix/posix005.hs
index a53182971a..a53182971a 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix005.hs
+++ b/testsuite/tests/lib/libposix/posix005.hs
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix005.stdout b/testsuite/tests/lib/libposix/posix005.stdout
index 9896f43da7..9896f43da7 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix005.stdout
+++ b/testsuite/tests/lib/libposix/posix005.stdout
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix006.hs b/testsuite/tests/lib/libposix/posix006.hs
index eb6451dd73..eb6451dd73 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix006.hs
+++ b/testsuite/tests/lib/libposix/posix006.hs
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix006.stdout b/testsuite/tests/lib/libposix/posix006.stdout
index d66a4ff4ab..d66a4ff4ab 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix006.stdout
+++ b/testsuite/tests/lib/libposix/posix006.stdout
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix007.hs b/testsuite/tests/lib/libposix/posix007.hs
index 2e62820511..2e62820511 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix007.hs
+++ b/testsuite/tests/lib/libposix/posix007.hs
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix007.stdout b/testsuite/tests/lib/libposix/posix007.stdout
index a69478b004..a69478b004 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix007.stdout
+++ b/testsuite/tests/lib/libposix/posix007.stdout
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix008.hs b/testsuite/tests/lib/libposix/posix008.hs
index 249e58eedc..249e58eedc 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix008.hs
+++ b/testsuite/tests/lib/libposix/posix008.hs
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix008.stdout b/testsuite/tests/lib/libposix/posix008.stdout
index 582d22b225..582d22b225 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix008.stdout
+++ b/testsuite/tests/lib/libposix/posix008.stdout
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix009.hs b/testsuite/tests/lib/libposix/posix009.hs
index 1f230f648c..1f230f648c 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix009.hs
+++ b/testsuite/tests/lib/libposix/posix009.hs
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix009.stdout b/testsuite/tests/lib/libposix/posix009.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix009.stdout
+++ b/testsuite/tests/lib/libposix/posix009.stdout
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix010.hs b/testsuite/tests/lib/libposix/posix010.hs
index 83d5f27ee0..83d5f27ee0 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix010.hs
+++ b/testsuite/tests/lib/libposix/posix010.hs
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix010.stdout b/testsuite/tests/lib/libposix/posix010.stdout
index ec1d729853..ec1d729853 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix010.stdout
+++ b/testsuite/tests/lib/libposix/posix010.stdout
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix011.hs b/testsuite/tests/lib/libposix/posix011.hs
index f8baf1cbc2..f8baf1cbc2 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix011.hs
+++ b/testsuite/tests/lib/libposix/posix011.hs
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix011.stdout b/testsuite/tests/lib/libposix/posix011.stdout
index 11b5df4f1b..11b5df4f1b 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix011.stdout
+++ b/testsuite/tests/lib/libposix/posix011.stdout
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix012.hs b/testsuite/tests/lib/libposix/posix012.hs
index 87f002a6cd..87f002a6cd 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix012.hs
+++ b/testsuite/tests/lib/libposix/posix012.hs
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix012.stdout b/testsuite/tests/lib/libposix/posix012.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix012.stdout
+++ b/testsuite/tests/lib/libposix/posix012.stdout
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix013.hs b/testsuite/tests/lib/libposix/posix013.hs
index b78930b44e..b78930b44e 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix013.hs
+++ b/testsuite/tests/lib/libposix/posix013.hs
diff --git a/testsuite/tests/ghc-regress/lib/libposix/posix014.hs b/testsuite/tests/lib/libposix/posix014.hs
index bb3518c440..bb3518c440 100644
--- a/testsuite/tests/ghc-regress/lib/libposix/posix014.hs
+++ b/testsuite/tests/lib/libposix/posix014.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/4006.hs b/testsuite/tests/lib/should_run/4006.hs
index 662b0f62e3..662b0f62e3 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/4006.hs
+++ b/testsuite/tests/lib/should_run/4006.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/4006.stdout b/testsuite/tests/lib/should_run/4006.stdout
index 9db8a8ced2..9db8a8ced2 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/4006.stdout
+++ b/testsuite/tests/lib/should_run/4006.stdout
diff --git a/testsuite/tests/lib/should_run/Makefile b/testsuite/tests/lib/should_run/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/should_run/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/should_run/Memo1.lhs b/testsuite/tests/lib/should_run/Memo1.lhs
index 796f6121e4..796f6121e4 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/Memo1.lhs
+++ b/testsuite/tests/lib/should_run/Memo1.lhs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/Memo2.lhs b/testsuite/tests/lib/should_run/Memo2.lhs
index 5193ec2899..5193ec2899 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/Memo2.lhs
+++ b/testsuite/tests/lib/should_run/Memo2.lhs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/addr001.hs b/testsuite/tests/lib/should_run/addr001.hs
index 436a066063..436a066063 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/addr001.hs
+++ b/testsuite/tests/lib/should_run/addr001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/addr001.stdout b/testsuite/tests/lib/should_run/addr001.stdout
index e098b1be49..e098b1be49 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/addr001.stdout
+++ b/testsuite/tests/lib/should_run/addr001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/addr001.stdout-alpha-dec-osf3 b/testsuite/tests/lib/should_run/addr001.stdout-alpha-dec-osf3
index f38ea71861..f38ea71861 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/addr001.stdout-alpha-dec-osf3
+++ b/testsuite/tests/lib/should_run/addr001.stdout-alpha-dec-osf3
diff --git a/testsuite/tests/ghc-regress/lib/should_run/addr001.stdout-mips-sgi-irix b/testsuite/tests/lib/should_run/addr001.stdout-mips-sgi-irix
index f38ea71861..f38ea71861 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/addr001.stdout-mips-sgi-irix
+++ b/testsuite/tests/lib/should_run/addr001.stdout-mips-sgi-irix
diff --git a/testsuite/tests/ghc-regress/lib/should_run/addr001.stdout-ws-64 b/testsuite/tests/lib/should_run/addr001.stdout-ws-64
index f38ea71861..f38ea71861 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/addr001.stdout-ws-64
+++ b/testsuite/tests/lib/should_run/addr001.stdout-ws-64
diff --git a/testsuite/tests/ghc-regress/lib/should_run/addr001.stdout-x86_64-unknown-openbsd b/testsuite/tests/lib/should_run/addr001.stdout-x86_64-unknown-openbsd
index f38ea71861..f38ea71861 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/addr001.stdout-x86_64-unknown-openbsd
+++ b/testsuite/tests/lib/should_run/addr001.stdout-x86_64-unknown-openbsd
diff --git a/testsuite/tests/ghc-regress/lib/should_run/all.T b/testsuite/tests/lib/should_run/all.T
index 502f868e7f..502f868e7f 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/all.T
+++ b/testsuite/tests/lib/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/lib/should_run/array001.hs b/testsuite/tests/lib/should_run/array001.hs
index b5839b9d53..b5839b9d53 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/array001.hs
+++ b/testsuite/tests/lib/should_run/array001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/array001.stdout b/testsuite/tests/lib/should_run/array001.stdout
index 7c9b768654..7c9b768654 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/array001.stdout
+++ b/testsuite/tests/lib/should_run/array001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/char001.hs b/testsuite/tests/lib/should_run/char001.hs
index 2fb0edce0f..2fb0edce0f 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/char001.hs
+++ b/testsuite/tests/lib/should_run/char001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/char001.stdout b/testsuite/tests/lib/should_run/char001.stdout
index 0c13ac7c03..0c13ac7c03 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/char001.stdout
+++ b/testsuite/tests/lib/should_run/char001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/char002.hs b/testsuite/tests/lib/should_run/char002.hs
index 60b8b03cda..60b8b03cda 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/char002.hs
+++ b/testsuite/tests/lib/should_run/char002.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/char002.stdout b/testsuite/tests/lib/should_run/char002.stdout
index 5190ad9c53..5190ad9c53 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/char002.stdout
+++ b/testsuite/tests/lib/should_run/char002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/cstring001.hs b/testsuite/tests/lib/should_run/cstring001.hs
index 38d0d25db2..38d0d25db2 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/cstring001.hs
+++ b/testsuite/tests/lib/should_run/cstring001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/dynamic001.hs b/testsuite/tests/lib/should_run/dynamic001.hs
index 7a3fd515e9..7a3fd515e9 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/dynamic001.hs
+++ b/testsuite/tests/lib/should_run/dynamic001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/dynamic001.stdout b/testsuite/tests/lib/should_run/dynamic001.stdout
index c2d365a7c6..c2d365a7c6 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/dynamic001.stdout
+++ b/testsuite/tests/lib/should_run/dynamic001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/dynamic002.hs b/testsuite/tests/lib/should_run/dynamic002.hs
index 6d53d2ed1e..6d53d2ed1e 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/dynamic002.hs
+++ b/testsuite/tests/lib/should_run/dynamic002.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/dynamic002.stdout b/testsuite/tests/lib/should_run/dynamic002.stdout
index 8b55566ada..8b55566ada 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/dynamic002.stdout
+++ b/testsuite/tests/lib/should_run/dynamic002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/dynamic003.hs b/testsuite/tests/lib/should_run/dynamic003.hs
index fae8bdb276..fae8bdb276 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/dynamic003.hs
+++ b/testsuite/tests/lib/should_run/dynamic003.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/dynamic003.stdout b/testsuite/tests/lib/should_run/dynamic003.stdout
index bc59c12aa1..bc59c12aa1 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/dynamic003.stdout
+++ b/testsuite/tests/lib/should_run/dynamic003.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/dynamic004.hs b/testsuite/tests/lib/should_run/dynamic004.hs
index e6b7a82bfd..e6b7a82bfd 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/dynamic004.hs
+++ b/testsuite/tests/lib/should_run/dynamic004.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/dynamic004.stdout b/testsuite/tests/lib/should_run/dynamic004.stdout
index 83b33d238d..83b33d238d 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/dynamic004.stdout
+++ b/testsuite/tests/lib/should_run/dynamic004.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/dynamic005.hs b/testsuite/tests/lib/should_run/dynamic005.hs
index e90aeea960..e90aeea960 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/dynamic005.hs
+++ b/testsuite/tests/lib/should_run/dynamic005.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/dynamic005.stdout b/testsuite/tests/lib/should_run/dynamic005.stdout
index 573541ac97..573541ac97 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/dynamic005.stdout
+++ b/testsuite/tests/lib/should_run/dynamic005.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum01.hs b/testsuite/tests/lib/should_run/enum01.hs
index d8178667eb..d8178667eb 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum01.hs
+++ b/testsuite/tests/lib/should_run/enum01.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout b/testsuite/tests/lib/should_run/enum01.stdout
index 71e5bd6d1a..71e5bd6d1a 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout
+++ b/testsuite/tests/lib/should_run/enum01.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout-alpha-dec-osf3 b/testsuite/tests/lib/should_run/enum01.stdout-alpha-dec-osf3
index 63ba3e2fb3..63ba3e2fb3 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout-alpha-dec-osf3
+++ b/testsuite/tests/lib/should_run/enum01.stdout-alpha-dec-osf3
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout-hugs b/testsuite/tests/lib/should_run/enum01.stdout-hugs
index 41bb64d598..41bb64d598 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout-hugs
+++ b/testsuite/tests/lib/should_run/enum01.stdout-hugs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout-ws-64 b/testsuite/tests/lib/should_run/enum01.stdout-ws-64
index 3804dd2470..3804dd2470 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum01.stdout-ws-64
+++ b/testsuite/tests/lib/should_run/enum01.stdout-ws-64
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum02.hs b/testsuite/tests/lib/should_run/enum02.hs
index 3ba9d4912d..3ba9d4912d 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum02.hs
+++ b/testsuite/tests/lib/should_run/enum02.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum02.stdout b/testsuite/tests/lib/should_run/enum02.stdout
index 06d3bb5cae..06d3bb5cae 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum02.stdout
+++ b/testsuite/tests/lib/should_run/enum02.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum02.stdout-alpha-dec-osf3 b/testsuite/tests/lib/should_run/enum02.stdout-alpha-dec-osf3
index 23222450b5..23222450b5 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum02.stdout-alpha-dec-osf3
+++ b/testsuite/tests/lib/should_run/enum02.stdout-alpha-dec-osf3
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum02.stdout-hugs b/testsuite/tests/lib/should_run/enum02.stdout-hugs
index a28b84b187..a28b84b187 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum02.stdout-hugs
+++ b/testsuite/tests/lib/should_run/enum02.stdout-hugs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum02.stdout-mips-sgi-irix b/testsuite/tests/lib/should_run/enum02.stdout-mips-sgi-irix
index 3177d541f4..3177d541f4 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum02.stdout-mips-sgi-irix
+++ b/testsuite/tests/lib/should_run/enum02.stdout-mips-sgi-irix
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum02.stdout-ws-64 b/testsuite/tests/lib/should_run/enum02.stdout-ws-64
index 3177d541f4..3177d541f4 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum02.stdout-ws-64
+++ b/testsuite/tests/lib/should_run/enum02.stdout-ws-64
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum02.stdout-x86_64-unknown-openbsd b/testsuite/tests/lib/should_run/enum02.stdout-x86_64-unknown-openbsd
index 3177d541f4..3177d541f4 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum02.stdout-x86_64-unknown-openbsd
+++ b/testsuite/tests/lib/should_run/enum02.stdout-x86_64-unknown-openbsd
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum03.hs b/testsuite/tests/lib/should_run/enum03.hs
index 908f3dd1a0..908f3dd1a0 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum03.hs
+++ b/testsuite/tests/lib/should_run/enum03.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum03.stdout b/testsuite/tests/lib/should_run/enum03.stdout
index d6db561a72..d6db561a72 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum03.stdout
+++ b/testsuite/tests/lib/should_run/enum03.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum03.stdout-alpha-dec-osf3 b/testsuite/tests/lib/should_run/enum03.stdout-alpha-dec-osf3
index 716782c46a..716782c46a 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum03.stdout-alpha-dec-osf3
+++ b/testsuite/tests/lib/should_run/enum03.stdout-alpha-dec-osf3
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum03.stdout-hugs b/testsuite/tests/lib/should_run/enum03.stdout-hugs
index babc1c2e9e..babc1c2e9e 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum03.stdout-hugs
+++ b/testsuite/tests/lib/should_run/enum03.stdout-hugs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum03.stdout-mips-sgi-irix b/testsuite/tests/lib/should_run/enum03.stdout-mips-sgi-irix
index 716782c46a..716782c46a 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum03.stdout-mips-sgi-irix
+++ b/testsuite/tests/lib/should_run/enum03.stdout-mips-sgi-irix
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum03.stdout-ws-64 b/testsuite/tests/lib/should_run/enum03.stdout-ws-64
index 716782c46a..716782c46a 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum03.stdout-ws-64
+++ b/testsuite/tests/lib/should_run/enum03.stdout-ws-64
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum03.stdout-x86_64-unknown-openbsd b/testsuite/tests/lib/should_run/enum03.stdout-x86_64-unknown-openbsd
index 716782c46a..716782c46a 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum03.stdout-x86_64-unknown-openbsd
+++ b/testsuite/tests/lib/should_run/enum03.stdout-x86_64-unknown-openbsd
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum04.hs b/testsuite/tests/lib/should_run/enum04.hs
index fed9e8c4ef..fed9e8c4ef 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum04.hs
+++ b/testsuite/tests/lib/should_run/enum04.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/enum04.stdout b/testsuite/tests/lib/should_run/enum04.stdout
index c8a3e21e6d..c8a3e21e6d 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/enum04.stdout
+++ b/testsuite/tests/lib/should_run/enum04.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/exceptionsrun001.hs b/testsuite/tests/lib/should_run/exceptionsrun001.hs
index 9c6febc049..9c6febc049 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/exceptionsrun001.hs
+++ b/testsuite/tests/lib/should_run/exceptionsrun001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/exceptionsrun001.stdout b/testsuite/tests/lib/should_run/exceptionsrun001.stdout
index 2d1930f8c9..2d1930f8c9 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/exceptionsrun001.stdout
+++ b/testsuite/tests/lib/should_run/exceptionsrun001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/exceptionsrun002.hs b/testsuite/tests/lib/should_run/exceptionsrun002.hs
index 13b642a3ab..13b642a3ab 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/exceptionsrun002.hs
+++ b/testsuite/tests/lib/should_run/exceptionsrun002.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/exceptionsrun002.stdout b/testsuite/tests/lib/should_run/exceptionsrun002.stdout
index e15116f5c0..e15116f5c0 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/exceptionsrun002.stdout
+++ b/testsuite/tests/lib/should_run/exceptionsrun002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/length001.hs b/testsuite/tests/lib/should_run/length001.hs
index 321a1b9dfc..321a1b9dfc 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/length001.hs
+++ b/testsuite/tests/lib/should_run/length001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/length001.stdout b/testsuite/tests/lib/should_run/length001.stdout
index 4e65c4e0d2..4e65c4e0d2 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/length001.stdout
+++ b/testsuite/tests/lib/should_run/length001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/list001.hs b/testsuite/tests/lib/should_run/list001.hs
index c0a1eced27..c0a1eced27 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/list001.hs
+++ b/testsuite/tests/lib/should_run/list001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/list001.stdout b/testsuite/tests/lib/should_run/list001.stdout
index b8254f066e..b8254f066e 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/list001.stdout
+++ b/testsuite/tests/lib/should_run/list001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/list001.stdout-ghc b/testsuite/tests/lib/should_run/list001.stdout-ghc
index 16e780ac7b..16e780ac7b 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/list001.stdout-ghc
+++ b/testsuite/tests/lib/should_run/list001.stdout-ghc
diff --git a/testsuite/tests/ghc-regress/lib/should_run/list002.hs b/testsuite/tests/lib/should_run/list002.hs
index 188ff8953d..188ff8953d 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/list002.hs
+++ b/testsuite/tests/lib/should_run/list002.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/list002.stdout b/testsuite/tests/lib/should_run/list002.stdout
index 18e1fcad8a..18e1fcad8a 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/list002.stdout
+++ b/testsuite/tests/lib/should_run/list002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/list003.hs b/testsuite/tests/lib/should_run/list003.hs
index a792094438..a792094438 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/list003.hs
+++ b/testsuite/tests/lib/should_run/list003.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/list003.stdout b/testsuite/tests/lib/should_run/list003.stdout
index 447a331b1b..447a331b1b 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/list003.stdout
+++ b/testsuite/tests/lib/should_run/list003.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/memo001.hs b/testsuite/tests/lib/should_run/memo001.hs
index 551bcd8cf4..551bcd8cf4 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/memo001.hs
+++ b/testsuite/tests/lib/should_run/memo001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/memo001.stdout b/testsuite/tests/lib/should_run/memo001.stdout
index 0e1bce9647..0e1bce9647 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/memo001.stdout
+++ b/testsuite/tests/lib/should_run/memo001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/memo002.hs b/testsuite/tests/lib/should_run/memo002.hs
index aa0a1d27c9..aa0a1d27c9 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/memo002.hs
+++ b/testsuite/tests/lib/should_run/memo002.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/memo002.stdout b/testsuite/tests/lib/should_run/memo002.stdout
index 7369b408ef..7369b408ef 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/memo002.stdout
+++ b/testsuite/tests/lib/should_run/memo002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/packedstring001.hs b/testsuite/tests/lib/should_run/packedstring001.hs
index 9ee24e232c..9ee24e232c 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/packedstring001.hs
+++ b/testsuite/tests/lib/should_run/packedstring001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/packedstring001.stdout b/testsuite/tests/lib/should_run/packedstring001.stdout
index fbd5abc3a0..fbd5abc3a0 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/packedstring001.stdout
+++ b/testsuite/tests/lib/should_run/packedstring001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/rand001.hs b/testsuite/tests/lib/should_run/rand001.hs
index 3567ae0dd8..3567ae0dd8 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/rand001.hs
+++ b/testsuite/tests/lib/should_run/rand001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/rand001.stdout b/testsuite/tests/lib/should_run/rand001.stdout
index 2e883c51de..2e883c51de 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/rand001.stdout
+++ b/testsuite/tests/lib/should_run/rand001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/ratio001.hs b/testsuite/tests/lib/should_run/ratio001.hs
index 4d65dfbccf..4d65dfbccf 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/ratio001.hs
+++ b/testsuite/tests/lib/should_run/ratio001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/ratio001.stdout b/testsuite/tests/lib/should_run/ratio001.stdout
index f7355f9a4a..f7355f9a4a 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/ratio001.stdout
+++ b/testsuite/tests/lib/should_run/ratio001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/ratio001.stdout-ghc b/testsuite/tests/lib/should_run/ratio001.stdout-ghc
index f7355f9a4a..f7355f9a4a 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/ratio001.stdout-ghc
+++ b/testsuite/tests/lib/should_run/ratio001.stdout-ghc
diff --git a/testsuite/tests/ghc-regress/lib/should_run/reads001.hs b/testsuite/tests/lib/should_run/reads001.hs
index 318367e7f4..318367e7f4 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/reads001.hs
+++ b/testsuite/tests/lib/should_run/reads001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/reads001.stdout b/testsuite/tests/lib/should_run/reads001.stdout
index 23639933e8..23639933e8 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/reads001.stdout
+++ b/testsuite/tests/lib/should_run/reads001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/show001.hs b/testsuite/tests/lib/should_run/show001.hs
index 69c27d01ea..69c27d01ea 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/show001.hs
+++ b/testsuite/tests/lib/should_run/show001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/show001.stdout b/testsuite/tests/lib/should_run/show001.stdout
index 3be0062e87..3be0062e87 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/show001.stdout
+++ b/testsuite/tests/lib/should_run/show001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/stableptr001.hs b/testsuite/tests/lib/should_run/stableptr001.hs
index 1bc857aba6..1bc857aba6 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/stableptr001.hs
+++ b/testsuite/tests/lib/should_run/stableptr001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/stableptr001.stdout b/testsuite/tests/lib/should_run/stableptr001.stdout
index 90ee71a089..90ee71a089 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/stableptr001.stdout
+++ b/testsuite/tests/lib/should_run/stableptr001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/stableptr003.hs b/testsuite/tests/lib/should_run/stableptr003.hs
index 77f4e3c9dc..77f4e3c9dc 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/stableptr003.hs
+++ b/testsuite/tests/lib/should_run/stableptr003.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/stableptr004.hs b/testsuite/tests/lib/should_run/stableptr004.hs
index 2d6f567cae..2d6f567cae 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/stableptr004.hs
+++ b/testsuite/tests/lib/should_run/stableptr004.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/stableptr004.stdout b/testsuite/tests/lib/should_run/stableptr004.stdout
index 30e717b5bd..30e717b5bd 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/stableptr004.stdout
+++ b/testsuite/tests/lib/should_run/stableptr004.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/stableptr005.hs b/testsuite/tests/lib/should_run/stableptr005.hs
index dc4928ab6c..dc4928ab6c 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/stableptr005.hs
+++ b/testsuite/tests/lib/should_run/stableptr005.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/stableptr005.stdout b/testsuite/tests/lib/should_run/stableptr005.stdout
index 06ae699f22..06ae699f22 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/stableptr005.stdout
+++ b/testsuite/tests/lib/should_run/stableptr005.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/text001.hs b/testsuite/tests/lib/should_run/text001.hs
index 18aab82dd9..18aab82dd9 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/text001.hs
+++ b/testsuite/tests/lib/should_run/text001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/text001.stdout b/testsuite/tests/lib/should_run/text001.stdout
index a0c782242e..a0c782242e 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/text001.stdout
+++ b/testsuite/tests/lib/should_run/text001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/tup001.hs b/testsuite/tests/lib/should_run/tup001.hs
index a70e09027a..a70e09027a 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/tup001.hs
+++ b/testsuite/tests/lib/should_run/tup001.hs
diff --git a/testsuite/tests/ghc-regress/lib/should_run/tup001.stdout b/testsuite/tests/lib/should_run/tup001.stdout
index 540340b816..540340b816 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/tup001.stdout
+++ b/testsuite/tests/lib/should_run/tup001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/should_run/weak001.hs b/testsuite/tests/lib/should_run/weak001.hs
index 60dc9c4a12..60dc9c4a12 100644
--- a/testsuite/tests/ghc-regress/lib/should_run/weak001.hs
+++ b/testsuite/tests/lib/should_run/weak001.hs
diff --git a/testsuite/tests/lib/socket/Makefile b/testsuite/tests/lib/socket/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/lib/socket/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket001.hs b/testsuite/tests/lib/socket/socket001.hs
index 0af7afa0d7..0af7afa0d7 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket001.hs
+++ b/testsuite/tests/lib/socket/socket001.hs
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket001.stdout b/testsuite/tests/lib/socket/socket001.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket001.stdout
+++ b/testsuite/tests/lib/socket/socket001.stdout
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket002.hs b/testsuite/tests/lib/socket/socket002.hs
index 1e7b19da0b..1e7b19da0b 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket002.hs
+++ b/testsuite/tests/lib/socket/socket002.hs
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket002.stdout b/testsuite/tests/lib/socket/socket002.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket002.stdout
+++ b/testsuite/tests/lib/socket/socket002.stdout
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket003.hs b/testsuite/tests/lib/socket/socket003.hs
index ea88a34dde..ea88a34dde 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket003.hs
+++ b/testsuite/tests/lib/socket/socket003.hs
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket003.stdout b/testsuite/tests/lib/socket/socket003.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket003.stdout
+++ b/testsuite/tests/lib/socket/socket003.stdout
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket004.hs b/testsuite/tests/lib/socket/socket004.hs
index d7fbdc91bc..d7fbdc91bc 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket004.hs
+++ b/testsuite/tests/lib/socket/socket004.hs
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket004.stdout b/testsuite/tests/lib/socket/socket004.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket004.stdout
+++ b/testsuite/tests/lib/socket/socket004.stdout
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket005.hs b/testsuite/tests/lib/socket/socket005.hs
index ec504aa480..ec504aa480 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket005.hs
+++ b/testsuite/tests/lib/socket/socket005.hs
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket005.stdout b/testsuite/tests/lib/socket/socket005.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket005.stdout
+++ b/testsuite/tests/lib/socket/socket005.stdout
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket006.hs b/testsuite/tests/lib/socket/socket006.hs
index e2ad13ae49..e2ad13ae49 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket006.hs
+++ b/testsuite/tests/lib/socket/socket006.hs
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket006.stdout b/testsuite/tests/lib/socket/socket006.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket006.stdout
+++ b/testsuite/tests/lib/socket/socket006.stdout
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket007.hs b/testsuite/tests/lib/socket/socket007.hs
index fbc9ff04e0..fbc9ff04e0 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket007.hs
+++ b/testsuite/tests/lib/socket/socket007.hs
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket007.stdout b/testsuite/tests/lib/socket/socket007.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket007.stdout
+++ b/testsuite/tests/lib/socket/socket007.stdout
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket008.hs b/testsuite/tests/lib/socket/socket008.hs
index 896763409e..896763409e 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket008.hs
+++ b/testsuite/tests/lib/socket/socket008.hs
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket008.stdout b/testsuite/tests/lib/socket/socket008.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket008.stdout
+++ b/testsuite/tests/lib/socket/socket008.stdout
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket009.hs b/testsuite/tests/lib/socket/socket009.hs
index c34334e691..c34334e691 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket009.hs
+++ b/testsuite/tests/lib/socket/socket009.hs
diff --git a/testsuite/tests/ghc-regress/lib/socket/socket009.stdout b/testsuite/tests/lib/socket/socket009.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/lib/socket/socket009.stdout
+++ b/testsuite/tests/lib/socket/socket009.stdout
diff --git a/testsuite/tests/lib/win32/Makefile b/testsuite/tests/lib/win32/Makefile
new file mode 100644
index 0000000000..66afc12be9
--- /dev/null
+++ b/testsuite/tests/lib/win32/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..

+include $(TOP)/mk/boilerplate.mk

+include $(TOP)/mk/test.mk

diff --git a/testsuite/tests/ghc-regress/lib/win32/all.T b/testsuite/tests/lib/win32/all.T
index 1e9378a5e6..1e9378a5e6 100644
--- a/testsuite/tests/ghc-regress/lib/win32/all.T
+++ b/testsuite/tests/lib/win32/all.T
diff --git a/testsuite/tests/ghc-regress/lib/win32/win32001.hs b/testsuite/tests/lib/win32/win32001.hs
index 8765dcb0fd..8765dcb0fd 100644
--- a/testsuite/tests/ghc-regress/lib/win32/win32001.hs
+++ b/testsuite/tests/lib/win32/win32001.hs
diff --git a/testsuite/tests/ghc-regress/lib/win32/win32002.hs b/testsuite/tests/lib/win32/win32002.hs
index 0b57985333..0b57985333 100644
--- a/testsuite/tests/ghc-regress/lib/win32/win32002.hs
+++ b/testsuite/tests/lib/win32/win32002.hs
diff --git a/testsuite/tests/mdo/Makefile b/testsuite/tests/mdo/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/mdo/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/mdo/should_compile/Makefile b/testsuite/tests/mdo/should_compile/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/mdo/should_compile/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/mdo/should_compile/all.T b/testsuite/tests/mdo/should_compile/all.T
index 49be01fc59..49be01fc59 100644
--- a/testsuite/tests/ghc-regress/mdo/should_compile/all.T
+++ b/testsuite/tests/mdo/should_compile/all.T
diff --git a/testsuite/tests/ghc-regress/mdo/should_compile/mdo001.hs b/testsuite/tests/mdo/should_compile/mdo001.hs
index e193743553..e193743553 100644
--- a/testsuite/tests/ghc-regress/mdo/should_compile/mdo001.hs
+++ b/testsuite/tests/mdo/should_compile/mdo001.hs
diff --git a/testsuite/tests/ghc-regress/mdo/should_compile/mdo001.stdout b/testsuite/tests/mdo/should_compile/mdo001.stdout
index cfaadf8fad..cfaadf8fad 100644
--- a/testsuite/tests/ghc-regress/mdo/should_compile/mdo001.stdout
+++ b/testsuite/tests/mdo/should_compile/mdo001.stdout
diff --git a/testsuite/tests/ghc-regress/mdo/should_compile/mdo002.hs b/testsuite/tests/mdo/should_compile/mdo002.hs
index dc33595590..dc33595590 100644
--- a/testsuite/tests/ghc-regress/mdo/should_compile/mdo002.hs
+++ b/testsuite/tests/mdo/should_compile/mdo002.hs
diff --git a/testsuite/tests/ghc-regress/mdo/should_compile/mdo002.stdout b/testsuite/tests/mdo/should_compile/mdo002.stdout
index f3b1299b8c..f3b1299b8c 100644
--- a/testsuite/tests/ghc-regress/mdo/should_compile/mdo002.stdout
+++ b/testsuite/tests/mdo/should_compile/mdo002.stdout
diff --git a/testsuite/tests/ghc-regress/mdo/should_compile/mdo003.hs b/testsuite/tests/mdo/should_compile/mdo003.hs
index 1a0cb37c2e..1a0cb37c2e 100644
--- a/testsuite/tests/ghc-regress/mdo/should_compile/mdo003.hs
+++ b/testsuite/tests/mdo/should_compile/mdo003.hs
diff --git a/testsuite/tests/ghc-regress/mdo/should_compile/mdo003.stdout b/testsuite/tests/mdo/should_compile/mdo003.stdout
index d00491fd7e..d00491fd7e 100644
--- a/testsuite/tests/ghc-regress/mdo/should_compile/mdo003.stdout
+++ b/testsuite/tests/mdo/should_compile/mdo003.stdout
diff --git a/testsuite/tests/ghc-regress/mdo/should_compile/mdo004.hs b/testsuite/tests/mdo/should_compile/mdo004.hs
index 544ee6cc66..544ee6cc66 100644
--- a/testsuite/tests/ghc-regress/mdo/should_compile/mdo004.hs
+++ b/testsuite/tests/mdo/should_compile/mdo004.hs
diff --git a/testsuite/tests/ghc-regress/mdo/should_compile/mdo004.stdout b/testsuite/tests/mdo/should_compile/mdo004.stdout
index 99a45a1c91..99a45a1c91 100644
--- a/testsuite/tests/ghc-regress/mdo/should_compile/mdo004.stdout
+++ b/testsuite/tests/mdo/should_compile/mdo004.stdout
diff --git a/testsuite/tests/ghc-regress/mdo/should_compile/mdo005.hs b/testsuite/tests/mdo/should_compile/mdo005.hs
index 0b6301b8a5..0b6301b8a5 100644
--- a/testsuite/tests/ghc-regress/mdo/should_compile/mdo005.hs
+++ b/testsuite/tests/mdo/should_compile/mdo005.hs
diff --git a/testsuite/tests/ghc-regress/mdo/should_compile/mdo005.stdout b/testsuite/tests/mdo/should_compile/mdo005.stdout
index ee67c15ef8..ee67c15ef8 100644
--- a/testsuite/tests/ghc-regress/mdo/should_compile/mdo005.stdout
+++ b/testsuite/tests/mdo/should_compile/mdo005.stdout
diff --git a/testsuite/tests/ghc-regress/mdo/should_compile/mdo006.hs b/testsuite/tests/mdo/should_compile/mdo006.hs
index 6ccfb94041..6ccfb94041 100644
--- a/testsuite/tests/ghc-regress/mdo/should_compile/mdo006.hs
+++ b/testsuite/tests/mdo/should_compile/mdo006.hs
diff --git a/testsuite/tests/ghc-regress/mdo/should_compile/mdo006.stderr b/testsuite/tests/mdo/should_compile/mdo006.stderr
index 218ba444b8..218ba444b8 100644
--- a/testsuite/tests/ghc-regress/mdo/should_compile/mdo006.stderr
+++ b/testsuite/tests/mdo/should_compile/mdo006.stderr
diff --git a/testsuite/tests/mdo/should_fail/Makefile b/testsuite/tests/mdo/should_fail/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/mdo/should_fail/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/all.T b/testsuite/tests/mdo/should_fail/all.T
index 6693587bab..6693587bab 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/all.T
+++ b/testsuite/tests/mdo/should_fail/all.T
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail001.hs b/testsuite/tests/mdo/should_fail/mdofail001.hs
index fe8f95e766..fe8f95e766 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail001.hs
+++ b/testsuite/tests/mdo/should_fail/mdofail001.hs
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail001.stderr b/testsuite/tests/mdo/should_fail/mdofail001.stderr
index 8660e167fe..8660e167fe 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail001.stderr
+++ b/testsuite/tests/mdo/should_fail/mdofail001.stderr
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail001.stderr-ghc-7.0 b/testsuite/tests/mdo/should_fail/mdofail001.stderr-ghc-7.0
index 189c414315..189c414315 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail001.stderr-ghc-7.0
+++ b/testsuite/tests/mdo/should_fail/mdofail001.stderr-ghc-7.0
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail001.stderr-hugs b/testsuite/tests/mdo/should_fail/mdofail001.stderr-hugs
index 3bfe41e9f4..3bfe41e9f4 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail001.stderr-hugs
+++ b/testsuite/tests/mdo/should_fail/mdofail001.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail002.hs b/testsuite/tests/mdo/should_fail/mdofail002.hs
index 27c9861f38..27c9861f38 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail002.hs
+++ b/testsuite/tests/mdo/should_fail/mdofail002.hs
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail002.stderr b/testsuite/tests/mdo/should_fail/mdofail002.stderr
index 4da766311e..4da766311e 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail002.stderr
+++ b/testsuite/tests/mdo/should_fail/mdofail002.stderr
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail002.stderr-ghc-7.0 b/testsuite/tests/mdo/should_fail/mdofail002.stderr-ghc-7.0
index a1327c6dfd..a1327c6dfd 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail002.stderr-ghc-7.0
+++ b/testsuite/tests/mdo/should_fail/mdofail002.stderr-ghc-7.0
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail002.stderr-hugs b/testsuite/tests/mdo/should_fail/mdofail002.stderr-hugs
index 4f1c0a0bb4..4f1c0a0bb4 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail002.stderr-hugs
+++ b/testsuite/tests/mdo/should_fail/mdofail002.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail003.hs b/testsuite/tests/mdo/should_fail/mdofail003.hs
index ba7e80a74b..ba7e80a74b 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail003.hs
+++ b/testsuite/tests/mdo/should_fail/mdofail003.hs
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail003.stderr b/testsuite/tests/mdo/should_fail/mdofail003.stderr
index fceb7d2b82..fceb7d2b82 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail003.stderr
+++ b/testsuite/tests/mdo/should_fail/mdofail003.stderr
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail003.stderr-ghc-7.0 b/testsuite/tests/mdo/should_fail/mdofail003.stderr-ghc-7.0
index e093fe0a75..e093fe0a75 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail003.stderr-ghc-7.0
+++ b/testsuite/tests/mdo/should_fail/mdofail003.stderr-ghc-7.0
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail003.stderr-hugs b/testsuite/tests/mdo/should_fail/mdofail003.stderr-hugs
index ef14fdcff3..ef14fdcff3 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail003.stderr-hugs
+++ b/testsuite/tests/mdo/should_fail/mdofail003.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail004.hs b/testsuite/tests/mdo/should_fail/mdofail004.hs
index 37cd757312..37cd757312 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail004.hs
+++ b/testsuite/tests/mdo/should_fail/mdofail004.hs
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail004.stderr b/testsuite/tests/mdo/should_fail/mdofail004.stderr
index 7a96d65197..7a96d65197 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail004.stderr
+++ b/testsuite/tests/mdo/should_fail/mdofail004.stderr
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail004.stderr-ghc-7.0 b/testsuite/tests/mdo/should_fail/mdofail004.stderr-ghc-7.0
index 63c0cae6ac..63c0cae6ac 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail004.stderr-ghc-7.0
+++ b/testsuite/tests/mdo/should_fail/mdofail004.stderr-ghc-7.0
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail004.stderr-hugs b/testsuite/tests/mdo/should_fail/mdofail004.stderr-hugs
index c787c4209b..c787c4209b 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail004.stderr-hugs
+++ b/testsuite/tests/mdo/should_fail/mdofail004.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail005.hs b/testsuite/tests/mdo/should_fail/mdofail005.hs
index b4d52918a5..b4d52918a5 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail005.hs
+++ b/testsuite/tests/mdo/should_fail/mdofail005.hs
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail005.stderr b/testsuite/tests/mdo/should_fail/mdofail005.stderr
index 306df25706..306df25706 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail005.stderr
+++ b/testsuite/tests/mdo/should_fail/mdofail005.stderr
diff --git a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail005.stderr-hugs b/testsuite/tests/mdo/should_fail/mdofail005.stderr-hugs
index 6bb11378a1..6bb11378a1 100644
--- a/testsuite/tests/ghc-regress/mdo/should_fail/mdofail005.stderr-hugs
+++ b/testsuite/tests/mdo/should_fail/mdofail005.stderr-hugs
diff --git a/testsuite/tests/mdo/should_run/Makefile b/testsuite/tests/mdo/should_run/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/mdo/should_run/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/mdo/should_run/all.T b/testsuite/tests/mdo/should_run/all.T
index 53730bebe6..53730bebe6 100644
--- a/testsuite/tests/ghc-regress/mdo/should_run/all.T
+++ b/testsuite/tests/mdo/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/mdo/should_run/mdorun001.hs b/testsuite/tests/mdo/should_run/mdorun001.hs
index 8527e5b2b1..8527e5b2b1 100644
--- a/testsuite/tests/ghc-regress/mdo/should_run/mdorun001.hs
+++ b/testsuite/tests/mdo/should_run/mdorun001.hs
diff --git a/testsuite/tests/ghc-regress/mdo/should_run/mdorun001.stdout b/testsuite/tests/mdo/should_run/mdorun001.stdout
index 7b0453fcf9..7b0453fcf9 100644
--- a/testsuite/tests/ghc-regress/mdo/should_run/mdorun001.stdout
+++ b/testsuite/tests/mdo/should_run/mdorun001.stdout
diff --git a/testsuite/tests/ghc-regress/mdo/should_run/mdorun002.hs b/testsuite/tests/mdo/should_run/mdorun002.hs
index 191e40039d..191e40039d 100644
--- a/testsuite/tests/ghc-regress/mdo/should_run/mdorun002.hs
+++ b/testsuite/tests/mdo/should_run/mdorun002.hs
diff --git a/testsuite/tests/ghc-regress/mdo/should_run/mdorun002.stdout b/testsuite/tests/mdo/should_run/mdorun002.stdout
index 34df74ba96..34df74ba96 100644
--- a/testsuite/tests/ghc-regress/mdo/should_run/mdorun002.stdout
+++ b/testsuite/tests/mdo/should_run/mdorun002.stdout
diff --git a/testsuite/tests/ghc-regress/mdo/should_run/mdorun003.hs b/testsuite/tests/mdo/should_run/mdorun003.hs
index f818afa56a..f818afa56a 100644
--- a/testsuite/tests/ghc-regress/mdo/should_run/mdorun003.hs
+++ b/testsuite/tests/mdo/should_run/mdorun003.hs
diff --git a/testsuite/tests/ghc-regress/mdo/should_run/mdorun003.stdout b/testsuite/tests/mdo/should_run/mdorun003.stdout
index 912f3a2a53..912f3a2a53 100644
--- a/testsuite/tests/ghc-regress/mdo/should_run/mdorun003.stdout
+++ b/testsuite/tests/mdo/should_run/mdorun003.stdout
diff --git a/testsuite/tests/module/Makefile b/testsuite/tests/module/Makefile
new file mode 100644
index 0000000000..aa235327a4
--- /dev/null
+++ b/testsuite/tests/module/Makefile
@@ -0,0 +1,70 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+# We don't want make to fail here, because it emits an unpredictable
+# error message.  Instead we really want to test the exit code of GHC,
+# hence the 
+#    echo "exit($$?)" 1>&2
+# which emits GHC's exit code to stderr so the test driver can compare it.
+
+mod144::
+	rm -f Mod144_A.o Mod144_A.hi mod144.o mod144.hi mod144
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c Mod144_A.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c mod144.hs || echo "exit($$?)" 1>&2
+
+# These tests share some source files, so to avoid clashing when
+# using multiple threads we direct the outputs to different files
+# depending on the test name.
+AUX_O  = $@_o
+AUX_HI = $@_hi
+AUX_OPTS = -osuf $(AUX_O) -hisuf $(AUX_HI)
+
+mod146::
+	rm -f Mod145_A.$(AUX_O) Mod145_A.$(AUX_HI) mod146.$(AUX_O) mod146.$(AUX_HI) mod146
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod145_A.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c mod146.hs || echo "exit($$?)" 1>&2
+
+mod158::
+	rm -f Mod157_*.$(AUX_O) Mod157_*.$(AUX_HI)
+	rm -f mod158.$(AUX_O) mod158.$(AUX_HI) mod158
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod157_A.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod157_B.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod157_C.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod157_D.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c mod158.hs || echo "exit($$?)" 1>&2
+
+mod160::
+	rm -f Mod159_*.$(AUX_O)
+	rm -f Mod159_*.$(AUX_HI)
+	rm -f mod160.$(AUX_O) mod160.$(AUX_HI) mod160
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod159_A.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod159_B.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod159_C.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod159_D.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c mod160.hs || echo "exit($$?)" 1>&2
+
+mod165::
+	rm -f Mod164_*.$(AUX_O)
+	rm -f Mod164_*.$(AUX_HI)
+	rm -f mod165.$(AUX_O) mod165.$(AUX_HI) mod165
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod164_A.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod164_B.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c mod165.hs || echo "exit($$?)" 1>&2
+
+mod166::
+	rm -f Mod164_*.$(AUX_O)
+	rm -f Mod164_*.$(AUX_HI)
+	rm -f mod166.$(AUX_O) mod166.$(AUX_HI) mod166
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod164_A.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod164_B.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c mod166.hs || echo "exit($$?)" 1>&2
+
+mod167::
+	rm -f Mod164_*.$(AUX_O)
+	rm -f Mod164_*.$(AUX_HI)
+	rm -f mod167.$(AUX_O) mod167.$(AUX_HI) mod167
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod164_A.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c Mod164_B.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(AUX_OPTS) -c mod167.hs || echo "exit($$?)" 1>&2
+
diff --git a/testsuite/tests/ghc-regress/module/Mod101_AuxA.hs b/testsuite/tests/module/Mod101_AuxA.hs
index 39ff86868d..39ff86868d 100644
--- a/testsuite/tests/ghc-regress/module/Mod101_AuxA.hs
+++ b/testsuite/tests/module/Mod101_AuxA.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod101_AuxB.hs b/testsuite/tests/module/Mod101_AuxB.hs
index af05c72510..af05c72510 100644
--- a/testsuite/tests/ghc-regress/module/Mod101_AuxB.hs
+++ b/testsuite/tests/module/Mod101_AuxB.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod102_AuxA.hs b/testsuite/tests/module/Mod102_AuxA.hs
index dfa478e542..dfa478e542 100644
--- a/testsuite/tests/ghc-regress/module/Mod102_AuxA.hs
+++ b/testsuite/tests/module/Mod102_AuxA.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod102_AuxB.hs b/testsuite/tests/module/Mod102_AuxB.hs
index 71fc071e78..71fc071e78 100644
--- a/testsuite/tests/ghc-regress/module/Mod102_AuxB.hs
+++ b/testsuite/tests/module/Mod102_AuxB.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod114_Help.hs b/testsuite/tests/module/Mod114_Help.hs
index 46e8fc53ea..46e8fc53ea 100644
--- a/testsuite/tests/ghc-regress/module/Mod114_Help.hs
+++ b/testsuite/tests/module/Mod114_Help.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod115_A.hs b/testsuite/tests/module/Mod115_A.hs
index 77430951c1..77430951c1 100644
--- a/testsuite/tests/ghc-regress/module/Mod115_A.hs
+++ b/testsuite/tests/module/Mod115_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod115_B.hs b/testsuite/tests/module/Mod115_B.hs
index d344c442b6..d344c442b6 100644
--- a/testsuite/tests/ghc-regress/module/Mod115_B.hs
+++ b/testsuite/tests/module/Mod115_B.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod117_A.hs b/testsuite/tests/module/Mod117_A.hs
index 259bb76681..259bb76681 100644
--- a/testsuite/tests/ghc-regress/module/Mod117_A.hs
+++ b/testsuite/tests/module/Mod117_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod117_B.hs b/testsuite/tests/module/Mod117_B.hs
index d1711b1d89..d1711b1d89 100644
--- a/testsuite/tests/ghc-regress/module/Mod117_B.hs
+++ b/testsuite/tests/module/Mod117_B.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod118_A.hs b/testsuite/tests/module/Mod118_A.hs
index b52fbfa7df..b52fbfa7df 100644
--- a/testsuite/tests/ghc-regress/module/Mod118_A.hs
+++ b/testsuite/tests/module/Mod118_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod118_B.hs b/testsuite/tests/module/Mod118_B.hs
index 21852215da..21852215da 100644
--- a/testsuite/tests/ghc-regress/module/Mod118_B.hs
+++ b/testsuite/tests/module/Mod118_B.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod119_A.hs b/testsuite/tests/module/Mod119_A.hs
index b07646cee0..b07646cee0 100644
--- a/testsuite/tests/ghc-regress/module/Mod119_A.hs
+++ b/testsuite/tests/module/Mod119_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod119_B.hs b/testsuite/tests/module/Mod119_B.hs
index 79f1dfb732..79f1dfb732 100644
--- a/testsuite/tests/ghc-regress/module/Mod119_B.hs
+++ b/testsuite/tests/module/Mod119_B.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod120_A.hs b/testsuite/tests/module/Mod120_A.hs
index 2ec3c2be55..2ec3c2be55 100644
--- a/testsuite/tests/ghc-regress/module/Mod120_A.hs
+++ b/testsuite/tests/module/Mod120_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod121_A.hs b/testsuite/tests/module/Mod121_A.hs
index 4648f3da08..4648f3da08 100644
--- a/testsuite/tests/ghc-regress/module/Mod121_A.hs
+++ b/testsuite/tests/module/Mod121_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod122_A.hs b/testsuite/tests/module/Mod122_A.hs
index 93b7076551..93b7076551 100644
--- a/testsuite/tests/ghc-regress/module/Mod122_A.hs
+++ b/testsuite/tests/module/Mod122_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod123_A.hs b/testsuite/tests/module/Mod123_A.hs
index 7ec23e6172..7ec23e6172 100644
--- a/testsuite/tests/ghc-regress/module/Mod123_A.hs
+++ b/testsuite/tests/module/Mod123_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod124_A.hs b/testsuite/tests/module/Mod124_A.hs
index 8e9310bb32..8e9310bb32 100644
--- a/testsuite/tests/ghc-regress/module/Mod124_A.hs
+++ b/testsuite/tests/module/Mod124_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod125_A.hs b/testsuite/tests/module/Mod125_A.hs
index be190cf188..be190cf188 100644
--- a/testsuite/tests/ghc-regress/module/Mod125_A.hs
+++ b/testsuite/tests/module/Mod125_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod126_A.hs b/testsuite/tests/module/Mod126_A.hs
index 8c2d36491c..8c2d36491c 100644
--- a/testsuite/tests/ghc-regress/module/Mod126_A.hs
+++ b/testsuite/tests/module/Mod126_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod127_A.hs b/testsuite/tests/module/Mod127_A.hs
index 605952de63..605952de63 100644
--- a/testsuite/tests/ghc-regress/module/Mod127_A.hs
+++ b/testsuite/tests/module/Mod127_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod128_A.hs b/testsuite/tests/module/Mod128_A.hs
index e2df4aca73..e2df4aca73 100644
--- a/testsuite/tests/ghc-regress/module/Mod128_A.hs
+++ b/testsuite/tests/module/Mod128_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod131_A.hs b/testsuite/tests/module/Mod131_A.hs
index 5206ee4a23..5206ee4a23 100644
--- a/testsuite/tests/ghc-regress/module/Mod131_A.hs
+++ b/testsuite/tests/module/Mod131_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod131_B.hs b/testsuite/tests/module/Mod131_B.hs
index ff7f83e76c..ff7f83e76c 100644
--- a/testsuite/tests/ghc-regress/module/Mod131_B.hs
+++ b/testsuite/tests/module/Mod131_B.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod132_A.hs b/testsuite/tests/module/Mod132_A.hs
index 178eef49ce..178eef49ce 100644
--- a/testsuite/tests/ghc-regress/module/Mod132_A.hs
+++ b/testsuite/tests/module/Mod132_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod132_B.hs b/testsuite/tests/module/Mod132_B.hs
index e7c33b0d51..e7c33b0d51 100644
--- a/testsuite/tests/ghc-regress/module/Mod132_B.hs
+++ b/testsuite/tests/module/Mod132_B.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod136_A.hs b/testsuite/tests/module/Mod136_A.hs
index a69d8ee1a3..a69d8ee1a3 100644
--- a/testsuite/tests/ghc-regress/module/Mod136_A.hs
+++ b/testsuite/tests/module/Mod136_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod137_A.hs b/testsuite/tests/module/Mod137_A.hs
index ba71afce39..ba71afce39 100644
--- a/testsuite/tests/ghc-regress/module/Mod137_A.hs
+++ b/testsuite/tests/module/Mod137_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod138_A.hs b/testsuite/tests/module/Mod138_A.hs
index 44f6645d1b..44f6645d1b 100644
--- a/testsuite/tests/ghc-regress/module/Mod138_A.hs
+++ b/testsuite/tests/module/Mod138_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod139_A.hs b/testsuite/tests/module/Mod139_A.hs
index 9114c897ad..9114c897ad 100644
--- a/testsuite/tests/ghc-regress/module/Mod139_A.hs
+++ b/testsuite/tests/module/Mod139_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod139_B.hs b/testsuite/tests/module/Mod139_B.hs
index 064a3e3034..064a3e3034 100644
--- a/testsuite/tests/ghc-regress/module/Mod139_B.hs
+++ b/testsuite/tests/module/Mod139_B.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod140_A.hs b/testsuite/tests/module/Mod140_A.hs
index 8dfd113b04..8dfd113b04 100644
--- a/testsuite/tests/ghc-regress/module/Mod140_A.hs
+++ b/testsuite/tests/module/Mod140_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod141_A.hs b/testsuite/tests/module/Mod141_A.hs
index fc6c1da430..fc6c1da430 100644
--- a/testsuite/tests/ghc-regress/module/Mod141_A.hs
+++ b/testsuite/tests/module/Mod141_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod142_A.hs b/testsuite/tests/module/Mod142_A.hs
index a153f35f80..a153f35f80 100644
--- a/testsuite/tests/ghc-regress/module/Mod142_A.hs
+++ b/testsuite/tests/module/Mod142_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod143_A.hs b/testsuite/tests/module/Mod143_A.hs
index 37a50468d2..37a50468d2 100644
--- a/testsuite/tests/ghc-regress/module/Mod143_A.hs
+++ b/testsuite/tests/module/Mod143_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod144_A.hs b/testsuite/tests/module/Mod144_A.hs
index 9818cccc64..9818cccc64 100644
--- a/testsuite/tests/ghc-regress/module/Mod144_A.hs
+++ b/testsuite/tests/module/Mod144_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod145_A.hs b/testsuite/tests/module/Mod145_A.hs
index 7f935aa5ea..7f935aa5ea 100644
--- a/testsuite/tests/ghc-regress/module/Mod145_A.hs
+++ b/testsuite/tests/module/Mod145_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod147_A.hs b/testsuite/tests/module/Mod147_A.hs
index 5262ca5ebc..5262ca5ebc 100644
--- a/testsuite/tests/ghc-regress/module/Mod147_A.hs
+++ b/testsuite/tests/module/Mod147_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod157_A.hs b/testsuite/tests/module/Mod157_A.hs
index 7e79595e30..7e79595e30 100644
--- a/testsuite/tests/ghc-regress/module/Mod157_A.hs
+++ b/testsuite/tests/module/Mod157_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod157_B.hs b/testsuite/tests/module/Mod157_B.hs
index 4ef8d2c0c2..4ef8d2c0c2 100644
--- a/testsuite/tests/ghc-regress/module/Mod157_B.hs
+++ b/testsuite/tests/module/Mod157_B.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod157_C.hs b/testsuite/tests/module/Mod157_C.hs
index b770018e21..b770018e21 100644
--- a/testsuite/tests/ghc-regress/module/Mod157_C.hs
+++ b/testsuite/tests/module/Mod157_C.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod157_D.hs b/testsuite/tests/module/Mod157_D.hs
index 1bab0e8ba3..1bab0e8ba3 100644
--- a/testsuite/tests/ghc-regress/module/Mod157_D.hs
+++ b/testsuite/tests/module/Mod157_D.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod159_A.hs b/testsuite/tests/module/Mod159_A.hs
index 396fcd8252..396fcd8252 100644
--- a/testsuite/tests/ghc-regress/module/Mod159_A.hs
+++ b/testsuite/tests/module/Mod159_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod159_B.hs b/testsuite/tests/module/Mod159_B.hs
index 35bfe9a2b8..35bfe9a2b8 100644
--- a/testsuite/tests/ghc-regress/module/Mod159_B.hs
+++ b/testsuite/tests/module/Mod159_B.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod159_C.hs b/testsuite/tests/module/Mod159_C.hs
index ba48933f42..ba48933f42 100644
--- a/testsuite/tests/ghc-regress/module/Mod159_C.hs
+++ b/testsuite/tests/module/Mod159_C.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod159_D.hs b/testsuite/tests/module/Mod159_D.hs
index 8731430ea6..8731430ea6 100644
--- a/testsuite/tests/ghc-regress/module/Mod159_D.hs
+++ b/testsuite/tests/module/Mod159_D.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod162_A.hs b/testsuite/tests/module/Mod162_A.hs
index 68a753ba65..68a753ba65 100644
--- a/testsuite/tests/ghc-regress/module/Mod162_A.hs
+++ b/testsuite/tests/module/Mod162_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod163_A.hs b/testsuite/tests/module/Mod163_A.hs
index cd5c3da328..cd5c3da328 100644
--- a/testsuite/tests/ghc-regress/module/Mod163_A.hs
+++ b/testsuite/tests/module/Mod163_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod164_A.hs b/testsuite/tests/module/Mod164_A.hs
index e2f3d8c27b..e2f3d8c27b 100644
--- a/testsuite/tests/ghc-regress/module/Mod164_A.hs
+++ b/testsuite/tests/module/Mod164_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod164_B.hs b/testsuite/tests/module/Mod164_B.hs
index c26e387ed8..c26e387ed8 100644
--- a/testsuite/tests/ghc-regress/module/Mod164_B.hs
+++ b/testsuite/tests/module/Mod164_B.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod170_A.hs b/testsuite/tests/module/Mod170_A.hs
index 3a5fb66891..3a5fb66891 100644
--- a/testsuite/tests/ghc-regress/module/Mod170_A.hs
+++ b/testsuite/tests/module/Mod170_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod171_A.hs b/testsuite/tests/module/Mod171_A.hs
index 27d296670c..27d296670c 100644
--- a/testsuite/tests/ghc-regress/module/Mod171_A.hs
+++ b/testsuite/tests/module/Mod171_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod171_B.hs b/testsuite/tests/module/Mod171_B.hs
index 57e611a95b..57e611a95b 100644
--- a/testsuite/tests/ghc-regress/module/Mod171_B.hs
+++ b/testsuite/tests/module/Mod171_B.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod172_B.hs b/testsuite/tests/module/Mod172_B.hs
index 863208f50e..863208f50e 100644
--- a/testsuite/tests/ghc-regress/module/Mod172_B.hs
+++ b/testsuite/tests/module/Mod172_B.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod172_C.hs b/testsuite/tests/module/Mod172_C.hs
index 36f086c8ac..36f086c8ac 100644
--- a/testsuite/tests/ghc-regress/module/Mod172_C.hs
+++ b/testsuite/tests/module/Mod172_C.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod173_Aux.hs b/testsuite/tests/module/Mod173_Aux.hs
index 1c947914e1..1c947914e1 100644
--- a/testsuite/tests/ghc-regress/module/Mod173_Aux.hs
+++ b/testsuite/tests/module/Mod173_Aux.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod178_2.hs b/testsuite/tests/module/Mod178_2.hs
index 818095da0f..818095da0f 100644
--- a/testsuite/tests/ghc-regress/module/Mod178_2.hs
+++ b/testsuite/tests/module/Mod178_2.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod179_A.hs b/testsuite/tests/module/Mod179_A.hs
index 3291e72a89..3291e72a89 100644
--- a/testsuite/tests/ghc-regress/module/Mod179_A.hs
+++ b/testsuite/tests/module/Mod179_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod180_A.hs b/testsuite/tests/module/Mod180_A.hs
index 5e11bdb116..5e11bdb116 100644
--- a/testsuite/tests/ghc-regress/module/Mod180_A.hs
+++ b/testsuite/tests/module/Mod180_A.hs
diff --git a/testsuite/tests/ghc-regress/module/Mod180_B.hs b/testsuite/tests/module/Mod180_B.hs
index e3f29fc37e..e3f29fc37e 100644
--- a/testsuite/tests/ghc-regress/module/Mod180_B.hs
+++ b/testsuite/tests/module/Mod180_B.hs
diff --git a/testsuite/tests/ghc-regress/module/T1074.hs b/testsuite/tests/module/T1074.hs
index 6cd647ba6d..6cd647ba6d 100644
--- a/testsuite/tests/ghc-regress/module/T1074.hs
+++ b/testsuite/tests/module/T1074.hs
diff --git a/testsuite/tests/ghc-regress/module/T1074.stderr b/testsuite/tests/module/T1074.stderr
index b368ca119e..b368ca119e 100644
--- a/testsuite/tests/ghc-regress/module/T1074.stderr
+++ b/testsuite/tests/module/T1074.stderr
diff --git a/testsuite/tests/ghc-regress/module/T1074a.hs b/testsuite/tests/module/T1074a.hs
index 0fcbdf600f..0fcbdf600f 100644
--- a/testsuite/tests/ghc-regress/module/T1074a.hs
+++ b/testsuite/tests/module/T1074a.hs
diff --git a/testsuite/tests/ghc-regress/module/T1148.hs b/testsuite/tests/module/T1148.hs
index c6758e580b..c6758e580b 100644
--- a/testsuite/tests/ghc-regress/module/T1148.hs
+++ b/testsuite/tests/module/T1148.hs
diff --git a/testsuite/tests/ghc-regress/module/T2267.hs b/testsuite/tests/module/T2267.hs
index 851997cd9d..851997cd9d 100644
--- a/testsuite/tests/ghc-regress/module/T2267.hs
+++ b/testsuite/tests/module/T2267.hs
diff --git a/testsuite/tests/ghc-regress/module/T3776.hs b/testsuite/tests/module/T3776.hs
index b522cfe0e0..b522cfe0e0 100644
--- a/testsuite/tests/ghc-regress/module/T3776.hs
+++ b/testsuite/tests/module/T3776.hs
diff --git a/testsuite/tests/ghc-regress/module/T414.hs b/testsuite/tests/module/T414.hs
index 5f2d49b315..5f2d49b315 100644
--- a/testsuite/tests/ghc-regress/module/T414.hs
+++ b/testsuite/tests/module/T414.hs
diff --git a/testsuite/tests/ghc-regress/module/T414.stderr b/testsuite/tests/module/T414.stderr
index a5052fb76d..a5052fb76d 100644
--- a/testsuite/tests/ghc-regress/module/T414.stderr
+++ b/testsuite/tests/module/T414.stderr
diff --git a/testsuite/tests/ghc-regress/module/T414a.hs b/testsuite/tests/module/T414a.hs
index 25f5c49d57..25f5c49d57 100644
--- a/testsuite/tests/ghc-regress/module/T414a.hs
+++ b/testsuite/tests/module/T414a.hs
diff --git a/testsuite/tests/ghc-regress/module/T414b.hs b/testsuite/tests/module/T414b.hs
index 29425570e8..29425570e8 100644
--- a/testsuite/tests/ghc-regress/module/T414b.hs
+++ b/testsuite/tests/module/T414b.hs
diff --git a/testsuite/tests/ghc-regress/module/all.T b/testsuite/tests/module/all.T
index b8a5355a97..b8a5355a97 100644
--- a/testsuite/tests/ghc-regress/module/all.T
+++ b/testsuite/tests/module/all.T
diff --git a/testsuite/tests/ghc-regress/module/base01/GHC/Base.hs b/testsuite/tests/module/base01/GHC/Base.hs
index 9149f8544b..9149f8544b 100644
--- a/testsuite/tests/ghc-regress/module/base01/GHC/Base.hs
+++ b/testsuite/tests/module/base01/GHC/Base.hs
diff --git a/testsuite/tests/ghc-regress/module/base01/GHC/Foo.hs b/testsuite/tests/module/base01/GHC/Foo.hs
index c23ef0ceb3..c23ef0ceb3 100644
--- a/testsuite/tests/ghc-regress/module/base01/GHC/Foo.hs
+++ b/testsuite/tests/module/base01/GHC/Foo.hs
diff --git a/testsuite/tests/module/base01/Makefile b/testsuite/tests/module/base01/Makefile
new file mode 100644
index 0000000000..f88e8a3e4d
--- /dev/null
+++ b/testsuite/tests/module/base01/Makefile
@@ -0,0 +1,14 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+clean:
+	rm -f GHC/*.o
+	rm -f GHC/*.hi
+
+base01:
+	rm -f GHC/*.o
+	rm -f GHC/*.hi
+	'$(TEST_HC)' $(TEST_HC_OPTS) -XNoImplicitPrelude -package-name base -c GHC/Base.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -XNoImplicitPrelude -package-name base --make GHC.Foo
+
diff --git a/testsuite/tests/ghc-regress/module/base01/all.T b/testsuite/tests/module/base01/all.T
index d0dbb2960d..d0dbb2960d 100644
--- a/testsuite/tests/ghc-regress/module/base01/all.T
+++ b/testsuite/tests/module/base01/all.T
diff --git a/testsuite/tests/ghc-regress/module/base01/base01.stdout b/testsuite/tests/module/base01/base01.stdout
index 9ab7d2124e..9ab7d2124e 100644
--- a/testsuite/tests/ghc-regress/module/base01/base01.stdout
+++ b/testsuite/tests/module/base01/base01.stdout
diff --git a/testsuite/tests/ghc-regress/module/convert-tests.sh b/testsuite/tests/module/convert-tests.sh
index d4053472ac..d4053472ac 100644
--- a/testsuite/tests/ghc-regress/module/convert-tests.sh
+++ b/testsuite/tests/module/convert-tests.sh
diff --git a/testsuite/tests/ghc-regress/module/mod1.hs b/testsuite/tests/module/mod1.hs
index c8276cda87..c8276cda87 100644
--- a/testsuite/tests/ghc-regress/module/mod1.hs
+++ b/testsuite/tests/module/mod1.hs
diff --git a/testsuite/tests/ghc-regress/module/mod1.stderr b/testsuite/tests/module/mod1.stderr
index e665f8468e..e665f8468e 100644
--- a/testsuite/tests/ghc-regress/module/mod1.stderr
+++ b/testsuite/tests/module/mod1.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod1.stderr-hugs b/testsuite/tests/module/mod1.stderr-hugs
index 0f432cd7d6..0f432cd7d6 100644
--- a/testsuite/tests/ghc-regress/module/mod1.stderr-hugs
+++ b/testsuite/tests/module/mod1.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod10.hs b/testsuite/tests/module/mod10.hs
index 1e8046f05e..1e8046f05e 100644
--- a/testsuite/tests/ghc-regress/module/mod10.hs
+++ b/testsuite/tests/module/mod10.hs
diff --git a/testsuite/tests/ghc-regress/module/mod10.stderr b/testsuite/tests/module/mod10.stderr
index 5369fa0f8b..5369fa0f8b 100644
--- a/testsuite/tests/ghc-regress/module/mod10.stderr
+++ b/testsuite/tests/module/mod10.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod10.stderr-hugs b/testsuite/tests/module/mod10.stderr-hugs
index 2020e4ceab..2020e4ceab 100644
--- a/testsuite/tests/ghc-regress/module/mod10.stderr-hugs
+++ b/testsuite/tests/module/mod10.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod100.hs b/testsuite/tests/module/mod100.hs
index f370d09f87..f370d09f87 100644
--- a/testsuite/tests/ghc-regress/module/mod100.hs
+++ b/testsuite/tests/module/mod100.hs
diff --git a/testsuite/tests/ghc-regress/module/mod101.hs b/testsuite/tests/module/mod101.hs
index ffc393cbff..ffc393cbff 100644
--- a/testsuite/tests/ghc-regress/module/mod101.hs
+++ b/testsuite/tests/module/mod101.hs
diff --git a/testsuite/tests/ghc-regress/module/mod101.stderr b/testsuite/tests/module/mod101.stderr
index 662c38e89a..662c38e89a 100644
--- a/testsuite/tests/ghc-regress/module/mod101.stderr
+++ b/testsuite/tests/module/mod101.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod101.stderr-hugs b/testsuite/tests/module/mod101.stderr-hugs
index 3902e9c3b5..3902e9c3b5 100644
--- a/testsuite/tests/ghc-regress/module/mod101.stderr-hugs
+++ b/testsuite/tests/module/mod101.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod102.hs b/testsuite/tests/module/mod102.hs
index 945276937c..945276937c 100644
--- a/testsuite/tests/ghc-regress/module/mod102.hs
+++ b/testsuite/tests/module/mod102.hs
diff --git a/testsuite/tests/ghc-regress/module/mod102.stderr b/testsuite/tests/module/mod102.stderr
index 60f7b28ab2..60f7b28ab2 100644
--- a/testsuite/tests/ghc-regress/module/mod102.stderr
+++ b/testsuite/tests/module/mod102.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod102.stderr-hugs b/testsuite/tests/module/mod102.stderr-hugs
index 97d80614cf..97d80614cf 100644
--- a/testsuite/tests/ghc-regress/module/mod102.stderr-hugs
+++ b/testsuite/tests/module/mod102.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod103.hs b/testsuite/tests/module/mod103.hs
index ccd6ddfd0d..ccd6ddfd0d 100644
--- a/testsuite/tests/ghc-regress/module/mod103.hs
+++ b/testsuite/tests/module/mod103.hs
diff --git a/testsuite/tests/ghc-regress/module/mod104.hs b/testsuite/tests/module/mod104.hs
index f44289971f..f44289971f 100644
--- a/testsuite/tests/ghc-regress/module/mod104.hs
+++ b/testsuite/tests/module/mod104.hs
diff --git a/testsuite/tests/ghc-regress/module/mod105.hs b/testsuite/tests/module/mod105.hs
index 2ae72ba491..2ae72ba491 100644
--- a/testsuite/tests/ghc-regress/module/mod105.hs
+++ b/testsuite/tests/module/mod105.hs
diff --git a/testsuite/tests/ghc-regress/module/mod106.hs b/testsuite/tests/module/mod106.hs
index a871377d38..a871377d38 100644
--- a/testsuite/tests/ghc-regress/module/mod106.hs
+++ b/testsuite/tests/module/mod106.hs
diff --git a/testsuite/tests/ghc-regress/module/mod107.hs b/testsuite/tests/module/mod107.hs
index cd660d96af..cd660d96af 100644
--- a/testsuite/tests/ghc-regress/module/mod107.hs
+++ b/testsuite/tests/module/mod107.hs
diff --git a/testsuite/tests/ghc-regress/module/mod108.hs b/testsuite/tests/module/mod108.hs
index 2a5ffa4934..2a5ffa4934 100644
--- a/testsuite/tests/ghc-regress/module/mod108.hs
+++ b/testsuite/tests/module/mod108.hs
diff --git a/testsuite/tests/ghc-regress/module/mod109.hs b/testsuite/tests/module/mod109.hs
index e9b6f29171..e9b6f29171 100644
--- a/testsuite/tests/ghc-regress/module/mod109.hs
+++ b/testsuite/tests/module/mod109.hs
diff --git a/testsuite/tests/ghc-regress/module/mod11.hs b/testsuite/tests/module/mod11.hs
index 84353668ba..84353668ba 100644
--- a/testsuite/tests/ghc-regress/module/mod11.hs
+++ b/testsuite/tests/module/mod11.hs
diff --git a/testsuite/tests/ghc-regress/module/mod110.hs b/testsuite/tests/module/mod110.hs
index 897dd12cdb..897dd12cdb 100644
--- a/testsuite/tests/ghc-regress/module/mod110.hs
+++ b/testsuite/tests/module/mod110.hs
diff --git a/testsuite/tests/ghc-regress/module/mod110.stderr b/testsuite/tests/module/mod110.stderr
index c371bc1bd7..c371bc1bd7 100644
--- a/testsuite/tests/ghc-regress/module/mod110.stderr
+++ b/testsuite/tests/module/mod110.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod110.stderr-hugs b/testsuite/tests/module/mod110.stderr-hugs
index ac19a7121a..ac19a7121a 100644
--- a/testsuite/tests/ghc-regress/module/mod110.stderr-hugs
+++ b/testsuite/tests/module/mod110.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod111.hs b/testsuite/tests/module/mod111.hs
index fbc8c0ec31..fbc8c0ec31 100644
--- a/testsuite/tests/ghc-regress/module/mod111.hs
+++ b/testsuite/tests/module/mod111.hs
diff --git a/testsuite/tests/ghc-regress/module/mod112.hs b/testsuite/tests/module/mod112.hs
index 953d930603..953d930603 100644
--- a/testsuite/tests/ghc-regress/module/mod112.hs
+++ b/testsuite/tests/module/mod112.hs
diff --git a/testsuite/tests/ghc-regress/module/mod113.hs b/testsuite/tests/module/mod113.hs
index 89f812f74f..89f812f74f 100644
--- a/testsuite/tests/ghc-regress/module/mod113.hs
+++ b/testsuite/tests/module/mod113.hs
diff --git a/testsuite/tests/ghc-regress/module/mod114.hs b/testsuite/tests/module/mod114.hs
index b739c5d283..b739c5d283 100644
--- a/testsuite/tests/ghc-regress/module/mod114.hs
+++ b/testsuite/tests/module/mod114.hs
diff --git a/testsuite/tests/ghc-regress/module/mod114.stderr b/testsuite/tests/module/mod114.stderr
index be7202ce01..be7202ce01 100644
--- a/testsuite/tests/ghc-regress/module/mod114.stderr
+++ b/testsuite/tests/module/mod114.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod114.stderr-hugs b/testsuite/tests/module/mod114.stderr-hugs
index d71b45dea4..d71b45dea4 100644
--- a/testsuite/tests/ghc-regress/module/mod114.stderr-hugs
+++ b/testsuite/tests/module/mod114.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod115.hs b/testsuite/tests/module/mod115.hs
index f0bf9439a2..f0bf9439a2 100644
--- a/testsuite/tests/ghc-regress/module/mod115.hs
+++ b/testsuite/tests/module/mod115.hs
diff --git a/testsuite/tests/ghc-regress/module/mod116.hs b/testsuite/tests/module/mod116.hs
index 42d668c9c8..42d668c9c8 100644
--- a/testsuite/tests/ghc-regress/module/mod116.hs
+++ b/testsuite/tests/module/mod116.hs
diff --git a/testsuite/tests/ghc-regress/module/mod116.stderr b/testsuite/tests/module/mod116.stderr
index c9fb1ded5f..c9fb1ded5f 100644
--- a/testsuite/tests/ghc-regress/module/mod116.stderr
+++ b/testsuite/tests/module/mod116.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod116.stderr-hugs b/testsuite/tests/module/mod116.stderr-hugs
index 34cb5d7398..34cb5d7398 100644
--- a/testsuite/tests/ghc-regress/module/mod116.stderr-hugs
+++ b/testsuite/tests/module/mod116.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod117.hs b/testsuite/tests/module/mod117.hs
index 83dc056f9c..83dc056f9c 100644
--- a/testsuite/tests/ghc-regress/module/mod117.hs
+++ b/testsuite/tests/module/mod117.hs
diff --git a/testsuite/tests/ghc-regress/module/mod118.hs b/testsuite/tests/module/mod118.hs
index a443b6f123..a443b6f123 100644
--- a/testsuite/tests/ghc-regress/module/mod118.hs
+++ b/testsuite/tests/module/mod118.hs
diff --git a/testsuite/tests/ghc-regress/module/mod119.hs b/testsuite/tests/module/mod119.hs
index d51f5674d9..d51f5674d9 100644
--- a/testsuite/tests/ghc-regress/module/mod119.hs
+++ b/testsuite/tests/module/mod119.hs
diff --git a/testsuite/tests/ghc-regress/module/mod12.hs b/testsuite/tests/module/mod12.hs
index dcbacb6728..dcbacb6728 100644
--- a/testsuite/tests/ghc-regress/module/mod12.hs
+++ b/testsuite/tests/module/mod12.hs
diff --git a/testsuite/tests/ghc-regress/module/mod120.hs b/testsuite/tests/module/mod120.hs
index 04e5039463..04e5039463 100644
--- a/testsuite/tests/ghc-regress/module/mod120.hs
+++ b/testsuite/tests/module/mod120.hs
diff --git a/testsuite/tests/ghc-regress/module/mod120.stderr b/testsuite/tests/module/mod120.stderr
index 0d6181e61a..0d6181e61a 100644
--- a/testsuite/tests/ghc-regress/module/mod120.stderr
+++ b/testsuite/tests/module/mod120.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod120.stderr-hugs b/testsuite/tests/module/mod120.stderr-hugs
index 81d8072d77..81d8072d77 100644
--- a/testsuite/tests/ghc-regress/module/mod120.stderr-hugs
+++ b/testsuite/tests/module/mod120.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod121.hs b/testsuite/tests/module/mod121.hs
index f39427d623..f39427d623 100644
--- a/testsuite/tests/ghc-regress/module/mod121.hs
+++ b/testsuite/tests/module/mod121.hs
diff --git a/testsuite/tests/ghc-regress/module/mod121.stderr b/testsuite/tests/module/mod121.stderr
index 7c2cf2cc9d..7c2cf2cc9d 100644
--- a/testsuite/tests/ghc-regress/module/mod121.stderr
+++ b/testsuite/tests/module/mod121.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod121.stderr-hugs b/testsuite/tests/module/mod121.stderr-hugs
index 9e77b4cb9f..9e77b4cb9f 100644
--- a/testsuite/tests/ghc-regress/module/mod121.stderr-hugs
+++ b/testsuite/tests/module/mod121.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod122.hs b/testsuite/tests/module/mod122.hs
index 84440d1668..84440d1668 100644
--- a/testsuite/tests/ghc-regress/module/mod122.hs
+++ b/testsuite/tests/module/mod122.hs
diff --git a/testsuite/tests/ghc-regress/module/mod122.stderr b/testsuite/tests/module/mod122.stderr
index b65f8e9964..b65f8e9964 100644
--- a/testsuite/tests/ghc-regress/module/mod122.stderr
+++ b/testsuite/tests/module/mod122.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod122.stderr-hugs b/testsuite/tests/module/mod122.stderr-hugs
index 569a2f50aa..569a2f50aa 100644
--- a/testsuite/tests/ghc-regress/module/mod122.stderr-hugs
+++ b/testsuite/tests/module/mod122.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod123.hs b/testsuite/tests/module/mod123.hs
index cdf7402115..cdf7402115 100644
--- a/testsuite/tests/ghc-regress/module/mod123.hs
+++ b/testsuite/tests/module/mod123.hs
diff --git a/testsuite/tests/ghc-regress/module/mod123.stderr b/testsuite/tests/module/mod123.stderr
index 91f75483d3..91f75483d3 100644
--- a/testsuite/tests/ghc-regress/module/mod123.stderr
+++ b/testsuite/tests/module/mod123.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod123.stderr-hugs b/testsuite/tests/module/mod123.stderr-hugs
index 41f158e73c..41f158e73c 100644
--- a/testsuite/tests/ghc-regress/module/mod123.stderr-hugs
+++ b/testsuite/tests/module/mod123.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod124.hs b/testsuite/tests/module/mod124.hs
index 3fd26f0fb9..3fd26f0fb9 100644
--- a/testsuite/tests/ghc-regress/module/mod124.hs
+++ b/testsuite/tests/module/mod124.hs
diff --git a/testsuite/tests/ghc-regress/module/mod124.stderr b/testsuite/tests/module/mod124.stderr
index 22644aa07b..22644aa07b 100644
--- a/testsuite/tests/ghc-regress/module/mod124.stderr
+++ b/testsuite/tests/module/mod124.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod124.stderr-hugs b/testsuite/tests/module/mod124.stderr-hugs
index b6fd8cbb70..b6fd8cbb70 100644
--- a/testsuite/tests/ghc-regress/module/mod124.stderr-hugs
+++ b/testsuite/tests/module/mod124.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod125.hs b/testsuite/tests/module/mod125.hs
index 1ee439ef2c..1ee439ef2c 100644
--- a/testsuite/tests/ghc-regress/module/mod125.hs
+++ b/testsuite/tests/module/mod125.hs
diff --git a/testsuite/tests/ghc-regress/module/mod125.stderr b/testsuite/tests/module/mod125.stderr
index b2f7fa4503..b2f7fa4503 100644
--- a/testsuite/tests/ghc-regress/module/mod125.stderr
+++ b/testsuite/tests/module/mod125.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod125.stderr-hugs b/testsuite/tests/module/mod125.stderr-hugs
index e13bdb1cbc..e13bdb1cbc 100644
--- a/testsuite/tests/ghc-regress/module/mod125.stderr-hugs
+++ b/testsuite/tests/module/mod125.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod126.hs b/testsuite/tests/module/mod126.hs
index b661d385c3..b661d385c3 100644
--- a/testsuite/tests/ghc-regress/module/mod126.hs
+++ b/testsuite/tests/module/mod126.hs
diff --git a/testsuite/tests/ghc-regress/module/mod126.stderr b/testsuite/tests/module/mod126.stderr
index 22243759ca..22243759ca 100644
--- a/testsuite/tests/ghc-regress/module/mod126.stderr
+++ b/testsuite/tests/module/mod126.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod126.stderr-hugs b/testsuite/tests/module/mod126.stderr-hugs
index e9ada3dac5..e9ada3dac5 100644
--- a/testsuite/tests/ghc-regress/module/mod126.stderr-hugs
+++ b/testsuite/tests/module/mod126.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod127.hs b/testsuite/tests/module/mod127.hs
index 4b869f79fd..4b869f79fd 100644
--- a/testsuite/tests/ghc-regress/module/mod127.hs
+++ b/testsuite/tests/module/mod127.hs
diff --git a/testsuite/tests/ghc-regress/module/mod127.stderr b/testsuite/tests/module/mod127.stderr
index 5ffb1b71b6..5ffb1b71b6 100644
--- a/testsuite/tests/ghc-regress/module/mod127.stderr
+++ b/testsuite/tests/module/mod127.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod127.stderr-hugs b/testsuite/tests/module/mod127.stderr-hugs
index c2d17c3ee3..c2d17c3ee3 100644
--- a/testsuite/tests/ghc-regress/module/mod127.stderr-hugs
+++ b/testsuite/tests/module/mod127.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod128.hs b/testsuite/tests/module/mod128.hs
index 5d96e0f464..5d96e0f464 100644
--- a/testsuite/tests/ghc-regress/module/mod128.hs
+++ b/testsuite/tests/module/mod128.hs
diff --git a/testsuite/tests/ghc-regress/module/mod128.stderr-ghc b/testsuite/tests/module/mod128.stderr-ghc
index 18c7864048..18c7864048 100644
--- a/testsuite/tests/ghc-regress/module/mod128.stderr-ghc
+++ b/testsuite/tests/module/mod128.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/module/mod129.hs b/testsuite/tests/module/mod129.hs
index 4229e9e88a..4229e9e88a 100644
--- a/testsuite/tests/ghc-regress/module/mod129.hs
+++ b/testsuite/tests/module/mod129.hs
diff --git a/testsuite/tests/ghc-regress/module/mod13.hs b/testsuite/tests/module/mod13.hs
index d7aeb7db94..d7aeb7db94 100644
--- a/testsuite/tests/ghc-regress/module/mod13.hs
+++ b/testsuite/tests/module/mod13.hs
diff --git a/testsuite/tests/ghc-regress/module/mod130.hs b/testsuite/tests/module/mod130.hs
index 97dbacbfd2..97dbacbfd2 100644
--- a/testsuite/tests/ghc-regress/module/mod130.hs
+++ b/testsuite/tests/module/mod130.hs
diff --git a/testsuite/tests/ghc-regress/module/mod130.stderr b/testsuite/tests/module/mod130.stderr
index 27d3f8470e..27d3f8470e 100644
--- a/testsuite/tests/ghc-regress/module/mod130.stderr
+++ b/testsuite/tests/module/mod130.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod130.stderr-hugs b/testsuite/tests/module/mod130.stderr-hugs
index fcaad49433..fcaad49433 100644
--- a/testsuite/tests/ghc-regress/module/mod130.stderr-hugs
+++ b/testsuite/tests/module/mod130.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod131.hs b/testsuite/tests/module/mod131.hs
index 64f7dd1eac..64f7dd1eac 100644
--- a/testsuite/tests/ghc-regress/module/mod131.hs
+++ b/testsuite/tests/module/mod131.hs
diff --git a/testsuite/tests/ghc-regress/module/mod131.stderr b/testsuite/tests/module/mod131.stderr
index 5dcc5efab8..5dcc5efab8 100644
--- a/testsuite/tests/ghc-regress/module/mod131.stderr
+++ b/testsuite/tests/module/mod131.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod131.stderr-hugs b/testsuite/tests/module/mod131.stderr-hugs
index c27a6e428f..c27a6e428f 100644
--- a/testsuite/tests/ghc-regress/module/mod131.stderr-hugs
+++ b/testsuite/tests/module/mod131.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod132.hs b/testsuite/tests/module/mod132.hs
index cecbb9d684..cecbb9d684 100644
--- a/testsuite/tests/ghc-regress/module/mod132.hs
+++ b/testsuite/tests/module/mod132.hs
diff --git a/testsuite/tests/ghc-regress/module/mod132.stderr b/testsuite/tests/module/mod132.stderr
index 8dbf51014c..8dbf51014c 100644
--- a/testsuite/tests/ghc-regress/module/mod132.stderr
+++ b/testsuite/tests/module/mod132.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod132.stderr-hugs b/testsuite/tests/module/mod132.stderr-hugs
index 0bf2ce0a96..0bf2ce0a96 100644
--- a/testsuite/tests/ghc-regress/module/mod132.stderr-hugs
+++ b/testsuite/tests/module/mod132.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod133.hs b/testsuite/tests/module/mod133.hs
index be05057ac9..be05057ac9 100644
--- a/testsuite/tests/ghc-regress/module/mod133.hs
+++ b/testsuite/tests/module/mod133.hs
diff --git a/testsuite/tests/ghc-regress/module/mod134.hs b/testsuite/tests/module/mod134.hs
index aae30f55e0..aae30f55e0 100644
--- a/testsuite/tests/ghc-regress/module/mod134.hs
+++ b/testsuite/tests/module/mod134.hs
diff --git a/testsuite/tests/ghc-regress/module/mod134.stderr b/testsuite/tests/module/mod134.stderr
index ed8382db63..ed8382db63 100644
--- a/testsuite/tests/ghc-regress/module/mod134.stderr
+++ b/testsuite/tests/module/mod134.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod134.stderr-hugs b/testsuite/tests/module/mod134.stderr-hugs
index b39457eedc..b39457eedc 100644
--- a/testsuite/tests/ghc-regress/module/mod134.stderr-hugs
+++ b/testsuite/tests/module/mod134.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod135.hs b/testsuite/tests/module/mod135.hs
index 3905274fec..3905274fec 100644
--- a/testsuite/tests/ghc-regress/module/mod135.hs
+++ b/testsuite/tests/module/mod135.hs
diff --git a/testsuite/tests/ghc-regress/module/mod135.stderr b/testsuite/tests/module/mod135.stderr
index a08f93cb67..a08f93cb67 100644
--- a/testsuite/tests/ghc-regress/module/mod135.stderr
+++ b/testsuite/tests/module/mod135.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod135.stderr-hugs b/testsuite/tests/module/mod135.stderr-hugs
index 334aa7bdcf..334aa7bdcf 100644
--- a/testsuite/tests/ghc-regress/module/mod135.stderr-hugs
+++ b/testsuite/tests/module/mod135.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod136.hs b/testsuite/tests/module/mod136.hs
index 1729eea789..1729eea789 100644
--- a/testsuite/tests/ghc-regress/module/mod136.hs
+++ b/testsuite/tests/module/mod136.hs
diff --git a/testsuite/tests/ghc-regress/module/mod136.stderr b/testsuite/tests/module/mod136.stderr
index 242d20b3de..242d20b3de 100644
--- a/testsuite/tests/ghc-regress/module/mod136.stderr
+++ b/testsuite/tests/module/mod136.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod136.stderr-hugs b/testsuite/tests/module/mod136.stderr-hugs
index 5333800eea..5333800eea 100644
--- a/testsuite/tests/ghc-regress/module/mod136.stderr-hugs
+++ b/testsuite/tests/module/mod136.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod137.hs b/testsuite/tests/module/mod137.hs
index 0541e54509..0541e54509 100644
--- a/testsuite/tests/ghc-regress/module/mod137.hs
+++ b/testsuite/tests/module/mod137.hs
diff --git a/testsuite/tests/ghc-regress/module/mod138.hs b/testsuite/tests/module/mod138.hs
index c10487d476..c10487d476 100644
--- a/testsuite/tests/ghc-regress/module/mod138.hs
+++ b/testsuite/tests/module/mod138.hs
diff --git a/testsuite/tests/ghc-regress/module/mod138.stderr b/testsuite/tests/module/mod138.stderr
index 2e8a5190d6..2e8a5190d6 100644
--- a/testsuite/tests/ghc-regress/module/mod138.stderr
+++ b/testsuite/tests/module/mod138.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod138.stderr-hugs b/testsuite/tests/module/mod138.stderr-hugs
index 7d1daa0d36..7d1daa0d36 100644
--- a/testsuite/tests/ghc-regress/module/mod138.stderr-hugs
+++ b/testsuite/tests/module/mod138.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod139.hs b/testsuite/tests/module/mod139.hs
index ae91e2b8ca..ae91e2b8ca 100644
--- a/testsuite/tests/ghc-regress/module/mod139.hs
+++ b/testsuite/tests/module/mod139.hs
diff --git a/testsuite/tests/ghc-regress/module/mod14.hs b/testsuite/tests/module/mod14.hs
index b88a4a6988..b88a4a6988 100644
--- a/testsuite/tests/ghc-regress/module/mod14.hs
+++ b/testsuite/tests/module/mod14.hs
diff --git a/testsuite/tests/ghc-regress/module/mod14.stderr-ghc b/testsuite/tests/module/mod14.stderr-ghc
index be838c3886..be838c3886 100644
--- a/testsuite/tests/ghc-regress/module/mod14.stderr-ghc
+++ b/testsuite/tests/module/mod14.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/module/mod140.hs b/testsuite/tests/module/mod140.hs
index e40de96e39..e40de96e39 100644
--- a/testsuite/tests/ghc-regress/module/mod140.hs
+++ b/testsuite/tests/module/mod140.hs
diff --git a/testsuite/tests/ghc-regress/module/mod141.hs b/testsuite/tests/module/mod141.hs
index f8a65e5a8c..f8a65e5a8c 100644
--- a/testsuite/tests/ghc-regress/module/mod141.hs
+++ b/testsuite/tests/module/mod141.hs
diff --git a/testsuite/tests/ghc-regress/module/mod142.hs b/testsuite/tests/module/mod142.hs
index 3be36f3fd2..3be36f3fd2 100644
--- a/testsuite/tests/ghc-regress/module/mod142.hs
+++ b/testsuite/tests/module/mod142.hs
diff --git a/testsuite/tests/ghc-regress/module/mod142.stderr b/testsuite/tests/module/mod142.stderr
index c1c4023e1e..c1c4023e1e 100644
--- a/testsuite/tests/ghc-regress/module/mod142.stderr
+++ b/testsuite/tests/module/mod142.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod142.stderr-hugs b/testsuite/tests/module/mod142.stderr-hugs
index 1cedd94837..1cedd94837 100644
--- a/testsuite/tests/ghc-regress/module/mod142.stderr-hugs
+++ b/testsuite/tests/module/mod142.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod143.hs b/testsuite/tests/module/mod143.hs
index 92c3d438d7..92c3d438d7 100644
--- a/testsuite/tests/ghc-regress/module/mod143.hs
+++ b/testsuite/tests/module/mod143.hs
diff --git a/testsuite/tests/ghc-regress/module/mod143.stderr b/testsuite/tests/module/mod143.stderr
index e74bc238e1..e74bc238e1 100644
--- a/testsuite/tests/ghc-regress/module/mod143.stderr
+++ b/testsuite/tests/module/mod143.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod143.stderr-hugs b/testsuite/tests/module/mod143.stderr-hugs
index c728b9c04d..c728b9c04d 100644
--- a/testsuite/tests/ghc-regress/module/mod143.stderr-hugs
+++ b/testsuite/tests/module/mod143.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod144.hs b/testsuite/tests/module/mod144.hs
index d808f63f91..d808f63f91 100644
--- a/testsuite/tests/ghc-regress/module/mod144.hs
+++ b/testsuite/tests/module/mod144.hs
diff --git a/testsuite/tests/ghc-regress/module/mod144.stderr b/testsuite/tests/module/mod144.stderr
index e97acdc528..e97acdc528 100644
--- a/testsuite/tests/ghc-regress/module/mod144.stderr
+++ b/testsuite/tests/module/mod144.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod144.stderr-hugs b/testsuite/tests/module/mod144.stderr-hugs
index 3b0c8240e1..3b0c8240e1 100644
--- a/testsuite/tests/ghc-regress/module/mod144.stderr-hugs
+++ b/testsuite/tests/module/mod144.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod145.hs b/testsuite/tests/module/mod145.hs
index 63c5b72a73..63c5b72a73 100644
--- a/testsuite/tests/ghc-regress/module/mod145.hs
+++ b/testsuite/tests/module/mod145.hs
diff --git a/testsuite/tests/ghc-regress/module/mod145.stderr b/testsuite/tests/module/mod145.stderr
index 47cb0e61cb..47cb0e61cb 100644
--- a/testsuite/tests/ghc-regress/module/mod145.stderr
+++ b/testsuite/tests/module/mod145.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod145.stderr-hugs b/testsuite/tests/module/mod145.stderr-hugs
index a00c9b605d..a00c9b605d 100644
--- a/testsuite/tests/ghc-regress/module/mod145.stderr-hugs
+++ b/testsuite/tests/module/mod145.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod146.hs b/testsuite/tests/module/mod146.hs
index b87f6d51cb..b87f6d51cb 100644
--- a/testsuite/tests/ghc-regress/module/mod146.hs
+++ b/testsuite/tests/module/mod146.hs
diff --git a/testsuite/tests/ghc-regress/module/mod146.stderr b/testsuite/tests/module/mod146.stderr
index d43f33feb3..d43f33feb3 100644
--- a/testsuite/tests/ghc-regress/module/mod146.stderr
+++ b/testsuite/tests/module/mod146.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod146.stderr-hugs b/testsuite/tests/module/mod146.stderr-hugs
index ba17693f61..ba17693f61 100644
--- a/testsuite/tests/ghc-regress/module/mod146.stderr-hugs
+++ b/testsuite/tests/module/mod146.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod147.hs b/testsuite/tests/module/mod147.hs
index 0743c4cb51..0743c4cb51 100644
--- a/testsuite/tests/ghc-regress/module/mod147.hs
+++ b/testsuite/tests/module/mod147.hs
diff --git a/testsuite/tests/ghc-regress/module/mod147.stderr b/testsuite/tests/module/mod147.stderr
index b3bbf76612..b3bbf76612 100644
--- a/testsuite/tests/ghc-regress/module/mod147.stderr
+++ b/testsuite/tests/module/mod147.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod147.stderr-hugs b/testsuite/tests/module/mod147.stderr-hugs
index 4a469a194f..4a469a194f 100644
--- a/testsuite/tests/ghc-regress/module/mod147.stderr-hugs
+++ b/testsuite/tests/module/mod147.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod148.hs b/testsuite/tests/module/mod148.hs
index 77ccfef6d1..77ccfef6d1 100644
--- a/testsuite/tests/ghc-regress/module/mod148.hs
+++ b/testsuite/tests/module/mod148.hs
diff --git a/testsuite/tests/ghc-regress/module/mod149.hs b/testsuite/tests/module/mod149.hs
index e8187e1ae3..e8187e1ae3 100644
--- a/testsuite/tests/ghc-regress/module/mod149.hs
+++ b/testsuite/tests/module/mod149.hs
diff --git a/testsuite/tests/ghc-regress/module/mod15.hs b/testsuite/tests/module/mod15.hs
index c2de445c50..c2de445c50 100644
--- a/testsuite/tests/ghc-regress/module/mod15.hs
+++ b/testsuite/tests/module/mod15.hs
diff --git a/testsuite/tests/ghc-regress/module/mod150.hs b/testsuite/tests/module/mod150.hs
index 92bb4f1e67..92bb4f1e67 100644
--- a/testsuite/tests/ghc-regress/module/mod150.hs
+++ b/testsuite/tests/module/mod150.hs
diff --git a/testsuite/tests/ghc-regress/module/mod150.stderr b/testsuite/tests/module/mod150.stderr
index 7c5fca1eb4..7c5fca1eb4 100644
--- a/testsuite/tests/ghc-regress/module/mod150.stderr
+++ b/testsuite/tests/module/mod150.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod150.stderr-hugs b/testsuite/tests/module/mod150.stderr-hugs
index 8693c13d38..8693c13d38 100644
--- a/testsuite/tests/ghc-regress/module/mod150.stderr-hugs
+++ b/testsuite/tests/module/mod150.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod151.hs b/testsuite/tests/module/mod151.hs
index 3bbeda508d..3bbeda508d 100644
--- a/testsuite/tests/ghc-regress/module/mod151.hs
+++ b/testsuite/tests/module/mod151.hs
diff --git a/testsuite/tests/ghc-regress/module/mod151.stderr b/testsuite/tests/module/mod151.stderr
index edcea97e44..edcea97e44 100644
--- a/testsuite/tests/ghc-regress/module/mod151.stderr
+++ b/testsuite/tests/module/mod151.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod151.stderr-hugs b/testsuite/tests/module/mod151.stderr-hugs
index 93e6333df0..93e6333df0 100644
--- a/testsuite/tests/ghc-regress/module/mod151.stderr-hugs
+++ b/testsuite/tests/module/mod151.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod152.hs b/testsuite/tests/module/mod152.hs
index 8f9911b1e5..8f9911b1e5 100644
--- a/testsuite/tests/ghc-regress/module/mod152.hs
+++ b/testsuite/tests/module/mod152.hs
diff --git a/testsuite/tests/ghc-regress/module/mod152.stderr b/testsuite/tests/module/mod152.stderr
index 3d67ecbd62..3d67ecbd62 100644
--- a/testsuite/tests/ghc-regress/module/mod152.stderr
+++ b/testsuite/tests/module/mod152.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod152.stderr-hugs b/testsuite/tests/module/mod152.stderr-hugs
index c0fa28bb27..c0fa28bb27 100644
--- a/testsuite/tests/ghc-regress/module/mod152.stderr-hugs
+++ b/testsuite/tests/module/mod152.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod153.hs b/testsuite/tests/module/mod153.hs
index ee50c89bda..ee50c89bda 100644
--- a/testsuite/tests/ghc-regress/module/mod153.hs
+++ b/testsuite/tests/module/mod153.hs
diff --git a/testsuite/tests/ghc-regress/module/mod153.stderr b/testsuite/tests/module/mod153.stderr
index 5a35ceb51a..5a35ceb51a 100644
--- a/testsuite/tests/ghc-regress/module/mod153.stderr
+++ b/testsuite/tests/module/mod153.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod153.stderr-hugs b/testsuite/tests/module/mod153.stderr-hugs
index 7d07f0b360..7d07f0b360 100644
--- a/testsuite/tests/ghc-regress/module/mod153.stderr-hugs
+++ b/testsuite/tests/module/mod153.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod154.hs b/testsuite/tests/module/mod154.hs
index 6155b830f0..6155b830f0 100644
--- a/testsuite/tests/ghc-regress/module/mod154.hs
+++ b/testsuite/tests/module/mod154.hs
diff --git a/testsuite/tests/ghc-regress/module/mod155.hs b/testsuite/tests/module/mod155.hs
index 4b94525439..4b94525439 100644
--- a/testsuite/tests/ghc-regress/module/mod155.hs
+++ b/testsuite/tests/module/mod155.hs
diff --git a/testsuite/tests/ghc-regress/module/mod155.stderr b/testsuite/tests/module/mod155.stderr
index a6a732c5b8..a6a732c5b8 100644
--- a/testsuite/tests/ghc-regress/module/mod155.stderr
+++ b/testsuite/tests/module/mod155.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod155.stderr-hugs b/testsuite/tests/module/mod155.stderr-hugs
index 0f6025a369..0f6025a369 100644
--- a/testsuite/tests/ghc-regress/module/mod155.stderr-hugs
+++ b/testsuite/tests/module/mod155.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod156.hs b/testsuite/tests/module/mod156.hs
index 20c2884425..20c2884425 100644
--- a/testsuite/tests/ghc-regress/module/mod156.hs
+++ b/testsuite/tests/module/mod156.hs
diff --git a/testsuite/tests/ghc-regress/module/mod157.hs b/testsuite/tests/module/mod157.hs
index 582e1a708b..582e1a708b 100644
--- a/testsuite/tests/ghc-regress/module/mod157.hs
+++ b/testsuite/tests/module/mod157.hs
diff --git a/testsuite/tests/ghc-regress/module/mod158.hs b/testsuite/tests/module/mod158.hs
index 611ec04f03..611ec04f03 100644
--- a/testsuite/tests/ghc-regress/module/mod158.hs
+++ b/testsuite/tests/module/mod158.hs
diff --git a/testsuite/tests/ghc-regress/module/mod158.stderr b/testsuite/tests/module/mod158.stderr
index 7f6c7d7e85..7f6c7d7e85 100644
--- a/testsuite/tests/ghc-regress/module/mod158.stderr
+++ b/testsuite/tests/module/mod158.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod158.stderr-hugs b/testsuite/tests/module/mod158.stderr-hugs
index d08ca3aa14..d08ca3aa14 100644
--- a/testsuite/tests/ghc-regress/module/mod158.stderr-hugs
+++ b/testsuite/tests/module/mod158.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod159.hs b/testsuite/tests/module/mod159.hs
index f858d03f30..f858d03f30 100644
--- a/testsuite/tests/ghc-regress/module/mod159.hs
+++ b/testsuite/tests/module/mod159.hs
diff --git a/testsuite/tests/ghc-regress/module/mod16.hs b/testsuite/tests/module/mod16.hs
index 3b0e6d7bd9..3b0e6d7bd9 100644
--- a/testsuite/tests/ghc-regress/module/mod16.hs
+++ b/testsuite/tests/module/mod16.hs
diff --git a/testsuite/tests/ghc-regress/module/mod160.hs b/testsuite/tests/module/mod160.hs
index a279471c11..a279471c11 100644
--- a/testsuite/tests/ghc-regress/module/mod160.hs
+++ b/testsuite/tests/module/mod160.hs
diff --git a/testsuite/tests/ghc-regress/module/mod160.stderr b/testsuite/tests/module/mod160.stderr
index c2dbd5647a..c2dbd5647a 100644
--- a/testsuite/tests/ghc-regress/module/mod160.stderr
+++ b/testsuite/tests/module/mod160.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod160.stderr-hugs b/testsuite/tests/module/mod160.stderr-hugs
index 5157fb6630..5157fb6630 100644
--- a/testsuite/tests/ghc-regress/module/mod160.stderr-hugs
+++ b/testsuite/tests/module/mod160.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod161.hs b/testsuite/tests/module/mod161.hs
index 8e900ad72b..8e900ad72b 100644
--- a/testsuite/tests/ghc-regress/module/mod161.hs
+++ b/testsuite/tests/module/mod161.hs
diff --git a/testsuite/tests/ghc-regress/module/mod161.stderr b/testsuite/tests/module/mod161.stderr
index 1272093eaa..1272093eaa 100644
--- a/testsuite/tests/ghc-regress/module/mod161.stderr
+++ b/testsuite/tests/module/mod161.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod161.stderr-hugs b/testsuite/tests/module/mod161.stderr-hugs
index 0ea61db9c1..0ea61db9c1 100644
--- a/testsuite/tests/ghc-regress/module/mod161.stderr-hugs
+++ b/testsuite/tests/module/mod161.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod162.hs b/testsuite/tests/module/mod162.hs
index 8164ac5354..8164ac5354 100644
--- a/testsuite/tests/ghc-regress/module/mod162.hs
+++ b/testsuite/tests/module/mod162.hs
diff --git a/testsuite/tests/ghc-regress/module/mod163.hs b/testsuite/tests/module/mod163.hs
index f095e1af0c..f095e1af0c 100644
--- a/testsuite/tests/ghc-regress/module/mod163.hs
+++ b/testsuite/tests/module/mod163.hs
diff --git a/testsuite/tests/ghc-regress/module/mod164.hs b/testsuite/tests/module/mod164.hs
index f472bfdddc..f472bfdddc 100644
--- a/testsuite/tests/ghc-regress/module/mod164.hs
+++ b/testsuite/tests/module/mod164.hs
diff --git a/testsuite/tests/ghc-regress/module/mod164.stderr b/testsuite/tests/module/mod164.stderr
index 7a014187ac..7a014187ac 100644
--- a/testsuite/tests/ghc-regress/module/mod164.stderr
+++ b/testsuite/tests/module/mod164.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod164.stderr-hugs b/testsuite/tests/module/mod164.stderr-hugs
index d219a28f02..d219a28f02 100644
--- a/testsuite/tests/ghc-regress/module/mod164.stderr-hugs
+++ b/testsuite/tests/module/mod164.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod165.hs b/testsuite/tests/module/mod165.hs
index 847280ffaf..847280ffaf 100644
--- a/testsuite/tests/ghc-regress/module/mod165.hs
+++ b/testsuite/tests/module/mod165.hs
diff --git a/testsuite/tests/ghc-regress/module/mod165.stderr b/testsuite/tests/module/mod165.stderr
index 8a813594a9..8a813594a9 100644
--- a/testsuite/tests/ghc-regress/module/mod165.stderr
+++ b/testsuite/tests/module/mod165.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod165.stderr-hugs b/testsuite/tests/module/mod165.stderr-hugs
index c545d2501f..c545d2501f 100644
--- a/testsuite/tests/ghc-regress/module/mod165.stderr-hugs
+++ b/testsuite/tests/module/mod165.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod166.hs b/testsuite/tests/module/mod166.hs
index 86e32cd489..86e32cd489 100644
--- a/testsuite/tests/ghc-regress/module/mod166.hs
+++ b/testsuite/tests/module/mod166.hs
diff --git a/testsuite/tests/ghc-regress/module/mod167.hs b/testsuite/tests/module/mod167.hs
index 520d5b1383..520d5b1383 100644
--- a/testsuite/tests/ghc-regress/module/mod167.hs
+++ b/testsuite/tests/module/mod167.hs
diff --git a/testsuite/tests/ghc-regress/module/mod168.hs b/testsuite/tests/module/mod168.hs
index 1c0deaa579..1c0deaa579 100644
--- a/testsuite/tests/ghc-regress/module/mod168.hs
+++ b/testsuite/tests/module/mod168.hs
diff --git a/testsuite/tests/ghc-regress/module/mod169.hs b/testsuite/tests/module/mod169.hs
index 521da07a39..521da07a39 100644
--- a/testsuite/tests/ghc-regress/module/mod169.hs
+++ b/testsuite/tests/module/mod169.hs
diff --git a/testsuite/tests/ghc-regress/module/mod17.hs b/testsuite/tests/module/mod17.hs
index c3f219edde..c3f219edde 100644
--- a/testsuite/tests/ghc-regress/module/mod17.hs
+++ b/testsuite/tests/module/mod17.hs
diff --git a/testsuite/tests/ghc-regress/module/mod17.stderr b/testsuite/tests/module/mod17.stderr
index 1192637967..1192637967 100644
--- a/testsuite/tests/ghc-regress/module/mod17.stderr
+++ b/testsuite/tests/module/mod17.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod17.stderr-hugs b/testsuite/tests/module/mod17.stderr-hugs
index 74ee84bb82..74ee84bb82 100644
--- a/testsuite/tests/ghc-regress/module/mod17.stderr-hugs
+++ b/testsuite/tests/module/mod17.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod170.hs b/testsuite/tests/module/mod170.hs
index 2a53820645..2a53820645 100644
--- a/testsuite/tests/ghc-regress/module/mod170.hs
+++ b/testsuite/tests/module/mod170.hs
diff --git a/testsuite/tests/ghc-regress/module/mod171.hs b/testsuite/tests/module/mod171.hs
index a61e886784..a61e886784 100644
--- a/testsuite/tests/ghc-regress/module/mod171.hs
+++ b/testsuite/tests/module/mod171.hs
diff --git a/testsuite/tests/ghc-regress/module/mod172.hs b/testsuite/tests/module/mod172.hs
index 20af846d72..20af846d72 100644
--- a/testsuite/tests/ghc-regress/module/mod172.hs
+++ b/testsuite/tests/module/mod172.hs
diff --git a/testsuite/tests/ghc-regress/module/mod173.hs b/testsuite/tests/module/mod173.hs
index a7e185bcf6..a7e185bcf6 100644
--- a/testsuite/tests/ghc-regress/module/mod173.hs
+++ b/testsuite/tests/module/mod173.hs
diff --git a/testsuite/tests/ghc-regress/module/mod174.hs b/testsuite/tests/module/mod174.hs
index 8e8149db7a..8e8149db7a 100644
--- a/testsuite/tests/ghc-regress/module/mod174.hs
+++ b/testsuite/tests/module/mod174.hs
diff --git a/testsuite/tests/ghc-regress/module/mod174.stderr b/testsuite/tests/module/mod174.stderr
index 6ef2e753d0..6ef2e753d0 100644
--- a/testsuite/tests/ghc-regress/module/mod174.stderr
+++ b/testsuite/tests/module/mod174.stderr
diff --git a/testsuite/tests/module/mod175/Makefile b/testsuite/tests/module/mod175/Makefile
new file mode 100644
index 0000000000..65fb2758d8
--- /dev/null
+++ b/testsuite/tests/module/mod175/Makefile
@@ -0,0 +1,19 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+clean:
+	rm -f *.o
+	rm -f *.hi
+	rm -f test test2
+
+# Test for trac bug #437 (Test2 needs to be recompiled in the second GHC
+# invocation as the main-is flag now applies to it).
+
+mod175:
+	$(MAKE) clean
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -main-is Test.main  Test.hs  -o test
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -main-is Test2.main Test2.hs -o test2
+	./test
+	./test2
+
diff --git a/testsuite/tests/ghc-regress/module/mod175/Test.hs b/testsuite/tests/module/mod175/Test.hs
index bc280d86a6..bc280d86a6 100644
--- a/testsuite/tests/ghc-regress/module/mod175/Test.hs
+++ b/testsuite/tests/module/mod175/Test.hs
diff --git a/testsuite/tests/ghc-regress/module/mod175/Test2.hs b/testsuite/tests/module/mod175/Test2.hs
index 08d75ddf6e..08d75ddf6e 100644
--- a/testsuite/tests/ghc-regress/module/mod175/Test2.hs
+++ b/testsuite/tests/module/mod175/Test2.hs
diff --git a/testsuite/tests/ghc-regress/module/mod175/all.T b/testsuite/tests/module/mod175/all.T
index 8edbf0ae0f..8edbf0ae0f 100644
--- a/testsuite/tests/ghc-regress/module/mod175/all.T
+++ b/testsuite/tests/module/mod175/all.T
diff --git a/testsuite/tests/ghc-regress/module/mod175/mod175.stdout b/testsuite/tests/module/mod175/mod175.stdout
index a69871173d..a69871173d 100644
--- a/testsuite/tests/ghc-regress/module/mod175/mod175.stdout
+++ b/testsuite/tests/module/mod175/mod175.stdout
diff --git a/testsuite/tests/ghc-regress/module/mod176.hs b/testsuite/tests/module/mod176.hs
index 250711345c..250711345c 100644
--- a/testsuite/tests/ghc-regress/module/mod176.hs
+++ b/testsuite/tests/module/mod176.hs
diff --git a/testsuite/tests/ghc-regress/module/mod176.stderr b/testsuite/tests/module/mod176.stderr
index 7301324a91..7301324a91 100644
--- a/testsuite/tests/ghc-regress/module/mod176.stderr
+++ b/testsuite/tests/module/mod176.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod177.hs b/testsuite/tests/module/mod177.hs
index 23fdd73b45..23fdd73b45 100644
--- a/testsuite/tests/ghc-regress/module/mod177.hs
+++ b/testsuite/tests/module/mod177.hs
diff --git a/testsuite/tests/ghc-regress/module/mod177.stderr b/testsuite/tests/module/mod177.stderr
index 1dc7c5c6ae..1dc7c5c6ae 100644
--- a/testsuite/tests/ghc-regress/module/mod177.stderr
+++ b/testsuite/tests/module/mod177.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod178.hs b/testsuite/tests/module/mod178.hs
index 00ec81d369..00ec81d369 100644
--- a/testsuite/tests/ghc-regress/module/mod178.hs
+++ b/testsuite/tests/module/mod178.hs
diff --git a/testsuite/tests/ghc-regress/module/mod178.stderr b/testsuite/tests/module/mod178.stderr
index 3edd9a4066..3edd9a4066 100644
--- a/testsuite/tests/ghc-regress/module/mod178.stderr
+++ b/testsuite/tests/module/mod178.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod179.hs b/testsuite/tests/module/mod179.hs
index 3ff71a07a4..3ff71a07a4 100644
--- a/testsuite/tests/ghc-regress/module/mod179.hs
+++ b/testsuite/tests/module/mod179.hs
diff --git a/testsuite/tests/ghc-regress/module/mod179.stdout b/testsuite/tests/module/mod179.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/module/mod179.stdout
+++ b/testsuite/tests/module/mod179.stdout
diff --git a/testsuite/tests/ghc-regress/module/mod18.hs b/testsuite/tests/module/mod18.hs
index cfbcdbf62a..cfbcdbf62a 100644
--- a/testsuite/tests/ghc-regress/module/mod18.hs
+++ b/testsuite/tests/module/mod18.hs
diff --git a/testsuite/tests/ghc-regress/module/mod18.stderr b/testsuite/tests/module/mod18.stderr
index 2b9a800bc6..2b9a800bc6 100644
--- a/testsuite/tests/ghc-regress/module/mod18.stderr
+++ b/testsuite/tests/module/mod18.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod18.stderr-hugs b/testsuite/tests/module/mod18.stderr-hugs
index 50fff9d5e2..50fff9d5e2 100644
--- a/testsuite/tests/ghc-regress/module/mod18.stderr-hugs
+++ b/testsuite/tests/module/mod18.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod180.hs b/testsuite/tests/module/mod180.hs
index 68e043bc50..68e043bc50 100644
--- a/testsuite/tests/ghc-regress/module/mod180.hs
+++ b/testsuite/tests/module/mod180.hs
diff --git a/testsuite/tests/ghc-regress/module/mod180.stderr b/testsuite/tests/module/mod180.stderr
index 2790d92a33..2790d92a33 100644
--- a/testsuite/tests/ghc-regress/module/mod180.stderr
+++ b/testsuite/tests/module/mod180.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod19.hs b/testsuite/tests/module/mod19.hs
index 9f8b49f2b2..9f8b49f2b2 100644
--- a/testsuite/tests/ghc-regress/module/mod19.hs
+++ b/testsuite/tests/module/mod19.hs
diff --git a/testsuite/tests/ghc-regress/module/mod19.stderr b/testsuite/tests/module/mod19.stderr
index a988040291..a988040291 100644
--- a/testsuite/tests/ghc-regress/module/mod19.stderr
+++ b/testsuite/tests/module/mod19.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod19.stderr-hugs b/testsuite/tests/module/mod19.stderr-hugs
index c38263918b..c38263918b 100644
--- a/testsuite/tests/ghc-regress/module/mod19.stderr-hugs
+++ b/testsuite/tests/module/mod19.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod2.hs b/testsuite/tests/module/mod2.hs
index d0821071b6..d0821071b6 100644
--- a/testsuite/tests/ghc-regress/module/mod2.hs
+++ b/testsuite/tests/module/mod2.hs
diff --git a/testsuite/tests/ghc-regress/module/mod2.stderr b/testsuite/tests/module/mod2.stderr
index e928ab3b19..e928ab3b19 100644
--- a/testsuite/tests/ghc-regress/module/mod2.stderr
+++ b/testsuite/tests/module/mod2.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod2.stderr-hugs b/testsuite/tests/module/mod2.stderr-hugs
index ee12e8e265..ee12e8e265 100644
--- a/testsuite/tests/ghc-regress/module/mod2.stderr-hugs
+++ b/testsuite/tests/module/mod2.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod20.hs b/testsuite/tests/module/mod20.hs
index 68d6ede9d0..68d6ede9d0 100644
--- a/testsuite/tests/ghc-regress/module/mod20.hs
+++ b/testsuite/tests/module/mod20.hs
diff --git a/testsuite/tests/ghc-regress/module/mod20.stderr b/testsuite/tests/module/mod20.stderr
index 355fe1c038..355fe1c038 100644
--- a/testsuite/tests/ghc-regress/module/mod20.stderr
+++ b/testsuite/tests/module/mod20.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod20.stderr-hugs b/testsuite/tests/module/mod20.stderr-hugs
index c8951af078..c8951af078 100644
--- a/testsuite/tests/ghc-regress/module/mod20.stderr-hugs
+++ b/testsuite/tests/module/mod20.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod21.hs b/testsuite/tests/module/mod21.hs
index 7d24286464..7d24286464 100644
--- a/testsuite/tests/ghc-regress/module/mod21.hs
+++ b/testsuite/tests/module/mod21.hs
diff --git a/testsuite/tests/ghc-regress/module/mod21.stderr b/testsuite/tests/module/mod21.stderr
index 4a6a8edec7..4a6a8edec7 100644
--- a/testsuite/tests/ghc-regress/module/mod21.stderr
+++ b/testsuite/tests/module/mod21.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod21.stderr-hugs b/testsuite/tests/module/mod21.stderr-hugs
index bdf6f93413..bdf6f93413 100644
--- a/testsuite/tests/ghc-regress/module/mod21.stderr-hugs
+++ b/testsuite/tests/module/mod21.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod22.hs b/testsuite/tests/module/mod22.hs
index 69cc870720..69cc870720 100644
--- a/testsuite/tests/ghc-regress/module/mod22.hs
+++ b/testsuite/tests/module/mod22.hs
diff --git a/testsuite/tests/ghc-regress/module/mod22.stderr b/testsuite/tests/module/mod22.stderr
index 9cf3f768d2..9cf3f768d2 100644
--- a/testsuite/tests/ghc-regress/module/mod22.stderr
+++ b/testsuite/tests/module/mod22.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod22.stderr-hugs b/testsuite/tests/module/mod22.stderr-hugs
index 734348f1cb..734348f1cb 100644
--- a/testsuite/tests/ghc-regress/module/mod22.stderr-hugs
+++ b/testsuite/tests/module/mod22.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod23.hs b/testsuite/tests/module/mod23.hs
index 84753b4189..84753b4189 100644
--- a/testsuite/tests/ghc-regress/module/mod23.hs
+++ b/testsuite/tests/module/mod23.hs
diff --git a/testsuite/tests/ghc-regress/module/mod23.stderr b/testsuite/tests/module/mod23.stderr
index 3085cfff37..3085cfff37 100644
--- a/testsuite/tests/ghc-regress/module/mod23.stderr
+++ b/testsuite/tests/module/mod23.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod23.stderr-hugs b/testsuite/tests/module/mod23.stderr-hugs
index 71f47b8e3c..71f47b8e3c 100644
--- a/testsuite/tests/ghc-regress/module/mod23.stderr-hugs
+++ b/testsuite/tests/module/mod23.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod24.hs b/testsuite/tests/module/mod24.hs
index 6e1654b4f9..6e1654b4f9 100644
--- a/testsuite/tests/ghc-regress/module/mod24.hs
+++ b/testsuite/tests/module/mod24.hs
diff --git a/testsuite/tests/ghc-regress/module/mod24.stderr b/testsuite/tests/module/mod24.stderr
index 12ed89e59a..12ed89e59a 100644
--- a/testsuite/tests/ghc-regress/module/mod24.stderr
+++ b/testsuite/tests/module/mod24.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod24.stderr-hugs b/testsuite/tests/module/mod24.stderr-hugs
index 60ffcc5f90..60ffcc5f90 100644
--- a/testsuite/tests/ghc-regress/module/mod24.stderr-hugs
+++ b/testsuite/tests/module/mod24.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod25.hs b/testsuite/tests/module/mod25.hs
index e1f5087379..e1f5087379 100644
--- a/testsuite/tests/ghc-regress/module/mod25.hs
+++ b/testsuite/tests/module/mod25.hs
diff --git a/testsuite/tests/ghc-regress/module/mod25.stderr b/testsuite/tests/module/mod25.stderr
index 49a15454aa..49a15454aa 100644
--- a/testsuite/tests/ghc-regress/module/mod25.stderr
+++ b/testsuite/tests/module/mod25.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod25.stderr-hugs b/testsuite/tests/module/mod25.stderr-hugs
index e5fa83448b..e5fa83448b 100644
--- a/testsuite/tests/ghc-regress/module/mod25.stderr-hugs
+++ b/testsuite/tests/module/mod25.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod26.hs b/testsuite/tests/module/mod26.hs
index d58b1de1d0..d58b1de1d0 100644
--- a/testsuite/tests/ghc-regress/module/mod26.hs
+++ b/testsuite/tests/module/mod26.hs
diff --git a/testsuite/tests/ghc-regress/module/mod26.stderr b/testsuite/tests/module/mod26.stderr
index 914f879d61..914f879d61 100644
--- a/testsuite/tests/ghc-regress/module/mod26.stderr
+++ b/testsuite/tests/module/mod26.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod26.stderr-hugs b/testsuite/tests/module/mod26.stderr-hugs
index 2f279dfcdc..2f279dfcdc 100644
--- a/testsuite/tests/ghc-regress/module/mod26.stderr-hugs
+++ b/testsuite/tests/module/mod26.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod27.hs b/testsuite/tests/module/mod27.hs
index 394fa2341d..394fa2341d 100644
--- a/testsuite/tests/ghc-regress/module/mod27.hs
+++ b/testsuite/tests/module/mod27.hs
diff --git a/testsuite/tests/ghc-regress/module/mod27.stderr b/testsuite/tests/module/mod27.stderr
index 85848345d5..85848345d5 100644
--- a/testsuite/tests/ghc-regress/module/mod27.stderr
+++ b/testsuite/tests/module/mod27.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod27.stderr-hugs b/testsuite/tests/module/mod27.stderr-hugs
index 0590e990da..0590e990da 100644
--- a/testsuite/tests/ghc-regress/module/mod27.stderr-hugs
+++ b/testsuite/tests/module/mod27.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod29.hs b/testsuite/tests/module/mod29.hs
index cce8eb5f5b..cce8eb5f5b 100644
--- a/testsuite/tests/ghc-regress/module/mod29.hs
+++ b/testsuite/tests/module/mod29.hs
diff --git a/testsuite/tests/ghc-regress/module/mod29.stderr b/testsuite/tests/module/mod29.stderr
index ba62a734f0..ba62a734f0 100644
--- a/testsuite/tests/ghc-regress/module/mod29.stderr
+++ b/testsuite/tests/module/mod29.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod29.stderr-hugs b/testsuite/tests/module/mod29.stderr-hugs
index ce2a23bf0f..ce2a23bf0f 100644
--- a/testsuite/tests/ghc-regress/module/mod29.stderr-hugs
+++ b/testsuite/tests/module/mod29.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod3.hs b/testsuite/tests/module/mod3.hs
index ec31b6e480..ec31b6e480 100644
--- a/testsuite/tests/ghc-regress/module/mod3.hs
+++ b/testsuite/tests/module/mod3.hs
diff --git a/testsuite/tests/ghc-regress/module/mod3.stderr b/testsuite/tests/module/mod3.stderr
index 2b0cae95fa..2b0cae95fa 100644
--- a/testsuite/tests/ghc-regress/module/mod3.stderr
+++ b/testsuite/tests/module/mod3.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod3.stderr-hugs b/testsuite/tests/module/mod3.stderr-hugs
index 4aa156e5ca..4aa156e5ca 100644
--- a/testsuite/tests/ghc-regress/module/mod3.stderr-hugs
+++ b/testsuite/tests/module/mod3.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod30.hs b/testsuite/tests/module/mod30.hs
index 8f87970a2d..8f87970a2d 100644
--- a/testsuite/tests/ghc-regress/module/mod30.hs
+++ b/testsuite/tests/module/mod30.hs
diff --git a/testsuite/tests/ghc-regress/module/mod31.hs b/testsuite/tests/module/mod31.hs
index 70f66a391e..70f66a391e 100644
--- a/testsuite/tests/ghc-regress/module/mod31.hs
+++ b/testsuite/tests/module/mod31.hs
diff --git a/testsuite/tests/ghc-regress/module/mod32.hs b/testsuite/tests/module/mod32.hs
index 2922bab0ce..2922bab0ce 100644
--- a/testsuite/tests/ghc-regress/module/mod32.hs
+++ b/testsuite/tests/module/mod32.hs
diff --git a/testsuite/tests/ghc-regress/module/mod33.hs b/testsuite/tests/module/mod33.hs
index 04d984af39..04d984af39 100644
--- a/testsuite/tests/ghc-regress/module/mod33.hs
+++ b/testsuite/tests/module/mod33.hs
diff --git a/testsuite/tests/ghc-regress/module/mod34.hs b/testsuite/tests/module/mod34.hs
index 9b59245630..9b59245630 100644
--- a/testsuite/tests/ghc-regress/module/mod34.hs
+++ b/testsuite/tests/module/mod34.hs
diff --git a/testsuite/tests/ghc-regress/module/mod35.hs b/testsuite/tests/module/mod35.hs
index 614bb73130..614bb73130 100644
--- a/testsuite/tests/ghc-regress/module/mod35.hs
+++ b/testsuite/tests/module/mod35.hs
diff --git a/testsuite/tests/ghc-regress/module/mod36.hs b/testsuite/tests/module/mod36.hs
index 9bd609c019..9bd609c019 100644
--- a/testsuite/tests/ghc-regress/module/mod36.hs
+++ b/testsuite/tests/module/mod36.hs
diff --git a/testsuite/tests/ghc-regress/module/mod36.stderr b/testsuite/tests/module/mod36.stderr
index 9d6b97bfa9..9d6b97bfa9 100644
--- a/testsuite/tests/ghc-regress/module/mod36.stderr
+++ b/testsuite/tests/module/mod36.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod36.stderr-hugs b/testsuite/tests/module/mod36.stderr-hugs
index b97ba265bd..b97ba265bd 100644
--- a/testsuite/tests/ghc-regress/module/mod36.stderr-hugs
+++ b/testsuite/tests/module/mod36.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod37.hs b/testsuite/tests/module/mod37.hs
index 4e21e6c9a9..4e21e6c9a9 100644
--- a/testsuite/tests/ghc-regress/module/mod37.hs
+++ b/testsuite/tests/module/mod37.hs
diff --git a/testsuite/tests/ghc-regress/module/mod38.hs b/testsuite/tests/module/mod38.hs
index 1391fbaeaf..1391fbaeaf 100644
--- a/testsuite/tests/ghc-regress/module/mod38.hs
+++ b/testsuite/tests/module/mod38.hs
diff --git a/testsuite/tests/ghc-regress/module/mod38.stderr b/testsuite/tests/module/mod38.stderr
index 2b124d5f6c..2b124d5f6c 100644
--- a/testsuite/tests/ghc-regress/module/mod38.stderr
+++ b/testsuite/tests/module/mod38.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod38.stderr-hugs b/testsuite/tests/module/mod38.stderr-hugs
index 1c2fed7dee..1c2fed7dee 100644
--- a/testsuite/tests/ghc-regress/module/mod38.stderr-hugs
+++ b/testsuite/tests/module/mod38.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod39.hs b/testsuite/tests/module/mod39.hs
index 477e0a3854..477e0a3854 100644
--- a/testsuite/tests/ghc-regress/module/mod39.hs
+++ b/testsuite/tests/module/mod39.hs
diff --git a/testsuite/tests/ghc-regress/module/mod4.hs b/testsuite/tests/module/mod4.hs
index 02f579800f..02f579800f 100644
--- a/testsuite/tests/ghc-regress/module/mod4.hs
+++ b/testsuite/tests/module/mod4.hs
diff --git a/testsuite/tests/ghc-regress/module/mod4.stderr b/testsuite/tests/module/mod4.stderr
index 84d7cfa19e..84d7cfa19e 100644
--- a/testsuite/tests/ghc-regress/module/mod4.stderr
+++ b/testsuite/tests/module/mod4.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod4.stderr-hugs b/testsuite/tests/module/mod4.stderr-hugs
index e3aa770ecd..e3aa770ecd 100644
--- a/testsuite/tests/ghc-regress/module/mod4.stderr-hugs
+++ b/testsuite/tests/module/mod4.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod40.hs b/testsuite/tests/module/mod40.hs
index 5fc8a2e0f7..5fc8a2e0f7 100644
--- a/testsuite/tests/ghc-regress/module/mod40.hs
+++ b/testsuite/tests/module/mod40.hs
diff --git a/testsuite/tests/ghc-regress/module/mod40.stderr b/testsuite/tests/module/mod40.stderr
index 35c2151e83..35c2151e83 100644
--- a/testsuite/tests/ghc-regress/module/mod40.stderr
+++ b/testsuite/tests/module/mod40.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod40.stderr-hugs b/testsuite/tests/module/mod40.stderr-hugs
index 50b78c836e..50b78c836e 100644
--- a/testsuite/tests/ghc-regress/module/mod40.stderr-hugs
+++ b/testsuite/tests/module/mod40.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod41.hs b/testsuite/tests/module/mod41.hs
index a1ac924242..a1ac924242 100644
--- a/testsuite/tests/ghc-regress/module/mod41.hs
+++ b/testsuite/tests/module/mod41.hs
diff --git a/testsuite/tests/ghc-regress/module/mod41.stderr b/testsuite/tests/module/mod41.stderr
index 5ec4355fbe..5ec4355fbe 100644
--- a/testsuite/tests/ghc-regress/module/mod41.stderr
+++ b/testsuite/tests/module/mod41.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod41.stderr-hugs b/testsuite/tests/module/mod41.stderr-hugs
index 50f49c0297..50f49c0297 100644
--- a/testsuite/tests/ghc-regress/module/mod41.stderr-hugs
+++ b/testsuite/tests/module/mod41.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod42.hs b/testsuite/tests/module/mod42.hs
index 9828d8b642..9828d8b642 100644
--- a/testsuite/tests/ghc-regress/module/mod42.hs
+++ b/testsuite/tests/module/mod42.hs
diff --git a/testsuite/tests/ghc-regress/module/mod42.stderr b/testsuite/tests/module/mod42.stderr
index 319f42ba05..319f42ba05 100644
--- a/testsuite/tests/ghc-regress/module/mod42.stderr
+++ b/testsuite/tests/module/mod42.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod42.stderr-hugs b/testsuite/tests/module/mod42.stderr-hugs
index 481d86444d..481d86444d 100644
--- a/testsuite/tests/ghc-regress/module/mod42.stderr-hugs
+++ b/testsuite/tests/module/mod42.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod43.hs b/testsuite/tests/module/mod43.hs
index 085382f8b0..085382f8b0 100644
--- a/testsuite/tests/ghc-regress/module/mod43.hs
+++ b/testsuite/tests/module/mod43.hs
diff --git a/testsuite/tests/ghc-regress/module/mod43.stderr b/testsuite/tests/module/mod43.stderr
index 7fc4da0b8b..7fc4da0b8b 100644
--- a/testsuite/tests/ghc-regress/module/mod43.stderr
+++ b/testsuite/tests/module/mod43.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod43.stderr-hugs b/testsuite/tests/module/mod43.stderr-hugs
index 4c8f7aeefd..4c8f7aeefd 100644
--- a/testsuite/tests/ghc-regress/module/mod43.stderr-hugs
+++ b/testsuite/tests/module/mod43.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod44.hs b/testsuite/tests/module/mod44.hs
index f5b34cd50e..f5b34cd50e 100644
--- a/testsuite/tests/ghc-regress/module/mod44.hs
+++ b/testsuite/tests/module/mod44.hs
diff --git a/testsuite/tests/ghc-regress/module/mod44.stderr b/testsuite/tests/module/mod44.stderr
index b6276a5235..b6276a5235 100644
--- a/testsuite/tests/ghc-regress/module/mod44.stderr
+++ b/testsuite/tests/module/mod44.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod44.stderr-hugs b/testsuite/tests/module/mod44.stderr-hugs
index c23e7218d7..c23e7218d7 100644
--- a/testsuite/tests/ghc-regress/module/mod44.stderr-hugs
+++ b/testsuite/tests/module/mod44.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod45.hs b/testsuite/tests/module/mod45.hs
index 03a1bc32ba..03a1bc32ba 100644
--- a/testsuite/tests/ghc-regress/module/mod45.hs
+++ b/testsuite/tests/module/mod45.hs
diff --git a/testsuite/tests/ghc-regress/module/mod45.stderr b/testsuite/tests/module/mod45.stderr
index bba6b1b7d7..bba6b1b7d7 100644
--- a/testsuite/tests/ghc-regress/module/mod45.stderr
+++ b/testsuite/tests/module/mod45.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod45.stderr-hugs b/testsuite/tests/module/mod45.stderr-hugs
index 5874ebc5fa..5874ebc5fa 100644
--- a/testsuite/tests/ghc-regress/module/mod45.stderr-hugs
+++ b/testsuite/tests/module/mod45.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod46.hs b/testsuite/tests/module/mod46.hs
index 4b7a8f8135..4b7a8f8135 100644
--- a/testsuite/tests/ghc-regress/module/mod46.hs
+++ b/testsuite/tests/module/mod46.hs
diff --git a/testsuite/tests/ghc-regress/module/mod46.stderr b/testsuite/tests/module/mod46.stderr
index 603d0d6e79..603d0d6e79 100644
--- a/testsuite/tests/ghc-regress/module/mod46.stderr
+++ b/testsuite/tests/module/mod46.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod46.stderr-hugs b/testsuite/tests/module/mod46.stderr-hugs
index ae15a4f695..ae15a4f695 100644
--- a/testsuite/tests/ghc-regress/module/mod46.stderr-hugs
+++ b/testsuite/tests/module/mod46.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod47.hs b/testsuite/tests/module/mod47.hs
index f0f487dda2..f0f487dda2 100644
--- a/testsuite/tests/ghc-regress/module/mod47.hs
+++ b/testsuite/tests/module/mod47.hs
diff --git a/testsuite/tests/ghc-regress/module/mod47.stderr b/testsuite/tests/module/mod47.stderr
index 1b8fd0b411..1b8fd0b411 100644
--- a/testsuite/tests/ghc-regress/module/mod47.stderr
+++ b/testsuite/tests/module/mod47.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod47.stderr-hugs b/testsuite/tests/module/mod47.stderr-hugs
index a26b99b109..a26b99b109 100644
--- a/testsuite/tests/ghc-regress/module/mod47.stderr-hugs
+++ b/testsuite/tests/module/mod47.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod48.hs b/testsuite/tests/module/mod48.hs
index 681d356e2e..681d356e2e 100644
--- a/testsuite/tests/ghc-regress/module/mod48.hs
+++ b/testsuite/tests/module/mod48.hs
diff --git a/testsuite/tests/ghc-regress/module/mod48.stderr b/testsuite/tests/module/mod48.stderr
index d184d2a7a2..d184d2a7a2 100644
--- a/testsuite/tests/ghc-regress/module/mod48.stderr
+++ b/testsuite/tests/module/mod48.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod48.stderr-hugs b/testsuite/tests/module/mod48.stderr-hugs
index 9abf8c5dbd..9abf8c5dbd 100644
--- a/testsuite/tests/ghc-regress/module/mod48.stderr-hugs
+++ b/testsuite/tests/module/mod48.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod49.hs b/testsuite/tests/module/mod49.hs
index 7f995ecfbc..7f995ecfbc 100644
--- a/testsuite/tests/ghc-regress/module/mod49.hs
+++ b/testsuite/tests/module/mod49.hs
diff --git a/testsuite/tests/ghc-regress/module/mod49.stderr b/testsuite/tests/module/mod49.stderr
index f08b36e0c4..f08b36e0c4 100644
--- a/testsuite/tests/ghc-regress/module/mod49.stderr
+++ b/testsuite/tests/module/mod49.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod49.stderr-hugs b/testsuite/tests/module/mod49.stderr-hugs
index 873cf50f82..873cf50f82 100644
--- a/testsuite/tests/ghc-regress/module/mod49.stderr-hugs
+++ b/testsuite/tests/module/mod49.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod5.hs b/testsuite/tests/module/mod5.hs
index 5b059ecc1a..5b059ecc1a 100644
--- a/testsuite/tests/ghc-regress/module/mod5.hs
+++ b/testsuite/tests/module/mod5.hs
diff --git a/testsuite/tests/ghc-regress/module/mod5.stderr-ghc b/testsuite/tests/module/mod5.stderr-ghc
index 7992560ca3..7992560ca3 100644
--- a/testsuite/tests/ghc-regress/module/mod5.stderr-ghc
+++ b/testsuite/tests/module/mod5.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/module/mod50.hs b/testsuite/tests/module/mod50.hs
index 5f26b8d487..5f26b8d487 100644
--- a/testsuite/tests/ghc-regress/module/mod50.hs
+++ b/testsuite/tests/module/mod50.hs
diff --git a/testsuite/tests/ghc-regress/module/mod50.stderr b/testsuite/tests/module/mod50.stderr
index 9357f7a2d8..9357f7a2d8 100644
--- a/testsuite/tests/ghc-regress/module/mod50.stderr
+++ b/testsuite/tests/module/mod50.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod50.stderr-hugs b/testsuite/tests/module/mod50.stderr-hugs
index b3ca66839e..b3ca66839e 100644
--- a/testsuite/tests/ghc-regress/module/mod50.stderr-hugs
+++ b/testsuite/tests/module/mod50.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod51.hs b/testsuite/tests/module/mod51.hs
index c3069a6c3e..c3069a6c3e 100644
--- a/testsuite/tests/ghc-regress/module/mod51.hs
+++ b/testsuite/tests/module/mod51.hs
diff --git a/testsuite/tests/ghc-regress/module/mod51.stderr b/testsuite/tests/module/mod51.stderr
index db74d7a5df..db74d7a5df 100644
--- a/testsuite/tests/ghc-regress/module/mod51.stderr
+++ b/testsuite/tests/module/mod51.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod51.stderr-hugs b/testsuite/tests/module/mod51.stderr-hugs
index 54d5198bea..54d5198bea 100644
--- a/testsuite/tests/ghc-regress/module/mod51.stderr-hugs
+++ b/testsuite/tests/module/mod51.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod52.hs b/testsuite/tests/module/mod52.hs
index c907afe215..c907afe215 100644
--- a/testsuite/tests/ghc-regress/module/mod52.hs
+++ b/testsuite/tests/module/mod52.hs
diff --git a/testsuite/tests/ghc-regress/module/mod52.stderr b/testsuite/tests/module/mod52.stderr
index 23818e8bf3..23818e8bf3 100644
--- a/testsuite/tests/ghc-regress/module/mod52.stderr
+++ b/testsuite/tests/module/mod52.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod52.stderr-hugs b/testsuite/tests/module/mod52.stderr-hugs
index 634069431f..634069431f 100644
--- a/testsuite/tests/ghc-regress/module/mod52.stderr-hugs
+++ b/testsuite/tests/module/mod52.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod53.hs b/testsuite/tests/module/mod53.hs
index c7291e43a7..c7291e43a7 100644
--- a/testsuite/tests/ghc-regress/module/mod53.hs
+++ b/testsuite/tests/module/mod53.hs
diff --git a/testsuite/tests/ghc-regress/module/mod53.stderr b/testsuite/tests/module/mod53.stderr
index b8b44a471e..b8b44a471e 100644
--- a/testsuite/tests/ghc-regress/module/mod53.stderr
+++ b/testsuite/tests/module/mod53.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod53.stderr-hugs b/testsuite/tests/module/mod53.stderr-hugs
index 92b3f424c2..92b3f424c2 100644
--- a/testsuite/tests/ghc-regress/module/mod53.stderr-hugs
+++ b/testsuite/tests/module/mod53.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod54.hs b/testsuite/tests/module/mod54.hs
index 0814a5e57b..0814a5e57b 100644
--- a/testsuite/tests/ghc-regress/module/mod54.hs
+++ b/testsuite/tests/module/mod54.hs
diff --git a/testsuite/tests/ghc-regress/module/mod54.stderr b/testsuite/tests/module/mod54.stderr
index 8b41e7f8bc..8b41e7f8bc 100644
--- a/testsuite/tests/ghc-regress/module/mod54.stderr
+++ b/testsuite/tests/module/mod54.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod54.stderr-hugs b/testsuite/tests/module/mod54.stderr-hugs
index ff65e5ce96..ff65e5ce96 100644
--- a/testsuite/tests/ghc-regress/module/mod54.stderr-hugs
+++ b/testsuite/tests/module/mod54.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod55.hs b/testsuite/tests/module/mod55.hs
index 55cfab7d60..55cfab7d60 100644
--- a/testsuite/tests/ghc-regress/module/mod55.hs
+++ b/testsuite/tests/module/mod55.hs
diff --git a/testsuite/tests/ghc-regress/module/mod55.stderr b/testsuite/tests/module/mod55.stderr
index 7787ea3b2f..7787ea3b2f 100644
--- a/testsuite/tests/ghc-regress/module/mod55.stderr
+++ b/testsuite/tests/module/mod55.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod55.stderr-hugs b/testsuite/tests/module/mod55.stderr-hugs
index 1c0b452698..1c0b452698 100644
--- a/testsuite/tests/ghc-regress/module/mod55.stderr-hugs
+++ b/testsuite/tests/module/mod55.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod56.hs b/testsuite/tests/module/mod56.hs
index 2fb79baaa6..2fb79baaa6 100644
--- a/testsuite/tests/ghc-regress/module/mod56.hs
+++ b/testsuite/tests/module/mod56.hs
diff --git a/testsuite/tests/ghc-regress/module/mod56.stderr b/testsuite/tests/module/mod56.stderr
index 3dca4e2e10..3dca4e2e10 100644
--- a/testsuite/tests/ghc-regress/module/mod56.stderr
+++ b/testsuite/tests/module/mod56.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod56.stderr-hugs b/testsuite/tests/module/mod56.stderr-hugs
index 74e44165a4..74e44165a4 100644
--- a/testsuite/tests/ghc-regress/module/mod56.stderr-hugs
+++ b/testsuite/tests/module/mod56.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod58.hs b/testsuite/tests/module/mod58.hs
index 4ab2f71737..4ab2f71737 100644
--- a/testsuite/tests/ghc-regress/module/mod58.hs
+++ b/testsuite/tests/module/mod58.hs
diff --git a/testsuite/tests/ghc-regress/module/mod58.stderr b/testsuite/tests/module/mod58.stderr
index d92345a8af..d92345a8af 100644
--- a/testsuite/tests/ghc-regress/module/mod58.stderr
+++ b/testsuite/tests/module/mod58.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod58.stderr-hugs b/testsuite/tests/module/mod58.stderr-hugs
index 7dd4839a26..7dd4839a26 100644
--- a/testsuite/tests/ghc-regress/module/mod58.stderr-hugs
+++ b/testsuite/tests/module/mod58.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod59.hs b/testsuite/tests/module/mod59.hs
index ecb026e894..ecb026e894 100644
--- a/testsuite/tests/ghc-regress/module/mod59.hs
+++ b/testsuite/tests/module/mod59.hs
diff --git a/testsuite/tests/ghc-regress/module/mod59.stderr b/testsuite/tests/module/mod59.stderr
index c08db2a55f..c08db2a55f 100644
--- a/testsuite/tests/ghc-regress/module/mod59.stderr
+++ b/testsuite/tests/module/mod59.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod59.stderr-hugs b/testsuite/tests/module/mod59.stderr-hugs
index 5a408f345b..5a408f345b 100644
--- a/testsuite/tests/ghc-regress/module/mod59.stderr-hugs
+++ b/testsuite/tests/module/mod59.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod6.hs b/testsuite/tests/module/mod6.hs
index 91a9a780cd..91a9a780cd 100644
--- a/testsuite/tests/ghc-regress/module/mod6.hs
+++ b/testsuite/tests/module/mod6.hs
diff --git a/testsuite/tests/ghc-regress/module/mod60.hs b/testsuite/tests/module/mod60.hs
index 61884850b3..61884850b3 100644
--- a/testsuite/tests/ghc-regress/module/mod60.hs
+++ b/testsuite/tests/module/mod60.hs
diff --git a/testsuite/tests/ghc-regress/module/mod60.stderr b/testsuite/tests/module/mod60.stderr
index f363cb933b..f363cb933b 100644
--- a/testsuite/tests/ghc-regress/module/mod60.stderr
+++ b/testsuite/tests/module/mod60.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod60.stderr-hugs b/testsuite/tests/module/mod60.stderr-hugs
index 17e7120319..17e7120319 100644
--- a/testsuite/tests/ghc-regress/module/mod60.stderr-hugs
+++ b/testsuite/tests/module/mod60.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod61.hs b/testsuite/tests/module/mod61.hs
index 62fdef2dd3..62fdef2dd3 100644
--- a/testsuite/tests/ghc-regress/module/mod61.hs
+++ b/testsuite/tests/module/mod61.hs
diff --git a/testsuite/tests/ghc-regress/module/mod61.stderr b/testsuite/tests/module/mod61.stderr
index 3ac4937437..3ac4937437 100644
--- a/testsuite/tests/ghc-regress/module/mod61.stderr
+++ b/testsuite/tests/module/mod61.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod61.stderr-hugs b/testsuite/tests/module/mod61.stderr-hugs
index 32c0138b81..32c0138b81 100644
--- a/testsuite/tests/ghc-regress/module/mod61.stderr-hugs
+++ b/testsuite/tests/module/mod61.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod62.hs b/testsuite/tests/module/mod62.hs
index b1140fdd6b..b1140fdd6b 100644
--- a/testsuite/tests/ghc-regress/module/mod62.hs
+++ b/testsuite/tests/module/mod62.hs
diff --git a/testsuite/tests/ghc-regress/module/mod62.stderr b/testsuite/tests/module/mod62.stderr
index d435dbd6b9..d435dbd6b9 100644
--- a/testsuite/tests/ghc-regress/module/mod62.stderr
+++ b/testsuite/tests/module/mod62.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod62.stderr-hugs b/testsuite/tests/module/mod62.stderr-hugs
index 1c50fab13a..1c50fab13a 100644
--- a/testsuite/tests/ghc-regress/module/mod62.stderr-hugs
+++ b/testsuite/tests/module/mod62.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod63.hs b/testsuite/tests/module/mod63.hs
index 70da4c30c2..70da4c30c2 100644
--- a/testsuite/tests/ghc-regress/module/mod63.hs
+++ b/testsuite/tests/module/mod63.hs
diff --git a/testsuite/tests/ghc-regress/module/mod63.stderr b/testsuite/tests/module/mod63.stderr
index a4745b2e49..a4745b2e49 100644
--- a/testsuite/tests/ghc-regress/module/mod63.stderr
+++ b/testsuite/tests/module/mod63.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod63.stderr-hugs b/testsuite/tests/module/mod63.stderr-hugs
index a2f6d6a677..a2f6d6a677 100644
--- a/testsuite/tests/ghc-regress/module/mod63.stderr-hugs
+++ b/testsuite/tests/module/mod63.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod64.hs b/testsuite/tests/module/mod64.hs
index 9a9c6aef78..9a9c6aef78 100644
--- a/testsuite/tests/ghc-regress/module/mod64.hs
+++ b/testsuite/tests/module/mod64.hs
diff --git a/testsuite/tests/ghc-regress/module/mod64.stderr b/testsuite/tests/module/mod64.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/module/mod64.stderr
+++ b/testsuite/tests/module/mod64.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod65.hs b/testsuite/tests/module/mod65.hs
index 96866b9666..96866b9666 100644
--- a/testsuite/tests/ghc-regress/module/mod65.hs
+++ b/testsuite/tests/module/mod65.hs
diff --git a/testsuite/tests/ghc-regress/module/mod65.stderr b/testsuite/tests/module/mod65.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/module/mod65.stderr
+++ b/testsuite/tests/module/mod65.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod66.hs b/testsuite/tests/module/mod66.hs
index d162ae09d5..d162ae09d5 100644
--- a/testsuite/tests/ghc-regress/module/mod66.hs
+++ b/testsuite/tests/module/mod66.hs
diff --git a/testsuite/tests/ghc-regress/module/mod66.stderr b/testsuite/tests/module/mod66.stderr
index 7949ae3ec0..7949ae3ec0 100644
--- a/testsuite/tests/ghc-regress/module/mod66.stderr
+++ b/testsuite/tests/module/mod66.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod66.stderr-hugs b/testsuite/tests/module/mod66.stderr-hugs
index 2f954b8337..2f954b8337 100644
--- a/testsuite/tests/ghc-regress/module/mod66.stderr-hugs
+++ b/testsuite/tests/module/mod66.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod67.hs b/testsuite/tests/module/mod67.hs
index addfbfb946..addfbfb946 100644
--- a/testsuite/tests/ghc-regress/module/mod67.hs
+++ b/testsuite/tests/module/mod67.hs
diff --git a/testsuite/tests/ghc-regress/module/mod67.stderr b/testsuite/tests/module/mod67.stderr
index 2c2323b83f..2c2323b83f 100644
--- a/testsuite/tests/ghc-regress/module/mod67.stderr
+++ b/testsuite/tests/module/mod67.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod67.stderr-hugs b/testsuite/tests/module/mod67.stderr-hugs
index 395507373d..395507373d 100644
--- a/testsuite/tests/ghc-regress/module/mod67.stderr-hugs
+++ b/testsuite/tests/module/mod67.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod68.hs b/testsuite/tests/module/mod68.hs
index fd10684e2c..fd10684e2c 100644
--- a/testsuite/tests/ghc-regress/module/mod68.hs
+++ b/testsuite/tests/module/mod68.hs
diff --git a/testsuite/tests/ghc-regress/module/mod68.stderr b/testsuite/tests/module/mod68.stderr
index 2d5ece6f47..2d5ece6f47 100644
--- a/testsuite/tests/ghc-regress/module/mod68.stderr
+++ b/testsuite/tests/module/mod68.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod68.stderr-hugs b/testsuite/tests/module/mod68.stderr-hugs
index 362c681500..362c681500 100644
--- a/testsuite/tests/ghc-regress/module/mod68.stderr-hugs
+++ b/testsuite/tests/module/mod68.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod69.hs b/testsuite/tests/module/mod69.hs
index 8360274d21..8360274d21 100644
--- a/testsuite/tests/ghc-regress/module/mod69.hs
+++ b/testsuite/tests/module/mod69.hs
diff --git a/testsuite/tests/ghc-regress/module/mod69.stderr b/testsuite/tests/module/mod69.stderr
index d7f92be69a..d7f92be69a 100644
--- a/testsuite/tests/ghc-regress/module/mod69.stderr
+++ b/testsuite/tests/module/mod69.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod69.stderr-hugs b/testsuite/tests/module/mod69.stderr-hugs
index 36c2ef4df3..36c2ef4df3 100644
--- a/testsuite/tests/ghc-regress/module/mod69.stderr-hugs
+++ b/testsuite/tests/module/mod69.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod7.hs b/testsuite/tests/module/mod7.hs
index 68aacee63b..68aacee63b 100644
--- a/testsuite/tests/ghc-regress/module/mod7.hs
+++ b/testsuite/tests/module/mod7.hs
diff --git a/testsuite/tests/ghc-regress/module/mod7.stderr b/testsuite/tests/module/mod7.stderr
index f9119cd786..f9119cd786 100644
--- a/testsuite/tests/ghc-regress/module/mod7.stderr
+++ b/testsuite/tests/module/mod7.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod7.stderr-hugs b/testsuite/tests/module/mod7.stderr-hugs
index a8bf4f0904..a8bf4f0904 100644
--- a/testsuite/tests/ghc-regress/module/mod7.stderr-hugs
+++ b/testsuite/tests/module/mod7.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod70.hs b/testsuite/tests/module/mod70.hs
index cb7d51fe3b..cb7d51fe3b 100644
--- a/testsuite/tests/ghc-regress/module/mod70.hs
+++ b/testsuite/tests/module/mod70.hs
diff --git a/testsuite/tests/ghc-regress/module/mod70.stderr b/testsuite/tests/module/mod70.stderr
index 110ff24afe..110ff24afe 100644
--- a/testsuite/tests/ghc-regress/module/mod70.stderr
+++ b/testsuite/tests/module/mod70.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod70.stderr-hugs b/testsuite/tests/module/mod70.stderr-hugs
index 661f02ff6f..661f02ff6f 100644
--- a/testsuite/tests/ghc-regress/module/mod70.stderr-hugs
+++ b/testsuite/tests/module/mod70.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod71.hs b/testsuite/tests/module/mod71.hs
index 49cc66d4b1..49cc66d4b1 100644
--- a/testsuite/tests/ghc-regress/module/mod71.hs
+++ b/testsuite/tests/module/mod71.hs
diff --git a/testsuite/tests/ghc-regress/module/mod71.stderr b/testsuite/tests/module/mod71.stderr
index 956f05e8d5..956f05e8d5 100644
--- a/testsuite/tests/ghc-regress/module/mod71.stderr
+++ b/testsuite/tests/module/mod71.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod71.stderr-hugs b/testsuite/tests/module/mod71.stderr-hugs
index ebb60587c4..ebb60587c4 100644
--- a/testsuite/tests/ghc-regress/module/mod71.stderr-hugs
+++ b/testsuite/tests/module/mod71.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod72.hs b/testsuite/tests/module/mod72.hs
index 355d235c1e..355d235c1e 100644
--- a/testsuite/tests/ghc-regress/module/mod72.hs
+++ b/testsuite/tests/module/mod72.hs
diff --git a/testsuite/tests/ghc-regress/module/mod72.stderr b/testsuite/tests/module/mod72.stderr
index 7f047d8023..7f047d8023 100644
--- a/testsuite/tests/ghc-regress/module/mod72.stderr
+++ b/testsuite/tests/module/mod72.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod72.stderr-hugs b/testsuite/tests/module/mod72.stderr-hugs
index f801cf0fd5..f801cf0fd5 100644
--- a/testsuite/tests/ghc-regress/module/mod72.stderr-hugs
+++ b/testsuite/tests/module/mod72.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod73.hs b/testsuite/tests/module/mod73.hs
index dd825d997a..dd825d997a 100644
--- a/testsuite/tests/ghc-regress/module/mod73.hs
+++ b/testsuite/tests/module/mod73.hs
diff --git a/testsuite/tests/ghc-regress/module/mod73.stderr b/testsuite/tests/module/mod73.stderr
index c99c7ef1cb..c99c7ef1cb 100644
--- a/testsuite/tests/ghc-regress/module/mod73.stderr
+++ b/testsuite/tests/module/mod73.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod73.stderr-hugs b/testsuite/tests/module/mod73.stderr-hugs
index 3afec93055..3afec93055 100644
--- a/testsuite/tests/ghc-regress/module/mod73.stderr-hugs
+++ b/testsuite/tests/module/mod73.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod74.hs b/testsuite/tests/module/mod74.hs
index af580a130b..af580a130b 100644
--- a/testsuite/tests/ghc-regress/module/mod74.hs
+++ b/testsuite/tests/module/mod74.hs
diff --git a/testsuite/tests/ghc-regress/module/mod74.stderr b/testsuite/tests/module/mod74.stderr
index b4d417bac2..b4d417bac2 100644
--- a/testsuite/tests/ghc-regress/module/mod74.stderr
+++ b/testsuite/tests/module/mod74.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod74.stderr-hugs b/testsuite/tests/module/mod74.stderr-hugs
index 55feed3698..55feed3698 100644
--- a/testsuite/tests/ghc-regress/module/mod74.stderr-hugs
+++ b/testsuite/tests/module/mod74.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod75.hs b/testsuite/tests/module/mod75.hs
index 4428de8237..4428de8237 100644
--- a/testsuite/tests/ghc-regress/module/mod75.hs
+++ b/testsuite/tests/module/mod75.hs
diff --git a/testsuite/tests/ghc-regress/module/mod76.hs b/testsuite/tests/module/mod76.hs
index ccf4efa0ff..ccf4efa0ff 100644
--- a/testsuite/tests/ghc-regress/module/mod76.hs
+++ b/testsuite/tests/module/mod76.hs
diff --git a/testsuite/tests/ghc-regress/module/mod76.stderr b/testsuite/tests/module/mod76.stderr
index cf7a94495c..cf7a94495c 100644
--- a/testsuite/tests/ghc-regress/module/mod76.stderr
+++ b/testsuite/tests/module/mod76.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod76.stderr-hugs b/testsuite/tests/module/mod76.stderr-hugs
index a9f2f9ed4f..a9f2f9ed4f 100644
--- a/testsuite/tests/ghc-regress/module/mod76.stderr-hugs
+++ b/testsuite/tests/module/mod76.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod77.hs b/testsuite/tests/module/mod77.hs
index ea5f89d53e..ea5f89d53e 100644
--- a/testsuite/tests/ghc-regress/module/mod77.hs
+++ b/testsuite/tests/module/mod77.hs
diff --git a/testsuite/tests/ghc-regress/module/mod77.stderr b/testsuite/tests/module/mod77.stderr
index 0cb4920e31..0cb4920e31 100644
--- a/testsuite/tests/ghc-regress/module/mod77.stderr
+++ b/testsuite/tests/module/mod77.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod77.stderr-hugs b/testsuite/tests/module/mod77.stderr-hugs
index 49dc7008bd..49dc7008bd 100644
--- a/testsuite/tests/ghc-regress/module/mod77.stderr-hugs
+++ b/testsuite/tests/module/mod77.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod79.hs b/testsuite/tests/module/mod79.hs
index ae46dd88cd..ae46dd88cd 100644
--- a/testsuite/tests/ghc-regress/module/mod79.hs
+++ b/testsuite/tests/module/mod79.hs
diff --git a/testsuite/tests/ghc-regress/module/mod79.stderr b/testsuite/tests/module/mod79.stderr
index f8a185725e..f8a185725e 100644
--- a/testsuite/tests/ghc-regress/module/mod79.stderr
+++ b/testsuite/tests/module/mod79.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod79.stderr-hugs b/testsuite/tests/module/mod79.stderr-hugs
index 43c079b009..43c079b009 100644
--- a/testsuite/tests/ghc-regress/module/mod79.stderr-hugs
+++ b/testsuite/tests/module/mod79.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod8.hs b/testsuite/tests/module/mod8.hs
index 8d7c3e003e..8d7c3e003e 100644
--- a/testsuite/tests/ghc-regress/module/mod8.hs
+++ b/testsuite/tests/module/mod8.hs
diff --git a/testsuite/tests/ghc-regress/module/mod8.stderr b/testsuite/tests/module/mod8.stderr
index cba84c8502..cba84c8502 100644
--- a/testsuite/tests/ghc-regress/module/mod8.stderr
+++ b/testsuite/tests/module/mod8.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod8.stderr-hugs b/testsuite/tests/module/mod8.stderr-hugs
index 4ac6093dd1..4ac6093dd1 100644
--- a/testsuite/tests/ghc-regress/module/mod8.stderr-hugs
+++ b/testsuite/tests/module/mod8.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod80.hs b/testsuite/tests/module/mod80.hs
index 4ab1539054..4ab1539054 100644
--- a/testsuite/tests/ghc-regress/module/mod80.hs
+++ b/testsuite/tests/module/mod80.hs
diff --git a/testsuite/tests/ghc-regress/module/mod80.stderr b/testsuite/tests/module/mod80.stderr
index c56caf0ae6..c56caf0ae6 100644
--- a/testsuite/tests/ghc-regress/module/mod80.stderr
+++ b/testsuite/tests/module/mod80.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod80.stderr-hugs b/testsuite/tests/module/mod80.stderr-hugs
index cea1259f7f..cea1259f7f 100644
--- a/testsuite/tests/ghc-regress/module/mod80.stderr-hugs
+++ b/testsuite/tests/module/mod80.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod81.hs b/testsuite/tests/module/mod81.hs
index ef1c8639fd..ef1c8639fd 100644
--- a/testsuite/tests/ghc-regress/module/mod81.hs
+++ b/testsuite/tests/module/mod81.hs
diff --git a/testsuite/tests/ghc-regress/module/mod81.stderr b/testsuite/tests/module/mod81.stderr
index d3f0d5c427..d3f0d5c427 100644
--- a/testsuite/tests/ghc-regress/module/mod81.stderr
+++ b/testsuite/tests/module/mod81.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod81.stderr-hugs b/testsuite/tests/module/mod81.stderr-hugs
index 1204130fb9..1204130fb9 100644
--- a/testsuite/tests/ghc-regress/module/mod81.stderr-hugs
+++ b/testsuite/tests/module/mod81.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod82.hs b/testsuite/tests/module/mod82.hs
index 62c630ac24..62c630ac24 100644
--- a/testsuite/tests/ghc-regress/module/mod82.hs
+++ b/testsuite/tests/module/mod82.hs
diff --git a/testsuite/tests/ghc-regress/module/mod83.hs b/testsuite/tests/module/mod83.hs
index efce6dd02f..efce6dd02f 100644
--- a/testsuite/tests/ghc-regress/module/mod83.hs
+++ b/testsuite/tests/module/mod83.hs
diff --git a/testsuite/tests/ghc-regress/module/mod84.hs b/testsuite/tests/module/mod84.hs
index 737cf7b14f..737cf7b14f 100644
--- a/testsuite/tests/ghc-regress/module/mod84.hs
+++ b/testsuite/tests/module/mod84.hs
diff --git a/testsuite/tests/ghc-regress/module/mod85.hs b/testsuite/tests/module/mod85.hs
index f9322f7517..f9322f7517 100644
--- a/testsuite/tests/ghc-regress/module/mod85.hs
+++ b/testsuite/tests/module/mod85.hs
diff --git a/testsuite/tests/ghc-regress/module/mod86.hs b/testsuite/tests/module/mod86.hs
index e143c44504..e143c44504 100644
--- a/testsuite/tests/ghc-regress/module/mod86.hs
+++ b/testsuite/tests/module/mod86.hs
diff --git a/testsuite/tests/ghc-regress/module/mod87.hs b/testsuite/tests/module/mod87.hs
index 161ab3c031..161ab3c031 100644
--- a/testsuite/tests/ghc-regress/module/mod87.hs
+++ b/testsuite/tests/module/mod87.hs
diff --git a/testsuite/tests/ghc-regress/module/mod87.stderr b/testsuite/tests/module/mod87.stderr
index 1536679aa6..1536679aa6 100644
--- a/testsuite/tests/ghc-regress/module/mod87.stderr
+++ b/testsuite/tests/module/mod87.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod87.stderr-hugs b/testsuite/tests/module/mod87.stderr-hugs
index 90399b0b20..90399b0b20 100644
--- a/testsuite/tests/ghc-regress/module/mod87.stderr-hugs
+++ b/testsuite/tests/module/mod87.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod88.hs b/testsuite/tests/module/mod88.hs
index aacf912915..aacf912915 100644
--- a/testsuite/tests/ghc-regress/module/mod88.hs
+++ b/testsuite/tests/module/mod88.hs
diff --git a/testsuite/tests/ghc-regress/module/mod88.stderr b/testsuite/tests/module/mod88.stderr
index f166c864c7..f166c864c7 100644
--- a/testsuite/tests/ghc-regress/module/mod88.stderr
+++ b/testsuite/tests/module/mod88.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod88.stderr-hugs b/testsuite/tests/module/mod88.stderr-hugs
index 23c3ba90cf..23c3ba90cf 100644
--- a/testsuite/tests/ghc-regress/module/mod88.stderr-hugs
+++ b/testsuite/tests/module/mod88.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod89.hs b/testsuite/tests/module/mod89.hs
index 2c48d65a16..2c48d65a16 100644
--- a/testsuite/tests/ghc-regress/module/mod89.hs
+++ b/testsuite/tests/module/mod89.hs
diff --git a/testsuite/tests/ghc-regress/module/mod89.stderr b/testsuite/tests/module/mod89.stderr
index ddf38b0d13..ddf38b0d13 100644
--- a/testsuite/tests/ghc-regress/module/mod89.stderr
+++ b/testsuite/tests/module/mod89.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod89.stderr-hugs b/testsuite/tests/module/mod89.stderr-hugs
index 5fcc8ae812..5fcc8ae812 100644
--- a/testsuite/tests/ghc-regress/module/mod89.stderr-hugs
+++ b/testsuite/tests/module/mod89.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod9.hs b/testsuite/tests/module/mod9.hs
index a08690679b..a08690679b 100644
--- a/testsuite/tests/ghc-regress/module/mod9.hs
+++ b/testsuite/tests/module/mod9.hs
diff --git a/testsuite/tests/ghc-regress/module/mod9.stderr b/testsuite/tests/module/mod9.stderr
index 19bec80bb2..19bec80bb2 100644
--- a/testsuite/tests/ghc-regress/module/mod9.stderr
+++ b/testsuite/tests/module/mod9.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod9.stderr-hugs b/testsuite/tests/module/mod9.stderr-hugs
index cf018ce7c8..cf018ce7c8 100644
--- a/testsuite/tests/ghc-regress/module/mod9.stderr-hugs
+++ b/testsuite/tests/module/mod9.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod90.hs b/testsuite/tests/module/mod90.hs
index 7b44ff57e2..7b44ff57e2 100644
--- a/testsuite/tests/ghc-regress/module/mod90.hs
+++ b/testsuite/tests/module/mod90.hs
diff --git a/testsuite/tests/ghc-regress/module/mod90.stderr b/testsuite/tests/module/mod90.stderr
index a5c03e0b9a..a5c03e0b9a 100644
--- a/testsuite/tests/ghc-regress/module/mod90.stderr
+++ b/testsuite/tests/module/mod90.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod90.stderr-hugs b/testsuite/tests/module/mod90.stderr-hugs
index b157660b31..b157660b31 100644
--- a/testsuite/tests/ghc-regress/module/mod90.stderr-hugs
+++ b/testsuite/tests/module/mod90.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod91.hs b/testsuite/tests/module/mod91.hs
index 8a7387e8ad..8a7387e8ad 100644
--- a/testsuite/tests/ghc-regress/module/mod91.hs
+++ b/testsuite/tests/module/mod91.hs
diff --git a/testsuite/tests/ghc-regress/module/mod91.stderr b/testsuite/tests/module/mod91.stderr
index 5d7d6e1df6..5d7d6e1df6 100644
--- a/testsuite/tests/ghc-regress/module/mod91.stderr
+++ b/testsuite/tests/module/mod91.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod91.stderr-hugs b/testsuite/tests/module/mod91.stderr-hugs
index a5de80fc6c..a5de80fc6c 100644
--- a/testsuite/tests/ghc-regress/module/mod91.stderr-hugs
+++ b/testsuite/tests/module/mod91.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod92.hs b/testsuite/tests/module/mod92.hs
index e9045b9335..e9045b9335 100644
--- a/testsuite/tests/ghc-regress/module/mod92.hs
+++ b/testsuite/tests/module/mod92.hs
diff --git a/testsuite/tests/ghc-regress/module/mod93.hs b/testsuite/tests/module/mod93.hs
index 9dbd82cc9d..9dbd82cc9d 100644
--- a/testsuite/tests/ghc-regress/module/mod93.hs
+++ b/testsuite/tests/module/mod93.hs
diff --git a/testsuite/tests/ghc-regress/module/mod94.hs b/testsuite/tests/module/mod94.hs
index d485705132..d485705132 100644
--- a/testsuite/tests/ghc-regress/module/mod94.hs
+++ b/testsuite/tests/module/mod94.hs
diff --git a/testsuite/tests/ghc-regress/module/mod95.hs b/testsuite/tests/module/mod95.hs
index b1969b58a2..b1969b58a2 100644
--- a/testsuite/tests/ghc-regress/module/mod95.hs
+++ b/testsuite/tests/module/mod95.hs
diff --git a/testsuite/tests/ghc-regress/module/mod96.hs b/testsuite/tests/module/mod96.hs
index 2f20be02b8..2f20be02b8 100644
--- a/testsuite/tests/ghc-regress/module/mod96.hs
+++ b/testsuite/tests/module/mod96.hs
diff --git a/testsuite/tests/ghc-regress/module/mod97.hs b/testsuite/tests/module/mod97.hs
index ee51c8b9fb..ee51c8b9fb 100644
--- a/testsuite/tests/ghc-regress/module/mod97.hs
+++ b/testsuite/tests/module/mod97.hs
diff --git a/testsuite/tests/ghc-regress/module/mod97.stderr b/testsuite/tests/module/mod97.stderr
index fea2306c19..fea2306c19 100644
--- a/testsuite/tests/ghc-regress/module/mod97.stderr
+++ b/testsuite/tests/module/mod97.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod97.stderr-hugs b/testsuite/tests/module/mod97.stderr-hugs
index 7763ec3677..7763ec3677 100644
--- a/testsuite/tests/ghc-regress/module/mod97.stderr-hugs
+++ b/testsuite/tests/module/mod97.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod98.hs b/testsuite/tests/module/mod98.hs
index e0dc3c32c2..e0dc3c32c2 100644
--- a/testsuite/tests/ghc-regress/module/mod98.hs
+++ b/testsuite/tests/module/mod98.hs
diff --git a/testsuite/tests/ghc-regress/module/mod98.stderr b/testsuite/tests/module/mod98.stderr
index 0a6a23d124..0a6a23d124 100644
--- a/testsuite/tests/ghc-regress/module/mod98.stderr
+++ b/testsuite/tests/module/mod98.stderr
diff --git a/testsuite/tests/ghc-regress/module/mod98.stderr-hugs b/testsuite/tests/module/mod98.stderr-hugs
index 7f01f8b636..7f01f8b636 100644
--- a/testsuite/tests/ghc-regress/module/mod98.stderr-hugs
+++ b/testsuite/tests/module/mod98.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/module/mod99.hs b/testsuite/tests/module/mod99.hs
index 8298cf1c69..8298cf1c69 100644
--- a/testsuite/tests/ghc-regress/module/mod99.hs
+++ b/testsuite/tests/module/mod99.hs
diff --git a/testsuite/tests/numeric/Makefile b/testsuite/tests/numeric/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/numeric/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/1603.hs b/testsuite/tests/numeric/should_run/1603.hs
index 09dd05a550..09dd05a550 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/1603.hs
+++ b/testsuite/tests/numeric/should_run/1603.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/1603.stdout b/testsuite/tests/numeric/should_run/1603.stdout
index 2363a1ac08..2363a1ac08 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/1603.stdout
+++ b/testsuite/tests/numeric/should_run/1603.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/3676.hs b/testsuite/tests/numeric/should_run/3676.hs
index 242a9c5bb3..242a9c5bb3 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/3676.hs
+++ b/testsuite/tests/numeric/should_run/3676.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/3676.stdout b/testsuite/tests/numeric/should_run/3676.stdout
index ab3234f458..ab3234f458 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/3676.stdout
+++ b/testsuite/tests/numeric/should_run/3676.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/4381.hs b/testsuite/tests/numeric/should_run/4381.hs
index e55a86939e..e55a86939e 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/4381.hs
+++ b/testsuite/tests/numeric/should_run/4381.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/4381.stdout b/testsuite/tests/numeric/should_run/4381.stdout
index 715699eb5e..715699eb5e 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/4381.stdout
+++ b/testsuite/tests/numeric/should_run/4381.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/4383.hs b/testsuite/tests/numeric/should_run/4383.hs
index 06c7b265d7..06c7b265d7 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/4383.hs
+++ b/testsuite/tests/numeric/should_run/4383.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/4383.stdout b/testsuite/tests/numeric/should_run/4383.stdout
index d6e38dc3fc..d6e38dc3fc 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/4383.stdout
+++ b/testsuite/tests/numeric/should_run/4383.stdout
diff --git a/testsuite/tests/numeric/should_run/Makefile b/testsuite/tests/numeric/should_run/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/numeric/should_run/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/all.T b/testsuite/tests/numeric/should_run/all.T
index 0916af1d7d..0916af1d7d 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/all.T
+++ b/testsuite/tests/numeric/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith001.hs b/testsuite/tests/numeric/should_run/arith001.hs
index ed9cd5febc..ed9cd5febc 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith001.hs
+++ b/testsuite/tests/numeric/should_run/arith001.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith001.stdout b/testsuite/tests/numeric/should_run/arith001.stdout
index 741c4809ef..741c4809ef 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith001.stdout
+++ b/testsuite/tests/numeric/should_run/arith001.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith001.stdout-ghc b/testsuite/tests/numeric/should_run/arith001.stdout-ghc
index 741c4809ef..741c4809ef 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith001.stdout-ghc
+++ b/testsuite/tests/numeric/should_run/arith001.stdout-ghc
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith002.hs b/testsuite/tests/numeric/should_run/arith002.hs
index b7f5acf136..b7f5acf136 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith002.hs
+++ b/testsuite/tests/numeric/should_run/arith002.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith002.stdout b/testsuite/tests/numeric/should_run/arith002.stdout
index ab717549fd..ab717549fd 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith002.stdout
+++ b/testsuite/tests/numeric/should_run/arith002.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith002.stdout-ghc b/testsuite/tests/numeric/should_run/arith002.stdout-ghc
index ab717549fd..ab717549fd 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith002.stdout-ghc
+++ b/testsuite/tests/numeric/should_run/arith002.stdout-ghc
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith003.hs b/testsuite/tests/numeric/should_run/arith003.hs
index 46f008120a..46f008120a 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith003.hs
+++ b/testsuite/tests/numeric/should_run/arith003.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith003.stdout b/testsuite/tests/numeric/should_run/arith003.stdout
index a147c3003c..a147c3003c 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith003.stdout
+++ b/testsuite/tests/numeric/should_run/arith003.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith003.stdout-alpha-dec-osf3 b/testsuite/tests/numeric/should_run/arith003.stdout-alpha-dec-osf3
index 9ea4a0f2eb..9ea4a0f2eb 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith003.stdout-alpha-dec-osf3
+++ b/testsuite/tests/numeric/should_run/arith003.stdout-alpha-dec-osf3
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith003.stdout-mips-sgi-irix b/testsuite/tests/numeric/should_run/arith003.stdout-mips-sgi-irix
index 9ea4a0f2eb..9ea4a0f2eb 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith003.stdout-mips-sgi-irix
+++ b/testsuite/tests/numeric/should_run/arith003.stdout-mips-sgi-irix
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith003.stdout-ws-64 b/testsuite/tests/numeric/should_run/arith003.stdout-ws-64
index 9d8f7eee82..9d8f7eee82 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith003.stdout-ws-64
+++ b/testsuite/tests/numeric/should_run/arith003.stdout-ws-64
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith004.hs b/testsuite/tests/numeric/should_run/arith004.hs
index 68e601128e..68e601128e 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith004.hs
+++ b/testsuite/tests/numeric/should_run/arith004.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith004.stdout b/testsuite/tests/numeric/should_run/arith004.stdout
index 0ce885eb27..0ce885eb27 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith004.stdout
+++ b/testsuite/tests/numeric/should_run/arith004.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith005.hs b/testsuite/tests/numeric/should_run/arith005.hs
index 179d7b33dc..179d7b33dc 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith005.hs
+++ b/testsuite/tests/numeric/should_run/arith005.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith005.stdout b/testsuite/tests/numeric/should_run/arith005.stdout
index 8881543412..8881543412 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith005.stdout
+++ b/testsuite/tests/numeric/should_run/arith005.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith005.stdout-ws-64 b/testsuite/tests/numeric/should_run/arith005.stdout-ws-64
index 8881543412..8881543412 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith005.stdout-ws-64
+++ b/testsuite/tests/numeric/should_run/arith005.stdout-ws-64
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith006.hs b/testsuite/tests/numeric/should_run/arith006.hs
index b837692dae..b837692dae 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith006.hs
+++ b/testsuite/tests/numeric/should_run/arith006.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith006.stdout b/testsuite/tests/numeric/should_run/arith006.stdout
index 713c2229f5..713c2229f5 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith006.stdout
+++ b/testsuite/tests/numeric/should_run/arith006.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith007.hs b/testsuite/tests/numeric/should_run/arith007.hs
index 3d42d1fb10..3d42d1fb10 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith007.hs
+++ b/testsuite/tests/numeric/should_run/arith007.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith007.stdout b/testsuite/tests/numeric/should_run/arith007.stdout
index 1d7c97d108..1d7c97d108 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith007.stdout
+++ b/testsuite/tests/numeric/should_run/arith007.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith008.hs b/testsuite/tests/numeric/should_run/arith008.hs
index 15a3903a0e..15a3903a0e 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith008.hs
+++ b/testsuite/tests/numeric/should_run/arith008.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith008.stdout b/testsuite/tests/numeric/should_run/arith008.stdout
index 6a6007c745..6a6007c745 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith008.stdout
+++ b/testsuite/tests/numeric/should_run/arith008.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith009.hs b/testsuite/tests/numeric/should_run/arith009.hs
index 43fe1b2923..43fe1b2923 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith009.hs
+++ b/testsuite/tests/numeric/should_run/arith009.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith009.stdout b/testsuite/tests/numeric/should_run/arith009.stdout
index 949a11b741..949a11b741 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith009.stdout
+++ b/testsuite/tests/numeric/should_run/arith009.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith010.hs b/testsuite/tests/numeric/should_run/arith010.hs
index 846f76e4d1..846f76e4d1 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith010.hs
+++ b/testsuite/tests/numeric/should_run/arith010.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith010.stdout b/testsuite/tests/numeric/should_run/arith010.stdout
index e6a2b37721..e6a2b37721 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith010.stdout
+++ b/testsuite/tests/numeric/should_run/arith010.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith011.hs b/testsuite/tests/numeric/should_run/arith011.hs
index 308cc824a6..308cc824a6 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith011.hs
+++ b/testsuite/tests/numeric/should_run/arith011.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith011.stdout b/testsuite/tests/numeric/should_run/arith011.stdout
index 7404c4b353..7404c4b353 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith011.stdout
+++ b/testsuite/tests/numeric/should_run/arith011.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith011.stdout-alpha-dec-osf3 b/testsuite/tests/numeric/should_run/arith011.stdout-alpha-dec-osf3
index c6c1fd04e4..c6c1fd04e4 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith011.stdout-alpha-dec-osf3
+++ b/testsuite/tests/numeric/should_run/arith011.stdout-alpha-dec-osf3
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith011.stdout-mips-sgi-irix b/testsuite/tests/numeric/should_run/arith011.stdout-mips-sgi-irix
index 0e86320b3a..0e86320b3a 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith011.stdout-mips-sgi-irix
+++ b/testsuite/tests/numeric/should_run/arith011.stdout-mips-sgi-irix
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith011.stdout-ws-64 b/testsuite/tests/numeric/should_run/arith011.stdout-ws-64
index ff064a071d..ff064a071d 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith011.stdout-ws-64
+++ b/testsuite/tests/numeric/should_run/arith011.stdout-ws-64
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith012.hs b/testsuite/tests/numeric/should_run/arith012.hs
index f9f9ec778e..f9f9ec778e 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith012.hs
+++ b/testsuite/tests/numeric/should_run/arith012.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith012.stdout b/testsuite/tests/numeric/should_run/arith012.stdout
index c1c38c7f5a..c1c38c7f5a 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith012.stdout
+++ b/testsuite/tests/numeric/should_run/arith012.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith013.hs b/testsuite/tests/numeric/should_run/arith013.hs
index a03cbb3795..a03cbb3795 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith013.hs
+++ b/testsuite/tests/numeric/should_run/arith013.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith013.stdout b/testsuite/tests/numeric/should_run/arith013.stdout
index ff440977df..ff440977df 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith013.stdout
+++ b/testsuite/tests/numeric/should_run/arith013.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith014.hs b/testsuite/tests/numeric/should_run/arith014.hs
index 92fc362ee8..92fc362ee8 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith014.hs
+++ b/testsuite/tests/numeric/should_run/arith014.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith014.stdout b/testsuite/tests/numeric/should_run/arith014.stdout
index 9716a9fa88..9716a9fa88 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith014.stdout
+++ b/testsuite/tests/numeric/should_run/arith014.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith015.hs b/testsuite/tests/numeric/should_run/arith015.hs
index c1e58c0540..c1e58c0540 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith015.hs
+++ b/testsuite/tests/numeric/should_run/arith015.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith015.stdout b/testsuite/tests/numeric/should_run/arith015.stdout
index f5f8416a6b..f5f8416a6b 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith015.stdout
+++ b/testsuite/tests/numeric/should_run/arith015.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith016.hs b/testsuite/tests/numeric/should_run/arith016.hs
index 1437b8799d..1437b8799d 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith016.hs
+++ b/testsuite/tests/numeric/should_run/arith016.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith016.stdout b/testsuite/tests/numeric/should_run/arith016.stdout
index 5361a8e0bd..5361a8e0bd 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith016.stdout
+++ b/testsuite/tests/numeric/should_run/arith016.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith017.hs b/testsuite/tests/numeric/should_run/arith017.hs
index 86048dcbe3..86048dcbe3 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith017.hs
+++ b/testsuite/tests/numeric/should_run/arith017.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith017.stdout b/testsuite/tests/numeric/should_run/arith017.stdout
index b234817560..b234817560 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith017.stdout
+++ b/testsuite/tests/numeric/should_run/arith017.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith018.hs b/testsuite/tests/numeric/should_run/arith018.hs
index b73fd5a685..b73fd5a685 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith018.hs
+++ b/testsuite/tests/numeric/should_run/arith018.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith018.stdout b/testsuite/tests/numeric/should_run/arith018.stdout
index 21f7af65f9..21f7af65f9 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith018.stdout
+++ b/testsuite/tests/numeric/should_run/arith018.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith019.hs b/testsuite/tests/numeric/should_run/arith019.hs
index 861e9bc883..861e9bc883 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith019.hs
+++ b/testsuite/tests/numeric/should_run/arith019.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/arith019.stdout b/testsuite/tests/numeric/should_run/arith019.stdout
index 3830f20e11..3830f20e11 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/arith019.stdout
+++ b/testsuite/tests/numeric/should_run/arith019.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/expfloat.hs b/testsuite/tests/numeric/should_run/expfloat.hs
index fffa83d8f1..fffa83d8f1 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/expfloat.hs
+++ b/testsuite/tests/numeric/should_run/expfloat.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/expfloat.stdout b/testsuite/tests/numeric/should_run/expfloat.stdout
index 50eee0c4d6..50eee0c4d6 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/expfloat.stdout
+++ b/testsuite/tests/numeric/should_run/expfloat.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun009.hs b/testsuite/tests/numeric/should_run/numrun009.hs
index 37d0513a39..37d0513a39 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun009.hs
+++ b/testsuite/tests/numeric/should_run/numrun009.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun009.stdout b/testsuite/tests/numeric/should_run/numrun009.stdout
index 902e36915d..902e36915d 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun009.stdout
+++ b/testsuite/tests/numeric/should_run/numrun009.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun009.stdout-alpha-dec-osf3 b/testsuite/tests/numeric/should_run/numrun009.stdout-alpha-dec-osf3
index 8d37dbc11e..8d37dbc11e 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun009.stdout-alpha-dec-osf3
+++ b/testsuite/tests/numeric/should_run/numrun009.stdout-alpha-dec-osf3
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun009.stdout-mips-sgi-irix b/testsuite/tests/numeric/should_run/numrun009.stdout-mips-sgi-irix
index 8d37dbc11e..8d37dbc11e 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun009.stdout-mips-sgi-irix
+++ b/testsuite/tests/numeric/should_run/numrun009.stdout-mips-sgi-irix
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun009.stdout-ws-64 b/testsuite/tests/numeric/should_run/numrun009.stdout-ws-64
index 8d37dbc11e..8d37dbc11e 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun009.stdout-ws-64
+++ b/testsuite/tests/numeric/should_run/numrun009.stdout-ws-64
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun009.stdout-x86_64-unknown-openbsd b/testsuite/tests/numeric/should_run/numrun009.stdout-x86_64-unknown-openbsd
index 8d37dbc11e..8d37dbc11e 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun009.stdout-x86_64-unknown-openbsd
+++ b/testsuite/tests/numeric/should_run/numrun009.stdout-x86_64-unknown-openbsd
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun010.hs b/testsuite/tests/numeric/should_run/numrun010.hs
index 027b5e8d76..027b5e8d76 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun010.hs
+++ b/testsuite/tests/numeric/should_run/numrun010.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun010.stdout b/testsuite/tests/numeric/should_run/numrun010.stdout
index b4de394767..b4de394767 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun010.stdout
+++ b/testsuite/tests/numeric/should_run/numrun010.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun011.hs b/testsuite/tests/numeric/should_run/numrun011.hs
index d259613d2f..d259613d2f 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun011.hs
+++ b/testsuite/tests/numeric/should_run/numrun011.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun011.stdout b/testsuite/tests/numeric/should_run/numrun011.stdout
index 202e6ca9d7..202e6ca9d7 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun011.stdout
+++ b/testsuite/tests/numeric/should_run/numrun011.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun012.hs b/testsuite/tests/numeric/should_run/numrun012.hs
index df8c69040c..df8c69040c 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun012.hs
+++ b/testsuite/tests/numeric/should_run/numrun012.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun012.stdout b/testsuite/tests/numeric/should_run/numrun012.stdout
index f94829ccfd..f94829ccfd 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun012.stdout
+++ b/testsuite/tests/numeric/should_run/numrun012.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun012.stdout-ws-64 b/testsuite/tests/numeric/should_run/numrun012.stdout-ws-64
index ffd0389201..ffd0389201 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun012.stdout-ws-64
+++ b/testsuite/tests/numeric/should_run/numrun012.stdout-ws-64
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun013.hs b/testsuite/tests/numeric/should_run/numrun013.hs
index 93fe56f74c..93fe56f74c 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun013.hs
+++ b/testsuite/tests/numeric/should_run/numrun013.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun013.stdout b/testsuite/tests/numeric/should_run/numrun013.stdout
index 605f8e7cc0..605f8e7cc0 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun013.stdout
+++ b/testsuite/tests/numeric/should_run/numrun013.stdout
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun014.hs b/testsuite/tests/numeric/should_run/numrun014.hs
index 207e7663c0..207e7663c0 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun014.hs
+++ b/testsuite/tests/numeric/should_run/numrun014.hs
diff --git a/testsuite/tests/ghc-regress/numeric/should_run/numrun014.stdout b/testsuite/tests/numeric/should_run/numrun014.stdout
index 3bcfad620d..3bcfad620d 100644
--- a/testsuite/tests/ghc-regress/numeric/should_run/numrun014.stdout
+++ b/testsuite/tests/numeric/should_run/numrun014.stdout
diff --git a/testsuite/tests/parser/Makefile b/testsuite/tests/parser/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/parser/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/parser/prog001/Makefile b/testsuite/tests/parser/prog001/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/parser/prog001/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/parser/prog001/Read006.hs b/testsuite/tests/parser/prog001/Read006.hs
index 87546cb550..87546cb550 100644
--- a/testsuite/tests/ghc-regress/parser/prog001/Read006.hs
+++ b/testsuite/tests/parser/prog001/Read006.hs
diff --git a/testsuite/tests/ghc-regress/parser/prog001/Read007.hs b/testsuite/tests/parser/prog001/Read007.hs
index a0c2ec0f44..a0c2ec0f44 100644
--- a/testsuite/tests/ghc-regress/parser/prog001/Read007.hs
+++ b/testsuite/tests/parser/prog001/Read007.hs
diff --git a/testsuite/tests/ghc-regress/parser/prog001/test.T b/testsuite/tests/parser/prog001/test.T
index b667211196..b667211196 100644
--- a/testsuite/tests/ghc-regress/parser/prog001/test.T
+++ b/testsuite/tests/parser/prog001/test.T
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/DoAndIfThenElse.hs b/testsuite/tests/parser/should_compile/DoAndIfThenElse.hs
index 5bfb6edc86..5bfb6edc86 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/DoAndIfThenElse.hs
+++ b/testsuite/tests/parser/should_compile/DoAndIfThenElse.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/EmptyDecls.hs b/testsuite/tests/parser/should_compile/EmptyDecls.hs
index 9583f23e32..9583f23e32 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/EmptyDecls.hs
+++ b/testsuite/tests/parser/should_compile/EmptyDecls.hs
diff --git a/testsuite/tests/parser/should_compile/Makefile b/testsuite/tests/parser/should_compile/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/parser/should_compile/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/NondecreasingIndentation.hs b/testsuite/tests/parser/should_compile/NondecreasingIndentation.hs
index 05273097ed..05273097ed 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/NondecreasingIndentation.hs
+++ b/testsuite/tests/parser/should_compile/NondecreasingIndentation.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/T2245.hs b/testsuite/tests/parser/should_compile/T2245.hs
index bf8287ba33..bf8287ba33 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/T2245.hs
+++ b/testsuite/tests/parser/should_compile/T2245.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/T2245.stderr b/testsuite/tests/parser/should_compile/T2245.stderr
index b1754ff0c5..b1754ff0c5 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/T2245.stderr
+++ b/testsuite/tests/parser/should_compile/T2245.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/T3303.hs b/testsuite/tests/parser/should_compile/T3303.hs
index 08de52e6cd..08de52e6cd 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/T3303.hs
+++ b/testsuite/tests/parser/should_compile/T3303.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/T3303.stderr b/testsuite/tests/parser/should_compile/T3303.stderr
index 6e0b5629b3..6e0b5629b3 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/T3303.stderr
+++ b/testsuite/tests/parser/should_compile/T3303.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/T3303A.hs b/testsuite/tests/parser/should_compile/T3303A.hs
index daa4bfb91d..daa4bfb91d 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/T3303A.hs
+++ b/testsuite/tests/parser/should_compile/T3303A.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/T3741.hs b/testsuite/tests/parser/should_compile/T3741.hs
index 20d5c2d095..20d5c2d095 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/T3741.hs
+++ b/testsuite/tests/parser/should_compile/T3741.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/T5243.hs b/testsuite/tests/parser/should_compile/T5243.hs
index e58ace299b..e58ace299b 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/T5243.hs
+++ b/testsuite/tests/parser/should_compile/T5243.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/T5243.stderr b/testsuite/tests/parser/should_compile/T5243.stderr
index 450e001237..450e001237 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/T5243.stderr
+++ b/testsuite/tests/parser/should_compile/T5243.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/T5243A.hs b/testsuite/tests/parser/should_compile/T5243A.hs
index 2332c84004..2332c84004 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/T5243A.hs
+++ b/testsuite/tests/parser/should_compile/T5243A.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/all.T b/testsuite/tests/parser/should_compile/all.T
index 328c0651c3..328c0651c3 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/all.T
+++ b/testsuite/tests/parser/should_compile/all.T
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/mc15.hs b/testsuite/tests/parser/should_compile/mc15.hs
index 2976694803..2976694803 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/mc15.hs
+++ b/testsuite/tests/parser/should_compile/mc15.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/mc16.hs b/testsuite/tests/parser/should_compile/mc16.hs
index 3f80c04abb..3f80c04abb 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/mc16.hs
+++ b/testsuite/tests/parser/should_compile/mc16.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read001.hs b/testsuite/tests/parser/should_compile/read001.hs
index d0a84ff7e5..d0a84ff7e5 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read001.hs
+++ b/testsuite/tests/parser/should_compile/read001.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read002.hs b/testsuite/tests/parser/should_compile/read002.hs
index 5b069fe2c6..5b069fe2c6 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read002.hs
+++ b/testsuite/tests/parser/should_compile/read002.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read002.stderr b/testsuite/tests/parser/should_compile/read002.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read002.stderr
+++ b/testsuite/tests/parser/should_compile/read002.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read003.hs b/testsuite/tests/parser/should_compile/read003.hs
index afc3a21007..afc3a21007 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read003.hs
+++ b/testsuite/tests/parser/should_compile/read003.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read004.hs b/testsuite/tests/parser/should_compile/read004.hs
index 0741d0cd92..0741d0cd92 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read004.hs
+++ b/testsuite/tests/parser/should_compile/read004.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read005.hs b/testsuite/tests/parser/should_compile/read005.hs
index 6e2c575902..6e2c575902 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read005.hs
+++ b/testsuite/tests/parser/should_compile/read005.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read007.stderr b/testsuite/tests/parser/should_compile/read007.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read007.stderr
+++ b/testsuite/tests/parser/should_compile/read007.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read008.hs b/testsuite/tests/parser/should_compile/read008.hs
index 20060b0c4d..20060b0c4d 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read008.hs
+++ b/testsuite/tests/parser/should_compile/read008.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read009.hs b/testsuite/tests/parser/should_compile/read009.hs
index 5294012de1..5294012de1 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read009.hs
+++ b/testsuite/tests/parser/should_compile/read009.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read010.hs b/testsuite/tests/parser/should_compile/read010.hs
index d20f5fcc86..d20f5fcc86 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read010.hs
+++ b/testsuite/tests/parser/should_compile/read010.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read010.stderr b/testsuite/tests/parser/should_compile/read010.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read010.stderr
+++ b/testsuite/tests/parser/should_compile/read010.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read011.hs b/testsuite/tests/parser/should_compile/read011.hs
index 7e20d468f0..7e20d468f0 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read011.hs
+++ b/testsuite/tests/parser/should_compile/read011.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read014.hs b/testsuite/tests/parser/should_compile/read014.hs
index 55fc053a8b..55fc053a8b 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read014.hs
+++ b/testsuite/tests/parser/should_compile/read014.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read014.stderr-ghc b/testsuite/tests/parser/should_compile/read014.stderr-ghc
index 85f36b16da..85f36b16da 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read014.stderr-ghc
+++ b/testsuite/tests/parser/should_compile/read014.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read015.hs b/testsuite/tests/parser/should_compile/read015.hs
index 7ba6140662..7ba6140662 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read015.hs
+++ b/testsuite/tests/parser/should_compile/read015.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read016.hs b/testsuite/tests/parser/should_compile/read016.hs
index 5c482f510d..5c482f510d 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read016.hs
+++ b/testsuite/tests/parser/should_compile/read016.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read017.hs b/testsuite/tests/parser/should_compile/read017.hs
index 4349cb27ca..4349cb27ca 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read017.hs
+++ b/testsuite/tests/parser/should_compile/read017.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read018.hs b/testsuite/tests/parser/should_compile/read018.hs
index 91eef518be..91eef518be 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read018.hs
+++ b/testsuite/tests/parser/should_compile/read018.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read018.stderr b/testsuite/tests/parser/should_compile/read018.stderr
index 30d1315840..30d1315840 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read018.stderr
+++ b/testsuite/tests/parser/should_compile/read018.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read019.hs b/testsuite/tests/parser/should_compile/read019.hs
index 3de6a9b71d..3de6a9b71d 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read019.hs
+++ b/testsuite/tests/parser/should_compile/read019.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read021.hs b/testsuite/tests/parser/should_compile/read021.hs
index 8d5856e9b6..8d5856e9b6 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read021.hs
+++ b/testsuite/tests/parser/should_compile/read021.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read022.hs b/testsuite/tests/parser/should_compile/read022.hs
index 4ab04cabb8..4ab04cabb8 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read022.hs
+++ b/testsuite/tests/parser/should_compile/read022.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read023.hs b/testsuite/tests/parser/should_compile/read023.hs
index 3410afe946..3410afe946 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read023.hs
+++ b/testsuite/tests/parser/should_compile/read023.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read024.hs b/testsuite/tests/parser/should_compile/read024.hs
index f00ddb002c..f00ddb002c 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read024.hs
+++ b/testsuite/tests/parser/should_compile/read024.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read025.hs b/testsuite/tests/parser/should_compile/read025.hs
index 7eca04e85c..7eca04e85c 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read025.hs
+++ b/testsuite/tests/parser/should_compile/read025.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read026.hs b/testsuite/tests/parser/should_compile/read026.hs
index 0ea695d373..0ea695d373 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read026.hs
+++ b/testsuite/tests/parser/should_compile/read026.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read027.hs b/testsuite/tests/parser/should_compile/read027.hs
index a6893450f8..a6893450f8 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read027.hs
+++ b/testsuite/tests/parser/should_compile/read027.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read028.hs b/testsuite/tests/parser/should_compile/read028.hs
index 1f193a4584..1f193a4584 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read028.hs
+++ b/testsuite/tests/parser/should_compile/read028.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read029.hs b/testsuite/tests/parser/should_compile/read029.hs
index 1a9e5c1c9e..1a9e5c1c9e 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read029.hs
+++ b/testsuite/tests/parser/should_compile/read029.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read030.hs b/testsuite/tests/parser/should_compile/read030.hs
index 26883024ee..26883024ee 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read030.hs
+++ b/testsuite/tests/parser/should_compile/read030.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read031.hs b/testsuite/tests/parser/should_compile/read031.hs
index d19f120ffd..d19f120ffd 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read031.hs
+++ b/testsuite/tests/parser/should_compile/read031.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read032.hs b/testsuite/tests/parser/should_compile/read032.hs
index 634f6b5fa9..634f6b5fa9 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read032.hs
+++ b/testsuite/tests/parser/should_compile/read032.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read033.hs b/testsuite/tests/parser/should_compile/read033.hs
index 2c8faf0343..2c8faf0343 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read033.hs
+++ b/testsuite/tests/parser/should_compile/read033.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read034.hs b/testsuite/tests/parser/should_compile/read034.hs
index 4fa7152f40..4fa7152f40 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read034.hs
+++ b/testsuite/tests/parser/should_compile/read034.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read036.hs b/testsuite/tests/parser/should_compile/read036.hs
index 81485f5a0f..81485f5a0f 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read036.hs
+++ b/testsuite/tests/parser/should_compile/read036.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read037.hs b/testsuite/tests/parser/should_compile/read037.hs
index a9f822cc03..a9f822cc03 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read037.hs
+++ b/testsuite/tests/parser/should_compile/read037.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read038.hs b/testsuite/tests/parser/should_compile/read038.hs
index 30e20774fa..30e20774fa 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read038.hs
+++ b/testsuite/tests/parser/should_compile/read038.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read039.hs b/testsuite/tests/parser/should_compile/read039.hs
index 032c64f624..032c64f624 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read039.hs
+++ b/testsuite/tests/parser/should_compile/read039.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read040.hs b/testsuite/tests/parser/should_compile/read040.hs
index e6d6629744..e6d6629744 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read040.hs
+++ b/testsuite/tests/parser/should_compile/read040.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read041.lhs b/testsuite/tests/parser/should_compile/read041.lhs
index 30274e85a1..30274e85a1 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read041.lhs
+++ b/testsuite/tests/parser/should_compile/read041.lhs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read042.hs b/testsuite/tests/parser/should_compile/read042.hs
index 922b7b12bb..922b7b12bb 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read042.hs
+++ b/testsuite/tests/parser/should_compile/read042.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read043.hs b/testsuite/tests/parser/should_compile/read043.hs
index c663a7526e..c663a7526e 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read043.hs
+++ b/testsuite/tests/parser/should_compile/read043.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read043.stderr b/testsuite/tests/parser/should_compile/read043.stderr
index dc1e84466a..dc1e84466a 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read043.stderr
+++ b/testsuite/tests/parser/should_compile/read043.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read044.hs b/testsuite/tests/parser/should_compile/read044.hs
index a92b48c298..a92b48c298 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read044.hs
+++ b/testsuite/tests/parser/should_compile/read044.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read045.hs b/testsuite/tests/parser/should_compile/read045.hs
index 844acdfc82..844acdfc82 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read045.hs
+++ b/testsuite/tests/parser/should_compile/read045.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read046.hs b/testsuite/tests/parser/should_compile/read046.hs
index 5cc602f5a4..5cc602f5a4 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read046.hs
+++ b/testsuite/tests/parser/should_compile/read046.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read047.hs b/testsuite/tests/parser/should_compile/read047.hs
index 0c7470156d..0c7470156d 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read047.hs
+++ b/testsuite/tests/parser/should_compile/read047.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read048.hs b/testsuite/tests/parser/should_compile/read048.hs
index cd8c974af6..cd8c974af6 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read048.hs
+++ b/testsuite/tests/parser/should_compile/read048.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read049.hs b/testsuite/tests/parser/should_compile/read049.hs
index 8337a79634..8337a79634 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read049.hs
+++ b/testsuite/tests/parser/should_compile/read049.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read050.hs b/testsuite/tests/parser/should_compile/read050.hs
index d991bb01c7..d991bb01c7 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read050.hs
+++ b/testsuite/tests/parser/should_compile/read050.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read051.hs b/testsuite/tests/parser/should_compile/read051.hs
index 3e95241862..3e95241862 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read051.hs
+++ b/testsuite/tests/parser/should_compile/read051.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read052.hs b/testsuite/tests/parser/should_compile/read052.hs
index 8c65e62a1b..8c65e62a1b 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read052.hs
+++ b/testsuite/tests/parser/should_compile/read052.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read053.hs b/testsuite/tests/parser/should_compile/read053.hs
index a277f31257..a277f31257 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read053.hs
+++ b/testsuite/tests/parser/should_compile/read053.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read054.hs b/testsuite/tests/parser/should_compile/read054.hs
index 4e0c589bf3..4e0c589bf3 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read054.hs
+++ b/testsuite/tests/parser/should_compile/read054.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read055.hs b/testsuite/tests/parser/should_compile/read055.hs
index 25db332a4d..25db332a4d 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read055.hs
+++ b/testsuite/tests/parser/should_compile/read055.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read056.hs b/testsuite/tests/parser/should_compile/read056.hs
index bab900ad6a..bab900ad6a 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read056.hs
+++ b/testsuite/tests/parser/should_compile/read056.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read057.hs b/testsuite/tests/parser/should_compile/read057.hs
index f2cf84b3b5..f2cf84b3b5 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read057.hs
+++ b/testsuite/tests/parser/should_compile/read057.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read058.hs b/testsuite/tests/parser/should_compile/read058.hs
index 9d4f766ada..9d4f766ada 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read058.hs
+++ b/testsuite/tests/parser/should_compile/read058.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read058.stderr b/testsuite/tests/parser/should_compile/read058.stderr
index aa42286c89..aa42286c89 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read058.stderr
+++ b/testsuite/tests/parser/should_compile/read058.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read059.hs b/testsuite/tests/parser/should_compile/read059.hs
index 79989afd3f..79989afd3f 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read059.hs
+++ b/testsuite/tests/parser/should_compile/read059.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read059.stderr b/testsuite/tests/parser/should_compile/read059.stderr
index 5d2ae6c397..5d2ae6c397 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read059.stderr
+++ b/testsuite/tests/parser/should_compile/read059.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read060.hs b/testsuite/tests/parser/should_compile/read060.hs
index 1b07dfa397..1b07dfa397 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read060.hs
+++ b/testsuite/tests/parser/should_compile/read060.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read061.hs b/testsuite/tests/parser/should_compile/read061.hs
index 1820e460f3..1820e460f3 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read061.hs
+++ b/testsuite/tests/parser/should_compile/read061.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read062.hs b/testsuite/tests/parser/should_compile/read062.hs
index 4d57585c10..4d57585c10 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read062.hs
+++ b/testsuite/tests/parser/should_compile/read062.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read063.hs b/testsuite/tests/parser/should_compile/read063.hs
index faa7c4a4a5..faa7c4a4a5 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read063.hs
+++ b/testsuite/tests/parser/should_compile/read063.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read064.hs b/testsuite/tests/parser/should_compile/read064.hs
index 386574244f..386574244f 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read064.hs
+++ b/testsuite/tests/parser/should_compile/read064.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read064.stderr b/testsuite/tests/parser/should_compile/read064.stderr
index 8ed04fc629..8ed04fc629 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read064.stderr
+++ b/testsuite/tests/parser/should_compile/read064.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read066.hs b/testsuite/tests/parser/should_compile/read066.hs
index 374f76126c..374f76126c 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read066.hs
+++ b/testsuite/tests/parser/should_compile/read066.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read066.stderr b/testsuite/tests/parser/should_compile/read066.stderr
index a094133754..a094133754 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read066.stderr
+++ b/testsuite/tests/parser/should_compile/read066.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read067.hs b/testsuite/tests/parser/should_compile/read067.hs
index f65f56b498..f65f56b498 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read067.hs
+++ b/testsuite/tests/parser/should_compile/read067.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read068.hs b/testsuite/tests/parser/should_compile/read068.hs
index b6cf24fd0c..b6cf24fd0c 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read068.hs
+++ b/testsuite/tests/parser/should_compile/read068.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read069.hs b/testsuite/tests/parser/should_compile/read069.hs
index cff74b474b..cff74b474b 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read069.hs
+++ b/testsuite/tests/parser/should_compile/read069.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_compile/read_1821.hs b/testsuite/tests/parser/should_compile/read_1821.hs
index f9669ab053..f9669ab053 100644
--- a/testsuite/tests/ghc-regress/parser/should_compile/read_1821.hs
+++ b/testsuite/tests/parser/should_compile/read_1821.hs
diff --git a/testsuite/tests/parser/should_fail/Makefile b/testsuite/tests/parser/should_fail/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/parser/should_fail/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/NoDoAndIfThenElse.hs b/testsuite/tests/parser/should_fail/NoDoAndIfThenElse.hs
index 2439205e3e..2439205e3e 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/NoDoAndIfThenElse.hs
+++ b/testsuite/tests/parser/should_fail/NoDoAndIfThenElse.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/NoDoAndIfThenElse.stderr b/testsuite/tests/parser/should_fail/NoDoAndIfThenElse.stderr
index b175c0ac5e..b175c0ac5e 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/NoDoAndIfThenElse.stderr
+++ b/testsuite/tests/parser/should_fail/NoDoAndIfThenElse.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/NondecreasingIndentationFail.hs b/testsuite/tests/parser/should_fail/NondecreasingIndentationFail.hs
index 5b67a60612..5b67a60612 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/NondecreasingIndentationFail.hs
+++ b/testsuite/tests/parser/should_fail/NondecreasingIndentationFail.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/NondecreasingIndentationFail.stderr b/testsuite/tests/parser/should_fail/NondecreasingIndentationFail.stderr
index c9ccd3ea53..c9ccd3ea53 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/NondecreasingIndentationFail.stderr
+++ b/testsuite/tests/parser/should_fail/NondecreasingIndentationFail.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T1344a.hs b/testsuite/tests/parser/should_fail/T1344a.hs
index 709d1636c0..709d1636c0 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T1344a.hs
+++ b/testsuite/tests/parser/should_fail/T1344a.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T1344a.stderr b/testsuite/tests/parser/should_fail/T1344a.stderr
index a7c203c1c5..a7c203c1c5 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T1344a.stderr
+++ b/testsuite/tests/parser/should_fail/T1344a.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T1344b.hs b/testsuite/tests/parser/should_fail/T1344b.hs
index b355dda5e6..b355dda5e6 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T1344b.hs
+++ b/testsuite/tests/parser/should_fail/T1344b.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T1344b.stderr b/testsuite/tests/parser/should_fail/T1344b.stderr
index 7b05c0fb2b..7b05c0fb2b 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T1344b.stderr
+++ b/testsuite/tests/parser/should_fail/T1344b.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T1344c.hs b/testsuite/tests/parser/should_fail/T1344c.hs
index 0e5d0c6190..0e5d0c6190 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T1344c.hs
+++ b/testsuite/tests/parser/should_fail/T1344c.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T1344c.stderr b/testsuite/tests/parser/should_fail/T1344c.stderr
index 57ad0592bd..57ad0592bd 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T1344c.stderr
+++ b/testsuite/tests/parser/should_fail/T1344c.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3095.hs b/testsuite/tests/parser/should_fail/T3095.hs
index ad6b62c562..ad6b62c562 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3095.hs
+++ b/testsuite/tests/parser/should_fail/T3095.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3095.stderr b/testsuite/tests/parser/should_fail/T3095.stderr
index 3e47128e41..3e47128e41 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3095.stderr
+++ b/testsuite/tests/parser/should_fail/T3095.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3153.hs b/testsuite/tests/parser/should_fail/T3153.hs
index af28ddc98c..af28ddc98c 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3153.hs
+++ b/testsuite/tests/parser/should_fail/T3153.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3153.stderr b/testsuite/tests/parser/should_fail/T3153.stderr
index 5a21b339aa..5a21b339aa 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3153.stderr
+++ b/testsuite/tests/parser/should_fail/T3153.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3751.hs b/testsuite/tests/parser/should_fail/T3751.hs
index 9de569b01f..9de569b01f 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3751.hs
+++ b/testsuite/tests/parser/should_fail/T3751.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3751.stderr b/testsuite/tests/parser/should_fail/T3751.stderr
index cf14e746e1..cf14e746e1 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3751.stderr
+++ b/testsuite/tests/parser/should_fail/T3751.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3811.hs b/testsuite/tests/parser/should_fail/T3811.hs
index 30c1f5068f..30c1f5068f 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3811.hs
+++ b/testsuite/tests/parser/should_fail/T3811.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3811.stderr b/testsuite/tests/parser/should_fail/T3811.stderr
index afdead696e..afdead696e 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3811.stderr
+++ b/testsuite/tests/parser/should_fail/T3811.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3811b.hs b/testsuite/tests/parser/should_fail/T3811b.hs
index 720cffa17f..720cffa17f 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3811b.hs
+++ b/testsuite/tests/parser/should_fail/T3811b.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3811b.stderr b/testsuite/tests/parser/should_fail/T3811b.stderr
index 342354dd84..342354dd84 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3811b.stderr
+++ b/testsuite/tests/parser/should_fail/T3811b.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3811c.hs b/testsuite/tests/parser/should_fail/T3811c.hs
index d2b063c54f..d2b063c54f 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3811c.hs
+++ b/testsuite/tests/parser/should_fail/T3811c.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3811c.stderr b/testsuite/tests/parser/should_fail/T3811c.stderr
index 9b61341152..9b61341152 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3811c.stderr
+++ b/testsuite/tests/parser/should_fail/T3811c.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3811d.hs b/testsuite/tests/parser/should_fail/T3811d.hs
index ee95cd862d..ee95cd862d 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3811d.hs
+++ b/testsuite/tests/parser/should_fail/T3811d.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3811d.stderr b/testsuite/tests/parser/should_fail/T3811d.stderr
index 6f6e6c4267..6f6e6c4267 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3811d.stderr
+++ b/testsuite/tests/parser/should_fail/T3811d.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3811e.hs b/testsuite/tests/parser/should_fail/T3811e.hs
index 69a559c9c4..69a559c9c4 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3811e.hs
+++ b/testsuite/tests/parser/should_fail/T3811e.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3811e.stderr b/testsuite/tests/parser/should_fail/T3811e.stderr
index f2acc84706..f2acc84706 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3811e.stderr
+++ b/testsuite/tests/parser/should_fail/T3811e.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3811f.hs b/testsuite/tests/parser/should_fail/T3811f.hs
index a047feed72..a047feed72 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3811f.hs
+++ b/testsuite/tests/parser/should_fail/T3811f.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3811f.stderr b/testsuite/tests/parser/should_fail/T3811f.stderr
index 882ae06706..882ae06706 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3811f.stderr
+++ b/testsuite/tests/parser/should_fail/T3811f.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3811g.hs b/testsuite/tests/parser/should_fail/T3811g.hs
index 8b901f49e3..8b901f49e3 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3811g.hs
+++ b/testsuite/tests/parser/should_fail/T3811g.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/T3811g.stderr b/testsuite/tests/parser/should_fail/T3811g.stderr
index 94917e52ae..94917e52ae 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/T3811g.stderr
+++ b/testsuite/tests/parser/should_fail/T3811g.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/all.T b/testsuite/tests/parser/should_fail/all.T
index 31ec0d9a3e..31ec0d9a3e 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/all.T
+++ b/testsuite/tests/parser/should_fail/all.T
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/position001.hs b/testsuite/tests/parser/should_fail/position001.hs
index c47ed60a1b..c47ed60a1b 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/position001.hs
+++ b/testsuite/tests/parser/should_fail/position001.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/position001.stderr b/testsuite/tests/parser/should_fail/position001.stderr
index 0635c8d867..0635c8d867 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/position001.stderr
+++ b/testsuite/tests/parser/should_fail/position001.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/position002.hs b/testsuite/tests/parser/should_fail/position002.hs
index 861acf5344..861acf5344 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/position002.hs
+++ b/testsuite/tests/parser/should_fail/position002.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/position002.stderr b/testsuite/tests/parser/should_fail/position002.stderr
index 9306d42fb8..9306d42fb8 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/position002.stderr
+++ b/testsuite/tests/parser/should_fail/position002.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail001.hs b/testsuite/tests/parser/should_fail/readFail001.hs
index a996475efd..a996475efd 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail001.hs
+++ b/testsuite/tests/parser/should_fail/readFail001.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail001.stderr b/testsuite/tests/parser/should_fail/readFail001.stderr
index 719d4c12bd..719d4c12bd 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail001.stderr
+++ b/testsuite/tests/parser/should_fail/readFail001.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail001.stderr-hugs b/testsuite/tests/parser/should_fail/readFail001.stderr-hugs
index ab30ff6dc0..ab30ff6dc0 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail001.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail001.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail001.stdout b/testsuite/tests/parser/should_fail/readFail001.stdout
index a4d6758f8c..a4d6758f8c 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail001.stdout
+++ b/testsuite/tests/parser/should_fail/readFail001.stdout
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail002.hs b/testsuite/tests/parser/should_fail/readFail002.hs
index 869cb86a33..869cb86a33 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail002.hs
+++ b/testsuite/tests/parser/should_fail/readFail002.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail002.stderr b/testsuite/tests/parser/should_fail/readFail002.stderr
index d368fe302d..d368fe302d 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail002.stderr
+++ b/testsuite/tests/parser/should_fail/readFail002.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail002.stderr-hugs b/testsuite/tests/parser/should_fail/readFail002.stderr-hugs
index 12031904f7..12031904f7 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail002.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail002.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail003.hs b/testsuite/tests/parser/should_fail/readFail003.hs
index 8595312137..8595312137 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail003.hs
+++ b/testsuite/tests/parser/should_fail/readFail003.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail003.stderr b/testsuite/tests/parser/should_fail/readFail003.stderr
index fe8ce00577..fe8ce00577 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail003.stderr
+++ b/testsuite/tests/parser/should_fail/readFail003.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail003.stderr-hugs b/testsuite/tests/parser/should_fail/readFail003.stderr-hugs
index d89db6e928..d89db6e928 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail003.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail003.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail003.stdout b/testsuite/tests/parser/should_fail/readFail003.stdout
index e1291a62a7..e1291a62a7 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail003.stdout
+++ b/testsuite/tests/parser/should_fail/readFail003.stdout
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail004.hs b/testsuite/tests/parser/should_fail/readFail004.hs
index f5e1fb4304..f5e1fb4304 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail004.hs
+++ b/testsuite/tests/parser/should_fail/readFail004.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail004.stderr b/testsuite/tests/parser/should_fail/readFail004.stderr
index 45ad7d7215..45ad7d7215 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail004.stderr
+++ b/testsuite/tests/parser/should_fail/readFail004.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail004.stderr-hugs b/testsuite/tests/parser/should_fail/readFail004.stderr-hugs
index a737a0100e..a737a0100e 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail004.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail004.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail005.hs b/testsuite/tests/parser/should_fail/readFail005.hs
index 8ed88c0ea0..8ed88c0ea0 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail005.hs
+++ b/testsuite/tests/parser/should_fail/readFail005.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail005.stderr b/testsuite/tests/parser/should_fail/readFail005.stderr
index 6b5b2ce9e2..6b5b2ce9e2 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail005.stderr
+++ b/testsuite/tests/parser/should_fail/readFail005.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail005.stderr-hugs b/testsuite/tests/parser/should_fail/readFail005.stderr-hugs
index bda4ebcd9d..bda4ebcd9d 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail005.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail005.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail006.hs b/testsuite/tests/parser/should_fail/readFail006.hs
index fa3d867c67..fa3d867c67 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail006.hs
+++ b/testsuite/tests/parser/should_fail/readFail006.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail006.stderr b/testsuite/tests/parser/should_fail/readFail006.stderr
index 92ea7a484d..92ea7a484d 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail006.stderr
+++ b/testsuite/tests/parser/should_fail/readFail006.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail006.stderr-hugs b/testsuite/tests/parser/should_fail/readFail006.stderr-hugs
index f39482998c..f39482998c 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail006.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail006.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail007.hs b/testsuite/tests/parser/should_fail/readFail007.hs
index 4466f17d18..4466f17d18 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail007.hs
+++ b/testsuite/tests/parser/should_fail/readFail007.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail007.stderr b/testsuite/tests/parser/should_fail/readFail007.stderr
index 3236824a78..3236824a78 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail007.stderr
+++ b/testsuite/tests/parser/should_fail/readFail007.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail007.stdout b/testsuite/tests/parser/should_fail/readFail007.stdout
index c91365d679..c91365d679 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail007.stdout
+++ b/testsuite/tests/parser/should_fail/readFail007.stdout
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail008.hs b/testsuite/tests/parser/should_fail/readFail008.hs
index 606af912f0..606af912f0 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail008.hs
+++ b/testsuite/tests/parser/should_fail/readFail008.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail008.stderr b/testsuite/tests/parser/should_fail/readFail008.stderr
index a40ce01da0..a40ce01da0 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail008.stderr
+++ b/testsuite/tests/parser/should_fail/readFail008.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail008.stderr-hugs b/testsuite/tests/parser/should_fail/readFail008.stderr-hugs
index 73edc248e9..73edc248e9 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail008.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail008.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail009.hs b/testsuite/tests/parser/should_fail/readFail009.hs
index 93a7b84d5b..93a7b84d5b 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail009.hs
+++ b/testsuite/tests/parser/should_fail/readFail009.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail009.stderr b/testsuite/tests/parser/should_fail/readFail009.stderr
index 7f5684e2c5..7f5684e2c5 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail009.stderr
+++ b/testsuite/tests/parser/should_fail/readFail009.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail009.stderr-hugs b/testsuite/tests/parser/should_fail/readFail009.stderr-hugs
index 698df240cc..698df240cc 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail009.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail009.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail009.stdout b/testsuite/tests/parser/should_fail/readFail009.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail009.stdout
+++ b/testsuite/tests/parser/should_fail/readFail009.stdout
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail011.hs b/testsuite/tests/parser/should_fail/readFail011.hs
index 4642061fcc..4642061fcc 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail011.hs
+++ b/testsuite/tests/parser/should_fail/readFail011.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail011.stderr b/testsuite/tests/parser/should_fail/readFail011.stderr
index 2570aa357e..2570aa357e 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail011.stderr
+++ b/testsuite/tests/parser/should_fail/readFail011.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail011.stderr-hugs b/testsuite/tests/parser/should_fail/readFail011.stderr-hugs
index 03d0dda838..03d0dda838 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail011.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail011.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail012.hs b/testsuite/tests/parser/should_fail/readFail012.hs
index 4a780885f7..4a780885f7 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail012.hs
+++ b/testsuite/tests/parser/should_fail/readFail012.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail012.stderr b/testsuite/tests/parser/should_fail/readFail012.stderr
index 849e918204..849e918204 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail012.stderr
+++ b/testsuite/tests/parser/should_fail/readFail012.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail012.stderr-hugs b/testsuite/tests/parser/should_fail/readFail012.stderr-hugs
index 242a34ef34..242a34ef34 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail012.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail012.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail013.hs b/testsuite/tests/parser/should_fail/readFail013.hs
index 97e926d49c..97e926d49c 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail013.hs
+++ b/testsuite/tests/parser/should_fail/readFail013.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail013.stderr b/testsuite/tests/parser/should_fail/readFail013.stderr
index 9be590d0b0..9be590d0b0 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail013.stderr
+++ b/testsuite/tests/parser/should_fail/readFail013.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail013.stderr-hugs b/testsuite/tests/parser/should_fail/readFail013.stderr-hugs
index 11bb7156f5..11bb7156f5 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail013.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail013.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail014.hs b/testsuite/tests/parser/should_fail/readFail014.hs
index 23ef7954a6..23ef7954a6 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail014.hs
+++ b/testsuite/tests/parser/should_fail/readFail014.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail014.stderr b/testsuite/tests/parser/should_fail/readFail014.stderr
index 4bb5fff2da..4bb5fff2da 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail014.stderr
+++ b/testsuite/tests/parser/should_fail/readFail014.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail014.stderr-hugs b/testsuite/tests/parser/should_fail/readFail014.stderr-hugs
index 73e29ecbb0..73e29ecbb0 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail014.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail014.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail015.hs b/testsuite/tests/parser/should_fail/readFail015.hs
index 6920083483..6920083483 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail015.hs
+++ b/testsuite/tests/parser/should_fail/readFail015.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail015.stderr b/testsuite/tests/parser/should_fail/readFail015.stderr
index 696167edca..696167edca 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail015.stderr
+++ b/testsuite/tests/parser/should_fail/readFail015.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail015.stderr-hugs b/testsuite/tests/parser/should_fail/readFail015.stderr-hugs
index c66b668cf5..c66b668cf5 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail015.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail015.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail016.hs b/testsuite/tests/parser/should_fail/readFail016.hs
index 493606a481..493606a481 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail016.hs
+++ b/testsuite/tests/parser/should_fail/readFail016.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail016.stderr b/testsuite/tests/parser/should_fail/readFail016.stderr
index 620d8505a2..620d8505a2 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail016.stderr
+++ b/testsuite/tests/parser/should_fail/readFail016.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail016.stdout b/testsuite/tests/parser/should_fail/readFail016.stdout
index 7c7f529466..7c7f529466 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail016.stdout
+++ b/testsuite/tests/parser/should_fail/readFail016.stdout
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail017.hs b/testsuite/tests/parser/should_fail/readFail017.hs
index 1d710f5012..1d710f5012 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail017.hs
+++ b/testsuite/tests/parser/should_fail/readFail017.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail017.stderr b/testsuite/tests/parser/should_fail/readFail017.stderr
index 05f7c9931f..05f7c9931f 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail017.stderr
+++ b/testsuite/tests/parser/should_fail/readFail017.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail017.stderr-hugs b/testsuite/tests/parser/should_fail/readFail017.stderr-hugs
index a83103a57b..a83103a57b 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail017.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail017.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail018.hs b/testsuite/tests/parser/should_fail/readFail018.hs
index 0086f50466..0086f50466 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail018.hs
+++ b/testsuite/tests/parser/should_fail/readFail018.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail018.stderr b/testsuite/tests/parser/should_fail/readFail018.stderr
index d07aa622c0..d07aa622c0 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail018.stderr
+++ b/testsuite/tests/parser/should_fail/readFail018.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail018.stderr-hugs b/testsuite/tests/parser/should_fail/readFail018.stderr-hugs
index 57c04a5826..57c04a5826 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail018.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail018.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail019.hs b/testsuite/tests/parser/should_fail/readFail019.hs
index c9fdd15f75..c9fdd15f75 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail019.hs
+++ b/testsuite/tests/parser/should_fail/readFail019.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail019.stderr b/testsuite/tests/parser/should_fail/readFail019.stderr
index 65f7580599..65f7580599 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail019.stderr
+++ b/testsuite/tests/parser/should_fail/readFail019.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail019.stderr-hugs b/testsuite/tests/parser/should_fail/readFail019.stderr-hugs
index fc021de327..fc021de327 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail019.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail019.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail020.hs b/testsuite/tests/parser/should_fail/readFail020.hs
index d7cf818e23..d7cf818e23 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail020.hs
+++ b/testsuite/tests/parser/should_fail/readFail020.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail020.stderr b/testsuite/tests/parser/should_fail/readFail020.stderr
index fb81cef861..fb81cef861 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail020.stderr
+++ b/testsuite/tests/parser/should_fail/readFail020.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail020.stderr-hugs b/testsuite/tests/parser/should_fail/readFail020.stderr-hugs
index 2fe580ec23..2fe580ec23 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail020.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail020.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail021.hs b/testsuite/tests/parser/should_fail/readFail021.hs
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail021.hs
+++ b/testsuite/tests/parser/should_fail/readFail021.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail021.stderr b/testsuite/tests/parser/should_fail/readFail021.stderr
index a3f5e7b3f0..a3f5e7b3f0 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail021.stderr
+++ b/testsuite/tests/parser/should_fail/readFail021.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail022.hs b/testsuite/tests/parser/should_fail/readFail022.hs
index 8d63b44b40..8d63b44b40 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail022.hs
+++ b/testsuite/tests/parser/should_fail/readFail022.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail022.stderr b/testsuite/tests/parser/should_fail/readFail022.stderr
index 2c1b254229..2c1b254229 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail022.stderr
+++ b/testsuite/tests/parser/should_fail/readFail022.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail022.stderr-hugs b/testsuite/tests/parser/should_fail/readFail022.stderr-hugs
index d0315f1914..d0315f1914 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail022.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail022.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail023.hs b/testsuite/tests/parser/should_fail/readFail023.hs
index 9c230f8a6a..9c230f8a6a 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail023.hs
+++ b/testsuite/tests/parser/should_fail/readFail023.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail023.stderr b/testsuite/tests/parser/should_fail/readFail023.stderr
index e1b6ceb83c..e1b6ceb83c 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail023.stderr
+++ b/testsuite/tests/parser/should_fail/readFail023.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail024.hs b/testsuite/tests/parser/should_fail/readFail024.hs
index 70f38329ae..70f38329ae 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail024.hs
+++ b/testsuite/tests/parser/should_fail/readFail024.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail024.stderr b/testsuite/tests/parser/should_fail/readFail024.stderr
index 01d32ec450..01d32ec450 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail024.stderr
+++ b/testsuite/tests/parser/should_fail/readFail024.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail024.stderr-hugs b/testsuite/tests/parser/should_fail/readFail024.stderr-hugs
index 542507b0a6..542507b0a6 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail024.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail024.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail025.hs b/testsuite/tests/parser/should_fail/readFail025.hs
index 25e170d1ff..25e170d1ff 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail025.hs
+++ b/testsuite/tests/parser/should_fail/readFail025.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail025.stderr b/testsuite/tests/parser/should_fail/readFail025.stderr
index 313019147a..313019147a 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail025.stderr
+++ b/testsuite/tests/parser/should_fail/readFail025.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail025.stderr-hugs b/testsuite/tests/parser/should_fail/readFail025.stderr-hugs
index 176b7fd94e..176b7fd94e 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail025.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail025.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail026.hs b/testsuite/tests/parser/should_fail/readFail026.hs
index 6d3f820151..6d3f820151 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail026.hs
+++ b/testsuite/tests/parser/should_fail/readFail026.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail026.stderr b/testsuite/tests/parser/should_fail/readFail026.stderr
index 2249fa0b41..2249fa0b41 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail026.stderr
+++ b/testsuite/tests/parser/should_fail/readFail026.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail026.stderr-hugs b/testsuite/tests/parser/should_fail/readFail026.stderr-hugs
index da743251d0..da743251d0 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail026.stderr-hugs
+++ b/testsuite/tests/parser/should_fail/readFail026.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail027.hs b/testsuite/tests/parser/should_fail/readFail027.hs
index 9a4754678a..9a4754678a 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail027.hs
+++ b/testsuite/tests/parser/should_fail/readFail027.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail027.stderr b/testsuite/tests/parser/should_fail/readFail027.stderr
index 68f3d25755..68f3d25755 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail027.stderr
+++ b/testsuite/tests/parser/should_fail/readFail027.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail028.hs b/testsuite/tests/parser/should_fail/readFail028.hs
index ca0d27e10e..ca0d27e10e 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail028.hs
+++ b/testsuite/tests/parser/should_fail/readFail028.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail028.stderr b/testsuite/tests/parser/should_fail/readFail028.stderr
index 651f778bb4..651f778bb4 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail028.stderr
+++ b/testsuite/tests/parser/should_fail/readFail028.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail029.hs b/testsuite/tests/parser/should_fail/readFail029.hs
index d107cacc17..d107cacc17 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail029.hs
+++ b/testsuite/tests/parser/should_fail/readFail029.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail029.stderr b/testsuite/tests/parser/should_fail/readFail029.stderr
index 7f73291fe4..7f73291fe4 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail029.stderr
+++ b/testsuite/tests/parser/should_fail/readFail029.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail030.hs b/testsuite/tests/parser/should_fail/readFail030.hs
index 0829dc51ed..0829dc51ed 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail030.hs
+++ b/testsuite/tests/parser/should_fail/readFail030.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail030.stderr b/testsuite/tests/parser/should_fail/readFail030.stderr
index e557a6b055..e557a6b055 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail030.stderr
+++ b/testsuite/tests/parser/should_fail/readFail030.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail031.hs b/testsuite/tests/parser/should_fail/readFail031.hs
index d07f8979a6..d07f8979a6 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail031.hs
+++ b/testsuite/tests/parser/should_fail/readFail031.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail031.stderr b/testsuite/tests/parser/should_fail/readFail031.stderr
index 628c8352f6..628c8352f6 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail031.stderr
+++ b/testsuite/tests/parser/should_fail/readFail031.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail032.hs b/testsuite/tests/parser/should_fail/readFail032.hs
index dec758a16f..dec758a16f 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail032.hs
+++ b/testsuite/tests/parser/should_fail/readFail032.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail032.stderr b/testsuite/tests/parser/should_fail/readFail032.stderr
index 95852c5bbd..95852c5bbd 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail032.stderr
+++ b/testsuite/tests/parser/should_fail/readFail032.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail033.hs b/testsuite/tests/parser/should_fail/readFail033.hs
index 6662563ff4..6662563ff4 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail033.hs
+++ b/testsuite/tests/parser/should_fail/readFail033.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail033.stderr b/testsuite/tests/parser/should_fail/readFail033.stderr
index 595323f3fd..595323f3fd 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail033.stderr
+++ b/testsuite/tests/parser/should_fail/readFail033.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail034.hs b/testsuite/tests/parser/should_fail/readFail034.hs
index f92c33fcce..f92c33fcce 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail034.hs
+++ b/testsuite/tests/parser/should_fail/readFail034.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail034.stderr b/testsuite/tests/parser/should_fail/readFail034.stderr
index 19f428131f..19f428131f 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail034.stderr
+++ b/testsuite/tests/parser/should_fail/readFail034.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail035.hs b/testsuite/tests/parser/should_fail/readFail035.hs
index 6682e9ad8b..6682e9ad8b 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail035.hs
+++ b/testsuite/tests/parser/should_fail/readFail035.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail035.stderr b/testsuite/tests/parser/should_fail/readFail035.stderr
index 05f2d864ac..05f2d864ac 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail035.stderr
+++ b/testsuite/tests/parser/should_fail/readFail035.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail036.hs b/testsuite/tests/parser/should_fail/readFail036.hs
index 2bb23149dd..2bb23149dd 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail036.hs
+++ b/testsuite/tests/parser/should_fail/readFail036.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail036.stderr b/testsuite/tests/parser/should_fail/readFail036.stderr
index 8c89f29e34..8c89f29e34 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail036.stderr
+++ b/testsuite/tests/parser/should_fail/readFail036.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail037.hs b/testsuite/tests/parser/should_fail/readFail037.hs
index 499f5cc0f3..499f5cc0f3 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail037.hs
+++ b/testsuite/tests/parser/should_fail/readFail037.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail037.stderr b/testsuite/tests/parser/should_fail/readFail037.stderr
index 4c900d66b1..4c900d66b1 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail037.stderr
+++ b/testsuite/tests/parser/should_fail/readFail037.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail038.hs b/testsuite/tests/parser/should_fail/readFail038.hs
index cc60436f2f..cc60436f2f 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail038.hs
+++ b/testsuite/tests/parser/should_fail/readFail038.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail038.stderr b/testsuite/tests/parser/should_fail/readFail038.stderr
index 6933463b8f..6933463b8f 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail038.stderr
+++ b/testsuite/tests/parser/should_fail/readFail038.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail039.hs b/testsuite/tests/parser/should_fail/readFail039.hs
index c6cbdb9968..c6cbdb9968 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail039.hs
+++ b/testsuite/tests/parser/should_fail/readFail039.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail039.stderr b/testsuite/tests/parser/should_fail/readFail039.stderr
index 1c7cb6b975..1c7cb6b975 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail039.stderr
+++ b/testsuite/tests/parser/should_fail/readFail039.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail040.hs b/testsuite/tests/parser/should_fail/readFail040.hs
index 5279f166ea..5279f166ea 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail040.hs
+++ b/testsuite/tests/parser/should_fail/readFail040.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail040.stderr b/testsuite/tests/parser/should_fail/readFail040.stderr
index 794899898d..794899898d 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail040.stderr
+++ b/testsuite/tests/parser/should_fail/readFail040.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail041.hs b/testsuite/tests/parser/should_fail/readFail041.hs
index 032e05e816..032e05e816 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail041.hs
+++ b/testsuite/tests/parser/should_fail/readFail041.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail041.stderr b/testsuite/tests/parser/should_fail/readFail041.stderr
index fbe49b1153..fbe49b1153 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail041.stderr
+++ b/testsuite/tests/parser/should_fail/readFail041.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail042.hs b/testsuite/tests/parser/should_fail/readFail042.hs
index bdd9f97094..bdd9f97094 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail042.hs
+++ b/testsuite/tests/parser/should_fail/readFail042.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail042.stderr b/testsuite/tests/parser/should_fail/readFail042.stderr
index 8fbb9bf1f7..8fbb9bf1f7 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail042.stderr
+++ b/testsuite/tests/parser/should_fail/readFail042.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail043.hs b/testsuite/tests/parser/should_fail/readFail043.hs
index e6304bea9a..e6304bea9a 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail043.hs
+++ b/testsuite/tests/parser/should_fail/readFail043.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail043.stderr b/testsuite/tests/parser/should_fail/readFail043.stderr
index 1b2b1abc15..1b2b1abc15 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail043.stderr
+++ b/testsuite/tests/parser/should_fail/readFail043.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail044.hs b/testsuite/tests/parser/should_fail/readFail044.hs
index 2735d3363b..2735d3363b 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail044.hs
+++ b/testsuite/tests/parser/should_fail/readFail044.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail044.stderr b/testsuite/tests/parser/should_fail/readFail044.stderr
index 27becac67c..27becac67c 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail044.stderr
+++ b/testsuite/tests/parser/should_fail/readFail044.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail045.stderr-ghc-7.0 b/testsuite/tests/parser/should_fail/readFail045.stderr-ghc-7.0
index 3c25e2347c..3c25e2347c 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail045.stderr-ghc-7.0
+++ b/testsuite/tests/parser/should_fail/readFail045.stderr-ghc-7.0
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail046.hs b/testsuite/tests/parser/should_fail/readFail046.hs
index 9441694dd0..9441694dd0 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail046.hs
+++ b/testsuite/tests/parser/should_fail/readFail046.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail046.stderr b/testsuite/tests/parser/should_fail/readFail046.stderr
index a303d7798e..a303d7798e 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail046.stderr
+++ b/testsuite/tests/parser/should_fail/readFail046.stderr
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail047.hs b/testsuite/tests/parser/should_fail/readFail047.hs
index 5692e780fd..5692e780fd 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail047.hs
+++ b/testsuite/tests/parser/should_fail/readFail047.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_fail/readFail047.stderr b/testsuite/tests/parser/should_fail/readFail047.stderr
index 53af11cf0c..53af11cf0c 100644
--- a/testsuite/tests/ghc-regress/parser/should_fail/readFail047.stderr
+++ b/testsuite/tests/parser/should_fail/readFail047.stderr
diff --git a/testsuite/tests/parser/should_run/Makefile b/testsuite/tests/parser/should_run/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/parser/should_run/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/parser/should_run/T1344.hs b/testsuite/tests/parser/should_run/T1344.hs
index cba7f3fdf6..cba7f3fdf6 100644
--- a/testsuite/tests/ghc-regress/parser/should_run/T1344.hs
+++ b/testsuite/tests/parser/should_run/T1344.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_run/T1344.stdout b/testsuite/tests/parser/should_run/T1344.stdout
index a83f165d74..a83f165d74 100644
--- a/testsuite/tests/ghc-regress/parser/should_run/T1344.stdout
+++ b/testsuite/tests/parser/should_run/T1344.stdout
diff --git a/testsuite/tests/ghc-regress/parser/should_run/all.T b/testsuite/tests/parser/should_run/all.T
index 17d6bc0199..17d6bc0199 100644
--- a/testsuite/tests/ghc-regress/parser/should_run/all.T
+++ b/testsuite/tests/parser/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/parser/should_run/operator.hs b/testsuite/tests/parser/should_run/operator.hs
index 5a7bcf9e97..5a7bcf9e97 100644
--- a/testsuite/tests/ghc-regress/parser/should_run/operator.hs
+++ b/testsuite/tests/parser/should_run/operator.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_run/operator.stdout b/testsuite/tests/parser/should_run/operator.stdout
index b56f190ce6..b56f190ce6 100644
--- a/testsuite/tests/ghc-regress/parser/should_run/operator.stdout
+++ b/testsuite/tests/parser/should_run/operator.stdout
diff --git a/testsuite/tests/ghc-regress/parser/should_run/operator2.hs b/testsuite/tests/parser/should_run/operator2.hs
index f38ebc3bc8..f38ebc3bc8 100644
--- a/testsuite/tests/ghc-regress/parser/should_run/operator2.hs
+++ b/testsuite/tests/parser/should_run/operator2.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_run/operator2.stdout b/testsuite/tests/parser/should_run/operator2.stdout
index 048026337a..048026337a 100644
--- a/testsuite/tests/ghc-regress/parser/should_run/operator2.stdout
+++ b/testsuite/tests/parser/should_run/operator2.stdout
diff --git a/testsuite/tests/ghc-regress/parser/should_run/readRun001.hs b/testsuite/tests/parser/should_run/readRun001.hs
index d80f2adb7c..d80f2adb7c 100644
--- a/testsuite/tests/ghc-regress/parser/should_run/readRun001.hs
+++ b/testsuite/tests/parser/should_run/readRun001.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_run/readRun001.stdout b/testsuite/tests/parser/should_run/readRun001.stdout
index 08d7d27203..08d7d27203 100644
--- a/testsuite/tests/ghc-regress/parser/should_run/readRun001.stdout
+++ b/testsuite/tests/parser/should_run/readRun001.stdout
diff --git a/testsuite/tests/ghc-regress/parser/should_run/readRun002.hs b/testsuite/tests/parser/should_run/readRun002.hs
index 58ba8861ab..58ba8861ab 100644
--- a/testsuite/tests/ghc-regress/parser/should_run/readRun002.hs
+++ b/testsuite/tests/parser/should_run/readRun002.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_run/readRun002.stdout b/testsuite/tests/parser/should_run/readRun002.stdout
index fc761860c4..fc761860c4 100644
--- a/testsuite/tests/ghc-regress/parser/should_run/readRun002.stdout
+++ b/testsuite/tests/parser/should_run/readRun002.stdout
diff --git a/testsuite/tests/ghc-regress/parser/should_run/readRun003.hs b/testsuite/tests/parser/should_run/readRun003.hs
index 578e2d18db..578e2d18db 100644
--- a/testsuite/tests/ghc-regress/parser/should_run/readRun003.hs
+++ b/testsuite/tests/parser/should_run/readRun003.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_run/readRun003.stdout b/testsuite/tests/parser/should_run/readRun003.stdout
index 5953eb3a28..5953eb3a28 100644
--- a/testsuite/tests/ghc-regress/parser/should_run/readRun003.stdout
+++ b/testsuite/tests/parser/should_run/readRun003.stdout
diff --git a/testsuite/tests/ghc-regress/parser/should_run/readRun004.hs b/testsuite/tests/parser/should_run/readRun004.hs
index 5e6545adb1..5e6545adb1 100644
--- a/testsuite/tests/ghc-regress/parser/should_run/readRun004.hs
+++ b/testsuite/tests/parser/should_run/readRun004.hs
diff --git a/testsuite/tests/ghc-regress/parser/should_run/readRun004.stdout b/testsuite/tests/parser/should_run/readRun004.stdout
index 9c27fdf9d5..9c27fdf9d5 100644
--- a/testsuite/tests/ghc-regress/parser/should_run/readRun004.stdout
+++ b/testsuite/tests/parser/should_run/readRun004.stdout
diff --git a/testsuite/tests/ghc-regress/parser/unicode/1103.hs b/testsuite/tests/parser/unicode/1103.hs
index 6d10064056..6d10064056 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/1103.hs
+++ b/testsuite/tests/parser/unicode/1103.hs
diff --git a/testsuite/tests/ghc-regress/parser/unicode/1744.hs b/testsuite/tests/parser/unicode/1744.hs
index 90273741da..90273741da 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/1744.hs
+++ b/testsuite/tests/parser/unicode/1744.hs
diff --git a/testsuite/tests/ghc-regress/parser/unicode/1744.stdout b/testsuite/tests/parser/unicode/1744.stdout
index f127f8d21d..f127f8d21d 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/1744.stdout
+++ b/testsuite/tests/parser/unicode/1744.stdout
diff --git a/testsuite/tests/ghc-regress/parser/unicode/2302.hs b/testsuite/tests/parser/unicode/2302.hs
index c40c704cc3..c40c704cc3 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/2302.hs
+++ b/testsuite/tests/parser/unicode/2302.hs
diff --git a/testsuite/tests/ghc-regress/parser/unicode/2302.stderr b/testsuite/tests/parser/unicode/2302.stderr
index 608c9ef0bd..608c9ef0bd 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/2302.stderr
+++ b/testsuite/tests/parser/unicode/2302.stderr
diff --git a/testsuite/tests/ghc-regress/parser/unicode/4373.hs b/testsuite/tests/parser/unicode/4373.hs
index a753432a41..a753432a41 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/4373.hs
+++ b/testsuite/tests/parser/unicode/4373.hs
diff --git a/testsuite/tests/parser/unicode/Makefile b/testsuite/tests/parser/unicode/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/parser/unicode/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/parser/unicode/all.T b/testsuite/tests/parser/unicode/all.T
index e5375a361e..e5375a361e 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/all.T
+++ b/testsuite/tests/parser/unicode/all.T
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_001.hs b/testsuite/tests/parser/unicode/utf8_001.hs
index 371e89e1fa..371e89e1fa 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_001.hs
+++ b/testsuite/tests/parser/unicode/utf8_001.hs
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_001.stderr b/testsuite/tests/parser/unicode/utf8_001.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_001.stderr
+++ b/testsuite/tests/parser/unicode/utf8_001.stderr
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_002.hs b/testsuite/tests/parser/unicode/utf8_002.hs
index 589da832f2..589da832f2 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_002.hs
+++ b/testsuite/tests/parser/unicode/utf8_002.hs
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_002.stderr b/testsuite/tests/parser/unicode/utf8_002.stderr
index d8083f0c89..d8083f0c89 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_002.stderr
+++ b/testsuite/tests/parser/unicode/utf8_002.stderr
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_003.hs b/testsuite/tests/parser/unicode/utf8_003.hs
index bd8e2f552c..bd8e2f552c 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_003.hs
+++ b/testsuite/tests/parser/unicode/utf8_003.hs
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_003.stderr b/testsuite/tests/parser/unicode/utf8_003.stderr
index be433d9141..be433d9141 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_003.stderr
+++ b/testsuite/tests/parser/unicode/utf8_003.stderr
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_004.hs b/testsuite/tests/parser/unicode/utf8_004.hs
index 6a1a839246..6a1a839246 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_004.hs
+++ b/testsuite/tests/parser/unicode/utf8_004.hs
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_004.stderr b/testsuite/tests/parser/unicode/utf8_004.stderr
index aff8256549..aff8256549 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_004.stderr
+++ b/testsuite/tests/parser/unicode/utf8_004.stderr
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_005.hs b/testsuite/tests/parser/unicode/utf8_005.hs
index e88fec5a4f..e88fec5a4f 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_005.hs
+++ b/testsuite/tests/parser/unicode/utf8_005.hs
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_005.stderr b/testsuite/tests/parser/unicode/utf8_005.stderr
index 3d551bae44..3d551bae44 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_005.stderr
+++ b/testsuite/tests/parser/unicode/utf8_005.stderr
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_010.hs b/testsuite/tests/parser/unicode/utf8_010.hs
index 371e89e1fa..371e89e1fa 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_010.hs
+++ b/testsuite/tests/parser/unicode/utf8_010.hs
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_010.stderr b/testsuite/tests/parser/unicode/utf8_010.stderr
index a2bb9b52e2..a2bb9b52e2 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_010.stderr
+++ b/testsuite/tests/parser/unicode/utf8_010.stderr
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_011.hs b/testsuite/tests/parser/unicode/utf8_011.hs
index 5700e1db45..5700e1db45 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_011.hs
+++ b/testsuite/tests/parser/unicode/utf8_011.hs
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_011.stderr b/testsuite/tests/parser/unicode/utf8_011.stderr
index 0b34980303..0b34980303 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_011.stderr
+++ b/testsuite/tests/parser/unicode/utf8_011.stderr
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_020.hs b/testsuite/tests/parser/unicode/utf8_020.hs
index eaefe622fa..eaefe622fa 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_020.hs
+++ b/testsuite/tests/parser/unicode/utf8_020.hs
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_020.stderr b/testsuite/tests/parser/unicode/utf8_020.stderr
index 7254106142..7254106142 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_020.stderr
+++ b/testsuite/tests/parser/unicode/utf8_020.stderr
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_021.hs b/testsuite/tests/parser/unicode/utf8_021.hs
index 639e0bfc63..639e0bfc63 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_021.hs
+++ b/testsuite/tests/parser/unicode/utf8_021.hs
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_021.stderr b/testsuite/tests/parser/unicode/utf8_021.stderr
index 2867239846..2867239846 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_021.stderr
+++ b/testsuite/tests/parser/unicode/utf8_021.stderr
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_022.hs b/testsuite/tests/parser/unicode/utf8_022.hs
index 6484a03c40..6484a03c40 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_022.hs
+++ b/testsuite/tests/parser/unicode/utf8_022.hs
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_022.stderr b/testsuite/tests/parser/unicode/utf8_022.stderr
index 3f84d06de2..3f84d06de2 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_022.stderr
+++ b/testsuite/tests/parser/unicode/utf8_022.stderr
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_023.hs b/testsuite/tests/parser/unicode/utf8_023.hs
index 255d48b741..255d48b741 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_023.hs
+++ b/testsuite/tests/parser/unicode/utf8_023.hs
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_023.stderr b/testsuite/tests/parser/unicode/utf8_023.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_023.stderr
+++ b/testsuite/tests/parser/unicode/utf8_023.stderr
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_024.hs b/testsuite/tests/parser/unicode/utf8_024.hs
index 1e491f75ec..1e491f75ec 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_024.hs
+++ b/testsuite/tests/parser/unicode/utf8_024.hs
diff --git a/testsuite/tests/ghc-regress/parser/unicode/utf8_024.stdout b/testsuite/tests/parser/unicode/utf8_024.stdout
index f04c001f3f..f04c001f3f 100644
--- a/testsuite/tests/ghc-regress/parser/unicode/utf8_024.stdout
+++ b/testsuite/tests/parser/unicode/utf8_024.stdout
diff --git a/testsuite/tests/perf/Makefile b/testsuite/tests/perf/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/perf/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/perf/compiler/Makefile b/testsuite/tests/perf/compiler/Makefile
new file mode 100644
index 0000000000..7d8e96fd44
--- /dev/null
+++ b/testsuite/tests/perf/compiler/Makefile
@@ -0,0 +1,9 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+.PHONY: T4007
+T4007:
+	$(RM) -f T4007.hi T4007.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O -ddump-rule-firings T4007.hs
+
diff --git a/testsuite/tests/ghc-regress/perf/compiler/T1969.hs b/testsuite/tests/perf/compiler/T1969.hs
index 05045cccba..05045cccba 100644
--- a/testsuite/tests/ghc-regress/perf/compiler/T1969.hs
+++ b/testsuite/tests/perf/compiler/T1969.hs
diff --git a/testsuite/tests/ghc-regress/perf/compiler/T3064.hs b/testsuite/tests/perf/compiler/T3064.hs
index 328da45976..328da45976 100644
--- a/testsuite/tests/ghc-regress/perf/compiler/T3064.hs
+++ b/testsuite/tests/perf/compiler/T3064.hs
diff --git a/testsuite/tests/ghc-regress/perf/compiler/T3294.hs b/testsuite/tests/perf/compiler/T3294.hs
index 25e4a2beba..25e4a2beba 100644
--- a/testsuite/tests/ghc-regress/perf/compiler/T3294.hs
+++ b/testsuite/tests/perf/compiler/T3294.hs
diff --git a/testsuite/tests/ghc-regress/perf/compiler/T4007.hs b/testsuite/tests/perf/compiler/T4007.hs
index 71a37841ed..71a37841ed 100644
--- a/testsuite/tests/ghc-regress/perf/compiler/T4007.hs
+++ b/testsuite/tests/perf/compiler/T4007.hs
diff --git a/testsuite/tests/ghc-regress/perf/compiler/T4007.stderr b/testsuite/tests/perf/compiler/T4007.stderr
index 9b825fd518..9b825fd518 100644
--- a/testsuite/tests/ghc-regress/perf/compiler/T4007.stderr
+++ b/testsuite/tests/perf/compiler/T4007.stderr
diff --git a/testsuite/tests/ghc-regress/perf/compiler/T4801.hs b/testsuite/tests/perf/compiler/T4801.hs
index 8bc02b2c77..8bc02b2c77 100644
--- a/testsuite/tests/ghc-regress/perf/compiler/T4801.hs
+++ b/testsuite/tests/perf/compiler/T4801.hs
diff --git a/testsuite/tests/ghc-regress/perf/compiler/T5030.hs b/testsuite/tests/perf/compiler/T5030.hs
index b65e9cdd3c..b65e9cdd3c 100644
--- a/testsuite/tests/ghc-regress/perf/compiler/T5030.hs
+++ b/testsuite/tests/perf/compiler/T5030.hs
diff --git a/testsuite/tests/ghc-regress/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index b009d276c8..b009d276c8 100644
--- a/testsuite/tests/ghc-regress/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
diff --git a/testsuite/tests/ghc-regress/perf/should_run/3586.hs b/testsuite/tests/perf/should_run/3586.hs
index 968f2eba27..968f2eba27 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/3586.hs
+++ b/testsuite/tests/perf/should_run/3586.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/3586.stdout b/testsuite/tests/perf/should_run/3586.stdout
index 626282f10c..626282f10c 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/3586.stdout
+++ b/testsuite/tests/perf/should_run/3586.stdout
diff --git a/testsuite/tests/perf/should_run/Makefile b/testsuite/tests/perf/should_run/Makefile
new file mode 100644
index 0000000000..e839342f90
--- /dev/null
+++ b/testsuite/tests/perf/should_run/Makefile
@@ -0,0 +1,36 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+define runT3736
+./T3736 $1 +RTS -t --machine-readable 2>&1 | grep '"bytes allocated"' | sed -e 's/.*, "//' -e 's/".*//'
+endef
+.PHONY: T3736
+T3736:
+	$(RM) -f T3736.hi T3736.o T3736
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -O --make T3736 -rtsopts
+# Check ALLOC1 is > 100 just to check with have sane results, and if so,
+# the test passes if the two numbers are equal. We could check that the
+# actual numbers are in the range we expect too (on the various
+# platforms), but we don't currently.
+	ALLOC1=`$(call runT3736,1)`; ALLOC2=`$(call runT3736,2)`; if [ "$$ALLOC1" -gt 100 ] && [ "$$ALLOC1" -eq "$$ALLOC2" ]; then echo Match; else echo "Mismatch: $$ALLOC1 $$ALLOC2"; fi
+
+.PHONY: T2902
+T2902:
+	$(RM) -f T2902_A    T2902_B
+	$(RM) -f T2902_A.hi T2902_B.hi
+	$(RM) -f T2902_A.o  T2902_B.o
+	$(RM) -f T2902_A_PairingSum.hi T2902_B_PairingSum.hi T2902_Sum.hi
+	$(RM) -f T2902_A_PairingSum.o  T2902_B_PairingSum.o  T2902_Sum.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -O --make T2902_A -rtsopts
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -O --make T2902_B -rtsopts
+	BAA=`./T2902_A +RTS -t --machine-readable 2>&1 | grep '"bytes allocated"' | sed -e 's/.*, "//' -e 's/")//'`; BAB=`./T2902_B +RTS -t --machine-readable 2>&1 | grep '"bytes allocated"' | sed -e 's/.*, "//' -e 's/")//'`; [ "$$BAA" = "" ] && echo 'T2902_A: No "bytes allocated"'; [ "$$BAA" = "$$BAB" ] || echo "T2902: Mismatch in \"bytes allocated\": $$BAA $$BAB"
+
+.PHONY: T149
+T149:
+	$(RM) -f T149_A T149_A.hi T149_A.o
+	$(RM) -f T149_B T149_B.hi T149_B.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -O --make T149_A -rtsopts
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -O --make T149_B -rtsopts
+	BAA=`./T149_A +RTS -t --machine-readable 2>&1 | grep '"bytes allocated"' | sed -e 's/.*, "//' -e 's/")//'`; BAB=`./T149_B +RTS -t --machine-readable 2>&1 | grep '"bytes allocated"' | sed -e 's/.*, "//' -e 's/")//'`; [ "$$BAA" = "" ] && echo 'T149_A: No "bytes allocated"'; [ "$$BAA" = "$$BAB" ] || echo "T149: Mismatch in \"bytes allocated\": $$BAA $$BAB"
+
diff --git a/testsuite/tests/ghc-regress/perf/should_run/MethSharing.hs b/testsuite/tests/perf/should_run/MethSharing.hs
index fb69bd4509..fb69bd4509 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/MethSharing.hs
+++ b/testsuite/tests/perf/should_run/MethSharing.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/MethSharing.stdout b/testsuite/tests/perf/should_run/MethSharing.stdout
index d3827e75a5..d3827e75a5 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/MethSharing.stdout
+++ b/testsuite/tests/perf/should_run/MethSharing.stdout
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T149_A.hs b/testsuite/tests/perf/should_run/T149_A.hs
index dd745460c0..dd745460c0 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T149_A.hs
+++ b/testsuite/tests/perf/should_run/T149_A.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T149_B.hs b/testsuite/tests/perf/should_run/T149_B.hs
index fcc87cdf55..fcc87cdf55 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T149_B.hs
+++ b/testsuite/tests/perf/should_run/T149_B.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T2902_A.hs b/testsuite/tests/perf/should_run/T2902_A.hs
index c0939104f3..c0939104f3 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T2902_A.hs
+++ b/testsuite/tests/perf/should_run/T2902_A.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T2902_A_PairingSum.hs b/testsuite/tests/perf/should_run/T2902_A_PairingSum.hs
index a5dd0e7803..a5dd0e7803 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T2902_A_PairingSum.hs
+++ b/testsuite/tests/perf/should_run/T2902_A_PairingSum.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T2902_B.hs b/testsuite/tests/perf/should_run/T2902_B.hs
index c6558c625b..c6558c625b 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T2902_B.hs
+++ b/testsuite/tests/perf/should_run/T2902_B.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T2902_B_PairingSum.hs b/testsuite/tests/perf/should_run/T2902_B_PairingSum.hs
index 5276da818b..5276da818b 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T2902_B_PairingSum.hs
+++ b/testsuite/tests/perf/should_run/T2902_B_PairingSum.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T2902_Sum.hs b/testsuite/tests/perf/should_run/T2902_Sum.hs
index 9be6b10568..9be6b10568 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T2902_Sum.hs
+++ b/testsuite/tests/perf/should_run/T2902_Sum.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T3245.hs b/testsuite/tests/perf/should_run/T3245.hs
index f52fc27303..f52fc27303 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T3245.hs
+++ b/testsuite/tests/perf/should_run/T3245.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T3245.stdout b/testsuite/tests/perf/should_run/T3245.stdout
index bcff7f8fd1..bcff7f8fd1 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T3245.stdout
+++ b/testsuite/tests/perf/should_run/T3245.stdout
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T3736.hs b/testsuite/tests/perf/should_run/T3736.hs
index e812109611..e812109611 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T3736.hs
+++ b/testsuite/tests/perf/should_run/T3736.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T3736.stdout b/testsuite/tests/perf/should_run/T3736.stdout
index 1796dc2720..1796dc2720 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T3736.stdout
+++ b/testsuite/tests/perf/should_run/T3736.stdout
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T3738.hs b/testsuite/tests/perf/should_run/T3738.hs
index 1b3141c0f5..1b3141c0f5 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T3738.hs
+++ b/testsuite/tests/perf/should_run/T3738.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T3738.stdout b/testsuite/tests/perf/should_run/T3738.stdout
index 7ed6ff82de..7ed6ff82de 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T3738.stdout
+++ b/testsuite/tests/perf/should_run/T3738.stdout
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T3738a.hs b/testsuite/tests/perf/should_run/T3738a.hs
index b27451d12d..b27451d12d 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T3738a.hs
+++ b/testsuite/tests/perf/should_run/T3738a.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T4321.hs b/testsuite/tests/perf/should_run/T4321.hs
index b8a0dbc4a1..b8a0dbc4a1 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T4321.hs
+++ b/testsuite/tests/perf/should_run/T4321.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T4321.stdout b/testsuite/tests/perf/should_run/T4321.stdout
index ce98a198a7..ce98a198a7 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T4321.stdout
+++ b/testsuite/tests/perf/should_run/T4321.stdout
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T4830.hs b/testsuite/tests/perf/should_run/T4830.hs
index e345ffc9cd..e345ffc9cd 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T4830.hs
+++ b/testsuite/tests/perf/should_run/T4830.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T4830.stdout b/testsuite/tests/perf/should_run/T4830.stdout
index 9f55b2ccb5..9f55b2ccb5 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T4830.stdout
+++ b/testsuite/tests/perf/should_run/T4830.stdout
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T4978.hs b/testsuite/tests/perf/should_run/T4978.hs
index 6413b01fdc..6413b01fdc 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T4978.hs
+++ b/testsuite/tests/perf/should_run/T4978.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T4978.stdout b/testsuite/tests/perf/should_run/T4978.stdout
index 825319e1c5..825319e1c5 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T4978.stdout
+++ b/testsuite/tests/perf/should_run/T4978.stdout
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T5113.hs b/testsuite/tests/perf/should_run/T5113.hs
index e87bcb6cad..e87bcb6cad 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T5113.hs
+++ b/testsuite/tests/perf/should_run/T5113.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T5113.stdout b/testsuite/tests/perf/should_run/T5113.stdout
index 0cfbf08886..0cfbf08886 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T5113.stdout
+++ b/testsuite/tests/perf/should_run/T5113.stdout
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T5205.hs b/testsuite/tests/perf/should_run/T5205.hs
index 215dd42647..215dd42647 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T5205.hs
+++ b/testsuite/tests/perf/should_run/T5205.hs
diff --git a/testsuite/tests/ghc-regress/perf/should_run/T5205.stdout b/testsuite/tests/perf/should_run/T5205.stdout
index a965a70ed4..a965a70ed4 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/T5205.stdout
+++ b/testsuite/tests/perf/should_run/T5205.stdout
diff --git a/testsuite/tests/ghc-regress/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T
index 04133979df..04133979df 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/all.T
+++ b/testsuite/tests/perf/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/perf/should_run/lazy-bs-alloc.hs b/testsuite/tests/perf/should_run/lazy-bs-alloc.hs
index 76850c67d0..76850c67d0 100644
--- a/testsuite/tests/ghc-regress/perf/should_run/lazy-bs-alloc.hs
+++ b/testsuite/tests/perf/should_run/lazy-bs-alloc.hs
diff --git a/testsuite/tests/perf/space_leaks/Makefile b/testsuite/tests/perf/space_leaks/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/perf/space_leaks/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/perf/space_leaks/T2762.hs b/testsuite/tests/perf/space_leaks/T2762.hs
index 76ab04501c..76ab04501c 100644
--- a/testsuite/tests/ghc-regress/perf/space_leaks/T2762.hs
+++ b/testsuite/tests/perf/space_leaks/T2762.hs
diff --git a/testsuite/tests/ghc-regress/perf/space_leaks/T2762A.hs b/testsuite/tests/perf/space_leaks/T2762A.hs
index 665fa6ef72..665fa6ef72 100644
--- a/testsuite/tests/ghc-regress/perf/space_leaks/T2762A.hs
+++ b/testsuite/tests/perf/space_leaks/T2762A.hs
diff --git a/testsuite/tests/ghc-regress/perf/space_leaks/T4334.hs b/testsuite/tests/perf/space_leaks/T4334.hs
index ab522f006e..ab522f006e 100644
--- a/testsuite/tests/ghc-regress/perf/space_leaks/T4334.hs
+++ b/testsuite/tests/perf/space_leaks/T4334.hs
diff --git a/testsuite/tests/ghc-regress/perf/space_leaks/T4334.stdout b/testsuite/tests/perf/space_leaks/T4334.stdout
index 2974b9f373..2974b9f373 100644
--- a/testsuite/tests/ghc-regress/perf/space_leaks/T4334.stdout
+++ b/testsuite/tests/perf/space_leaks/T4334.stdout
diff --git a/testsuite/tests/ghc-regress/perf/space_leaks/all.T b/testsuite/tests/perf/space_leaks/all.T
index 809ec01b44..809ec01b44 100644
--- a/testsuite/tests/ghc-regress/perf/space_leaks/all.T
+++ b/testsuite/tests/perf/space_leaks/all.T
diff --git a/testsuite/tests/ghc-regress/perf/space_leaks/space_leak_001.hs b/testsuite/tests/perf/space_leaks/space_leak_001.hs
index cabde0ae9b..cabde0ae9b 100644
--- a/testsuite/tests/ghc-regress/perf/space_leaks/space_leak_001.hs
+++ b/testsuite/tests/perf/space_leaks/space_leak_001.hs
diff --git a/testsuite/tests/ghc-regress/perf/space_leaks/space_leak_001.stdout b/testsuite/tests/perf/space_leaks/space_leak_001.stdout
index 85dc4185fa..85dc4185fa 100644
--- a/testsuite/tests/ghc-regress/perf/space_leaks/space_leak_001.stdout
+++ b/testsuite/tests/perf/space_leaks/space_leak_001.stdout
diff --git a/testsuite/tests/ghc-regress/plugins/HomePackagePlugin.hs b/testsuite/tests/plugins/HomePackagePlugin.hs
index 3a5318a2b7..3a5318a2b7 100644
--- a/testsuite/tests/ghc-regress/plugins/HomePackagePlugin.hs
+++ b/testsuite/tests/plugins/HomePackagePlugin.hs
diff --git a/testsuite/tests/ghc-regress/plugins/LinkerTicklingPlugin.hs b/testsuite/tests/plugins/LinkerTicklingPlugin.hs
index 52d5e177bb..52d5e177bb 100644
--- a/testsuite/tests/ghc-regress/plugins/LinkerTicklingPlugin.hs
+++ b/testsuite/tests/plugins/LinkerTicklingPlugin.hs
diff --git a/testsuite/tests/plugins/Makefile b/testsuite/tests/plugins/Makefile
new file mode 100644
index 0000000000..8edee2305e
--- /dev/null
+++ b/testsuite/tests/plugins/Makefile
@@ -0,0 +1,20 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+.PHONY: plugins01 clean
+
+plugins01:
+	# This test is extremely fragile because any change in the output of the following
+	# commands invalidates the output of the run.  In fact, we really want to ignore the
+	# output resulting from building the simple-plugin, and only look at a few lines of
+	# the output of the call to the TEST_HC (probably just the last 2).
+	#
+	# Suggestions to make this better gratefully recieved.
+	(cd simple-plugin; make package)
+	@$(RM) plugins01.hi plugins01.o
+	"$(TEST_HC)" $(HC_OPTS) --make -v0 plugins01.hs -package-conf simple-plugin/local.package.conf -fplugin Simple.Plugin -fplugin-opt Simple.Plugin:Irrelevant_Option -package simple-plugin
+	./plugins01
+
+clean:
+	cd simple-plugin && make clean
diff --git a/testsuite/tests/ghc-regress/plugins/all.T b/testsuite/tests/plugins/all.T
index b9d4e4497d..b9d4e4497d 100644
--- a/testsuite/tests/ghc-regress/plugins/all.T
+++ b/testsuite/tests/plugins/all.T
diff --git a/testsuite/tests/ghc-regress/plugins/plugins01.hs b/testsuite/tests/plugins/plugins01.hs
index 7bb2ec7e2e..7bb2ec7e2e 100644
--- a/testsuite/tests/ghc-regress/plugins/plugins01.hs
+++ b/testsuite/tests/plugins/plugins01.hs
diff --git a/testsuite/tests/ghc-regress/plugins/plugins01.stderr b/testsuite/tests/plugins/plugins01.stderr
index d3e2a886d9..d3e2a886d9 100644
--- a/testsuite/tests/ghc-regress/plugins/plugins01.stderr
+++ b/testsuite/tests/plugins/plugins01.stderr
diff --git a/testsuite/tests/ghc-regress/plugins/plugins01.stdout b/testsuite/tests/plugins/plugins01.stdout
index 5633757f84..5633757f84 100644
--- a/testsuite/tests/ghc-regress/plugins/plugins01.stdout
+++ b/testsuite/tests/plugins/plugins01.stdout
diff --git a/testsuite/tests/ghc-regress/plugins/plugins02.hs b/testsuite/tests/plugins/plugins02.hs
index 4fdf45c5cb..4fdf45c5cb 100644
--- a/testsuite/tests/ghc-regress/plugins/plugins02.hs
+++ b/testsuite/tests/plugins/plugins02.hs
diff --git a/testsuite/tests/ghc-regress/plugins/plugins02.stderr b/testsuite/tests/plugins/plugins02.stderr
index 2fee69361e..2fee69361e 100644
--- a/testsuite/tests/ghc-regress/plugins/plugins02.stderr
+++ b/testsuite/tests/plugins/plugins02.stderr
diff --git a/testsuite/tests/ghc-regress/plugins/plugins03.hs b/testsuite/tests/plugins/plugins03.hs
index 7cc679b38f..7cc679b38f 100644
--- a/testsuite/tests/ghc-regress/plugins/plugins03.hs
+++ b/testsuite/tests/plugins/plugins03.hs
diff --git a/testsuite/tests/ghc-regress/plugins/plugins03.stderr b/testsuite/tests/plugins/plugins03.stderr
index f3fbc8e9f2..f3fbc8e9f2 100644
--- a/testsuite/tests/ghc-regress/plugins/plugins03.stderr
+++ b/testsuite/tests/plugins/plugins03.stderr
diff --git a/testsuite/tests/ghc-regress/plugins/plugins04.hs b/testsuite/tests/plugins/plugins04.hs
index ad40b2c800..ad40b2c800 100644
--- a/testsuite/tests/ghc-regress/plugins/plugins04.hs
+++ b/testsuite/tests/plugins/plugins04.hs
diff --git a/testsuite/tests/ghc-regress/plugins/plugins04.stderr b/testsuite/tests/plugins/plugins04.stderr
index 95034a449a..95034a449a 100644
--- a/testsuite/tests/ghc-regress/plugins/plugins04.stderr
+++ b/testsuite/tests/plugins/plugins04.stderr
diff --git a/testsuite/tests/ghc-regress/plugins/plugins05.hs b/testsuite/tests/plugins/plugins05.hs
index 718939b904..718939b904 100644
--- a/testsuite/tests/ghc-regress/plugins/plugins05.hs
+++ b/testsuite/tests/plugins/plugins05.hs
diff --git a/testsuite/tests/ghc-regress/plugins/plugins05.stdout b/testsuite/tests/plugins/plugins05.stdout
index ec5d984277..ec5d984277 100644
--- a/testsuite/tests/ghc-regress/plugins/plugins05.stdout
+++ b/testsuite/tests/plugins/plugins05.stdout
diff --git a/testsuite/tests/ghc-regress/plugins/plugins06.hs b/testsuite/tests/plugins/plugins06.hs
index ad80d2c636..ad80d2c636 100644
--- a/testsuite/tests/ghc-regress/plugins/plugins06.hs
+++ b/testsuite/tests/plugins/plugins06.hs
diff --git a/testsuite/tests/ghc-regress/plugins/plugins06.stdout b/testsuite/tests/plugins/plugins06.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/plugins/plugins06.stdout
+++ b/testsuite/tests/plugins/plugins06.stdout
diff --git a/testsuite/tests/ghc-regress/plugins/simple-plugin/LICENSE b/testsuite/tests/plugins/simple-plugin/LICENSE
index 6297f71b3f..6297f71b3f 100644
--- a/testsuite/tests/ghc-regress/plugins/simple-plugin/LICENSE
+++ b/testsuite/tests/plugins/simple-plugin/LICENSE
diff --git a/testsuite/tests/plugins/simple-plugin/Makefile b/testsuite/tests/plugins/simple-plugin/Makefile
new file mode 100644
index 0000000000..53842deb9d
--- /dev/null
+++ b/testsuite/tests/plugins/simple-plugin/Makefile
@@ -0,0 +1,23 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+LOCAL_PKGCONF=local.package.conf
+PKG_NAME=simple-plugin
+
+clean:
+	rm -f $(LOCAL_PKGCONF)
+	rm -rf dist
+	rm -rf install
+
+PREFIX := $(abspath install)
+$(eval $(call canonicalise,PREFIX))
+
+package:
+	"$(TEST_HC)" --make -v0 -o setup Setup.hs
+	
+	echo "[]" >$(LOCAL_PKGCONF)
+	
+	./setup configure -v0 --prefix="$(PREFIX)" --with-compiler="$(TEST_HC)" --with-hc-pkg="$(GHC_PKG)" --package-db=$(LOCAL_PKGCONF)
+	./setup build -v0
+	./setup install -v0
diff --git a/testsuite/tests/ghc-regress/plugins/simple-plugin/Setup.hs b/testsuite/tests/plugins/simple-plugin/Setup.hs
index e8ef27dbba..e8ef27dbba 100644
--- a/testsuite/tests/ghc-regress/plugins/simple-plugin/Setup.hs
+++ b/testsuite/tests/plugins/simple-plugin/Setup.hs
diff --git a/testsuite/tests/ghc-regress/plugins/simple-plugin/Simple/BadlyTypedPlugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/BadlyTypedPlugin.hs
index 7db041232b..7db041232b 100644
--- a/testsuite/tests/ghc-regress/plugins/simple-plugin/Simple/BadlyTypedPlugin.hs
+++ b/testsuite/tests/plugins/simple-plugin/Simple/BadlyTypedPlugin.hs
diff --git a/testsuite/tests/ghc-regress/plugins/simple-plugin/Simple/DataStructures.hs b/testsuite/tests/plugins/simple-plugin/Simple/DataStructures.hs
index ffad889c60..ffad889c60 100644
--- a/testsuite/tests/ghc-regress/plugins/simple-plugin/Simple/DataStructures.hs
+++ b/testsuite/tests/plugins/simple-plugin/Simple/DataStructures.hs
diff --git a/testsuite/tests/ghc-regress/plugins/simple-plugin/Simple/Plugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/Plugin.hs
index d362518e4f..d362518e4f 100644
--- a/testsuite/tests/ghc-regress/plugins/simple-plugin/Simple/Plugin.hs
+++ b/testsuite/tests/plugins/simple-plugin/Simple/Plugin.hs
diff --git a/testsuite/tests/ghc-regress/plugins/simple-plugin/simple-plugin.cabal b/testsuite/tests/plugins/simple-plugin/simple-plugin.cabal
index 011ed67e23..011ed67e23 100644
--- a/testsuite/tests/ghc-regress/plugins/simple-plugin/simple-plugin.cabal
+++ b/testsuite/tests/plugins/simple-plugin/simple-plugin.cabal
diff --git a/testsuite/tests/profiling/Makefile b/testsuite/tests/profiling/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/profiling/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/profiling/should_compile/2410.hs b/testsuite/tests/profiling/should_compile/2410.hs
index 5c56e82992..5c56e82992 100644
--- a/testsuite/tests/ghc-regress/profiling/should_compile/2410.hs
+++ b/testsuite/tests/profiling/should_compile/2410.hs
diff --git a/testsuite/tests/profiling/should_compile/Makefile b/testsuite/tests/profiling/should_compile/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/profiling/should_compile/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/profiling/should_compile/all.T b/testsuite/tests/profiling/should_compile/all.T
index b9539038b1..b9539038b1 100644
--- a/testsuite/tests/ghc-regress/profiling/should_compile/all.T
+++ b/testsuite/tests/profiling/should_compile/all.T
diff --git a/testsuite/tests/ghc-regress/profiling/should_compile/prof001.hs b/testsuite/tests/profiling/should_compile/prof001.hs
index 8873a8487e..8873a8487e 100644
--- a/testsuite/tests/ghc-regress/profiling/should_compile/prof001.hs
+++ b/testsuite/tests/profiling/should_compile/prof001.hs
diff --git a/testsuite/tests/ghc-regress/profiling/should_compile/prof002.hs b/testsuite/tests/profiling/should_compile/prof002.hs
index 0b631bbcd2..0b631bbcd2 100644
--- a/testsuite/tests/ghc-regress/profiling/should_compile/prof002.hs
+++ b/testsuite/tests/profiling/should_compile/prof002.hs
diff --git a/testsuite/tests/ghc-regress/profiling/should_compile/prof002.stdout b/testsuite/tests/profiling/should_compile/prof002.stdout
index e74b083d69..e74b083d69 100644
--- a/testsuite/tests/ghc-regress/profiling/should_compile/prof002.stdout
+++ b/testsuite/tests/profiling/should_compile/prof002.stdout
diff --git a/testsuite/tests/profiling/should_fail/Makefile b/testsuite/tests/profiling/should_fail/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/profiling/should_fail/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/profiling/should_fail/all.T b/testsuite/tests/profiling/should_fail/all.T
index d3907515a3..d3907515a3 100644
--- a/testsuite/tests/ghc-regress/profiling/should_fail/all.T
+++ b/testsuite/tests/profiling/should_fail/all.T
diff --git a/testsuite/tests/ghc-regress/profiling/should_fail/proffail001.hs b/testsuite/tests/profiling/should_fail/proffail001.hs
index dfdf2fc730..dfdf2fc730 100644
--- a/testsuite/tests/ghc-regress/profiling/should_fail/proffail001.hs
+++ b/testsuite/tests/profiling/should_fail/proffail001.hs
diff --git a/testsuite/tests/ghc-regress/profiling/should_fail/proffail001.stderr b/testsuite/tests/profiling/should_fail/proffail001.stderr
index 5dec3b9e54..5dec3b9e54 100644
--- a/testsuite/tests/ghc-regress/profiling/should_fail/proffail001.stderr
+++ b/testsuite/tests/profiling/should_fail/proffail001.stderr
diff --git a/testsuite/tests/ghc-regress/profiling/should_run/2592.hs b/testsuite/tests/profiling/should_run/2592.hs
index 3674a4001b..3674a4001b 100644
--- a/testsuite/tests/ghc-regress/profiling/should_run/2592.hs
+++ b/testsuite/tests/profiling/should_run/2592.hs
diff --git a/testsuite/tests/ghc-regress/profiling/should_run/2592.stderr b/testsuite/tests/profiling/should_run/2592.stderr
index b51bee2097..b51bee2097 100644
--- a/testsuite/tests/ghc-regress/profiling/should_run/2592.stderr
+++ b/testsuite/tests/profiling/should_run/2592.stderr
diff --git a/testsuite/tests/ghc-regress/profiling/should_run/5314.hs b/testsuite/tests/profiling/should_run/5314.hs
index 681eb9586e..681eb9586e 100644
--- a/testsuite/tests/ghc-regress/profiling/should_run/5314.hs
+++ b/testsuite/tests/profiling/should_run/5314.hs
diff --git a/testsuite/tests/ghc-regress/profiling/should_run/5314.stdout b/testsuite/tests/profiling/should_run/5314.stdout
index b9d569380c..b9d569380c 100644
--- a/testsuite/tests/ghc-regress/profiling/should_run/5314.stdout
+++ b/testsuite/tests/profiling/should_run/5314.stdout
diff --git a/testsuite/tests/profiling/should_run/Makefile b/testsuite/tests/profiling/should_run/Makefile
new file mode 100644
index 0000000000..577fc3491f
--- /dev/null
+++ b/testsuite/tests/profiling/should_run/Makefile
@@ -0,0 +1,25 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+DECIMAL_REGEXP = [0-9]\+.[0-9]\+
+
+define scc001Test
+	grep -q '^ *$1 \+Main \+[0-9]\+ \+1 \+$(DECIMAL_REGEXP) \+$(DECIMAL_REGEXP) \+$(DECIMAL_REGEXP) \+$(DECIMAL_REGEXP)$$' scc001.prof || { echo 'No single-entry for $1 found in profile'; grep '^ *$1 ' scc001.prof; true; }
+endef
+
+define scc001Rule
+	rm -f scc001.hi scc001.o scc001
+	@echo Compiling with $1
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make scc001 -prof -auto-all -rtsopts $1
+	./scc001 +RTS -p
+	$(call scc001Test,f)
+	$(call scc001Test,g)
+	$(call scc001Test,h)
+endef
+
+.PHONY: scc001
+scc001:
+	$(call scc001Rule,-O0)
+	$(call scc001Rule,-O)
+
diff --git a/testsuite/tests/ghc-regress/profiling/should_run/T3001-2.hs b/testsuite/tests/profiling/should_run/T3001-2.hs
index 961d9c3760..961d9c3760 100644
--- a/testsuite/tests/ghc-regress/profiling/should_run/T3001-2.hs
+++ b/testsuite/tests/profiling/should_run/T3001-2.hs
diff --git a/testsuite/tests/ghc-regress/profiling/should_run/T3001-2.stdout b/testsuite/tests/profiling/should_run/T3001-2.stdout
index f594a78082..f594a78082 100644
--- a/testsuite/tests/ghc-regress/profiling/should_run/T3001-2.stdout
+++ b/testsuite/tests/profiling/should_run/T3001-2.stdout
diff --git a/testsuite/tests/ghc-regress/profiling/should_run/T3001.hs b/testsuite/tests/profiling/should_run/T3001.hs
index f7828c0283..f7828c0283 100644
--- a/testsuite/tests/ghc-regress/profiling/should_run/T3001.hs
+++ b/testsuite/tests/profiling/should_run/T3001.hs
diff --git a/testsuite/tests/ghc-regress/profiling/should_run/T3001.stdout b/testsuite/tests/profiling/should_run/T3001.stdout
index c2dbb5eb63..c2dbb5eb63 100644
--- a/testsuite/tests/ghc-regress/profiling/should_run/T3001.stdout
+++ b/testsuite/tests/profiling/should_run/T3001.stdout
diff --git a/testsuite/tests/ghc-regress/profiling/should_run/all.T b/testsuite/tests/profiling/should_run/all.T
index 5fe2c22eb2..5fe2c22eb2 100644
--- a/testsuite/tests/ghc-regress/profiling/should_run/all.T
+++ b/testsuite/tests/profiling/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/profiling/should_run/bio001.stdout b/testsuite/tests/profiling/should_run/bio001.stdout
index 90ee71a089..90ee71a089 100644
--- a/testsuite/tests/ghc-regress/profiling/should_run/bio001.stdout
+++ b/testsuite/tests/profiling/should_run/bio001.stdout
diff --git a/testsuite/tests/ghc-regress/profiling/should_run/heapprof001.hs b/testsuite/tests/profiling/should_run/heapprof001.hs
index 67c6a17867..67c6a17867 100644
--- a/testsuite/tests/ghc-regress/profiling/should_run/heapprof001.hs
+++ b/testsuite/tests/profiling/should_run/heapprof001.hs
diff --git a/testsuite/tests/ghc-regress/profiling/should_run/heapprof001.stdout b/testsuite/tests/profiling/should_run/heapprof001.stdout
index e62352412e..e62352412e 100644
--- a/testsuite/tests/ghc-regress/profiling/should_run/heapprof001.stdout
+++ b/testsuite/tests/profiling/should_run/heapprof001.stdout
diff --git a/testsuite/tests/ghc-regress/profiling/should_run/scc001.hs b/testsuite/tests/profiling/should_run/scc001.hs
index d153f958ef..d153f958ef 100644
--- a/testsuite/tests/ghc-regress/profiling/should_run/scc001.hs
+++ b/testsuite/tests/profiling/should_run/scc001.hs
diff --git a/testsuite/tests/ghc-regress/profiling/should_run/scc001.stdout b/testsuite/tests/profiling/should_run/scc001.stdout
index c3344ab64e..c3344ab64e 100644
--- a/testsuite/tests/ghc-regress/profiling/should_run/scc001.stdout
+++ b/testsuite/tests/profiling/should_run/scc001.stdout
diff --git a/testsuite/tests/ghc-regress/programs/10queens/10queens.stdout b/testsuite/tests/programs/10queens/10queens.stdout
index 67adbdb354..67adbdb354 100644
--- a/testsuite/tests/ghc-regress/programs/10queens/10queens.stdout
+++ b/testsuite/tests/programs/10queens/10queens.stdout
diff --git a/testsuite/tests/ghc-regress/programs/10queens/Main.hs b/testsuite/tests/programs/10queens/Main.hs
index 6e2fdc0469..6e2fdc0469 100644
--- a/testsuite/tests/ghc-regress/programs/10queens/Main.hs
+++ b/testsuite/tests/programs/10queens/Main.hs
diff --git a/testsuite/tests/programs/10queens/Makefile b/testsuite/tests/programs/10queens/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/10queens/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/10queens/test.T b/testsuite/tests/programs/10queens/test.T
index 4d2b7579ba..4d2b7579ba 100644
--- a/testsuite/tests/ghc-regress/programs/10queens/test.T
+++ b/testsuite/tests/programs/10queens/test.T
diff --git a/testsuite/tests/programs/Makefile b/testsuite/tests/programs/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/programs/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/Makefile-OLD b/testsuite/tests/programs/Makefile-OLD
index 0fab32f683..0fab32f683 100644
--- a/testsuite/tests/ghc-regress/programs/Makefile-OLD
+++ b/testsuite/tests/programs/Makefile-OLD
diff --git a/testsuite/tests/programs/Queens/Makefile b/testsuite/tests/programs/Queens/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/Queens/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/Queens/queens.hs b/testsuite/tests/programs/Queens/queens.hs
index 548e20cb8d..548e20cb8d 100644
--- a/testsuite/tests/ghc-regress/programs/Queens/queens.hs
+++ b/testsuite/tests/programs/Queens/queens.hs
diff --git a/testsuite/tests/ghc-regress/programs/Queens/queens.stdout b/testsuite/tests/programs/Queens/queens.stdout
index 95eafd8a49..95eafd8a49 100644
--- a/testsuite/tests/ghc-regress/programs/Queens/queens.stdout
+++ b/testsuite/tests/programs/Queens/queens.stdout
diff --git a/testsuite/tests/ghc-regress/programs/Queens/test.T b/testsuite/tests/programs/Queens/test.T
index 044ebf6a2c..044ebf6a2c 100644
--- a/testsuite/tests/ghc-regress/programs/Queens/test.T
+++ b/testsuite/tests/programs/Queens/test.T
diff --git a/testsuite/tests/ghc-regress/programs/andre_monad/Main.hs b/testsuite/tests/programs/andre_monad/Main.hs
index 7e3dda6362..7e3dda6362 100644
--- a/testsuite/tests/ghc-regress/programs/andre_monad/Main.hs
+++ b/testsuite/tests/programs/andre_monad/Main.hs
diff --git a/testsuite/tests/programs/andre_monad/Makefile b/testsuite/tests/programs/andre_monad/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/andre_monad/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/andre_monad/andre_monad.stdout b/testsuite/tests/programs/andre_monad/andre_monad.stdout
index 7ea358a0c9..7ea358a0c9 100644
--- a/testsuite/tests/ghc-regress/programs/andre_monad/andre_monad.stdout
+++ b/testsuite/tests/programs/andre_monad/andre_monad.stdout
diff --git a/testsuite/tests/ghc-regress/programs/andre_monad/test.T b/testsuite/tests/programs/andre_monad/test.T
index e5ad78feda..e5ad78feda 100644
--- a/testsuite/tests/ghc-regress/programs/andre_monad/test.T
+++ b/testsuite/tests/programs/andre_monad/test.T
diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/DataTypes.hs b/testsuite/tests/programs/andy_cherry/DataTypes.hs
index 9f7c5571ba..9f7c5571ba 100644
--- a/testsuite/tests/ghc-regress/programs/andy_cherry/DataTypes.hs
+++ b/testsuite/tests/programs/andy_cherry/DataTypes.hs
diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/GenUtils.hs b/testsuite/tests/programs/andy_cherry/GenUtils.hs
index 3e1de07fb8..3e1de07fb8 100644
--- a/testsuite/tests/ghc-regress/programs/andy_cherry/GenUtils.hs
+++ b/testsuite/tests/programs/andy_cherry/GenUtils.hs
diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/Interp.hs b/testsuite/tests/programs/andy_cherry/Interp.hs
index 7d33e896cf..7d33e896cf 100644
--- a/testsuite/tests/ghc-regress/programs/andy_cherry/Interp.hs
+++ b/testsuite/tests/programs/andy_cherry/Interp.hs
diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/InterpUtils.hs b/testsuite/tests/programs/andy_cherry/InterpUtils.hs
index 820163e8fd..820163e8fd 100644
--- a/testsuite/tests/ghc-regress/programs/andy_cherry/InterpUtils.hs
+++ b/testsuite/tests/programs/andy_cherry/InterpUtils.hs
diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/Main.hs b/testsuite/tests/programs/andy_cherry/Main.hs
index aa4274ec59..aa4274ec59 100644
--- a/testsuite/tests/ghc-regress/programs/andy_cherry/Main.hs
+++ b/testsuite/tests/programs/andy_cherry/Main.hs
diff --git a/testsuite/tests/programs/andy_cherry/Makefile b/testsuite/tests/programs/andy_cherry/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/andy_cherry/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/Parser.hs b/testsuite/tests/programs/andy_cherry/Parser.hs
index 6dddb64a0e..6dddb64a0e 100644
--- a/testsuite/tests/ghc-regress/programs/andy_cherry/Parser.hs
+++ b/testsuite/tests/programs/andy_cherry/Parser.hs
diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/PrintTEX.hs b/testsuite/tests/programs/andy_cherry/PrintTEX.hs
index d8f253f6d4..d8f253f6d4 100644
--- a/testsuite/tests/ghc-regress/programs/andy_cherry/PrintTEX.hs
+++ b/testsuite/tests/programs/andy_cherry/PrintTEX.hs
diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/andy_cherry.stdout b/testsuite/tests/programs/andy_cherry/andy_cherry.stdout
index ef160b0325..ef160b0325 100644
--- a/testsuite/tests/ghc-regress/programs/andy_cherry/andy_cherry.stdout
+++ b/testsuite/tests/programs/andy_cherry/andy_cherry.stdout
diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/mygames.pgn b/testsuite/tests/programs/andy_cherry/mygames.pgn
index 3d2e46fa1b..3d2e46fa1b 100644
--- a/testsuite/tests/ghc-regress/programs/andy_cherry/mygames.pgn
+++ b/testsuite/tests/programs/andy_cherry/mygames.pgn
diff --git a/testsuite/tests/ghc-regress/programs/andy_cherry/test.T b/testsuite/tests/programs/andy_cherry/test.T
index 4d14ee306e..4d14ee306e 100644
--- a/testsuite/tests/ghc-regress/programs/andy_cherry/test.T
+++ b/testsuite/tests/programs/andy_cherry/test.T
diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Basic.hs b/testsuite/tests/programs/barton-mangler-bug/Basic.hs
index 1597a86d2f..1597a86d2f 100644
--- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Basic.hs
+++ b/testsuite/tests/programs/barton-mangler-bug/Basic.hs
diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Bug.hs b/testsuite/tests/programs/barton-mangler-bug/Bug.hs
index 0f75dffc94..0f75dffc94 100644
--- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Bug.hs
+++ b/testsuite/tests/programs/barton-mangler-bug/Bug.hs
diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Expected.hs b/testsuite/tests/programs/barton-mangler-bug/Expected.hs
index a047c2ed29..a047c2ed29 100644
--- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Expected.hs
+++ b/testsuite/tests/programs/barton-mangler-bug/Expected.hs
diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Main.hs b/testsuite/tests/programs/barton-mangler-bug/Main.hs
index 34b8dd8cd5..34b8dd8cd5 100644
--- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Main.hs
+++ b/testsuite/tests/programs/barton-mangler-bug/Main.hs
diff --git a/testsuite/tests/programs/barton-mangler-bug/Makefile b/testsuite/tests/programs/barton-mangler-bug/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/barton-mangler-bug/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Physical.hs b/testsuite/tests/programs/barton-mangler-bug/Physical.hs
index 91981e0ac5..91981e0ac5 100644
--- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Physical.hs
+++ b/testsuite/tests/programs/barton-mangler-bug/Physical.hs
diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Plot.lhs b/testsuite/tests/programs/barton-mangler-bug/Plot.lhs
index 8db1066aef..8db1066aef 100644
--- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/Plot.lhs
+++ b/testsuite/tests/programs/barton-mangler-bug/Plot.lhs
diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/PlotExample.lhs b/testsuite/tests/programs/barton-mangler-bug/PlotExample.lhs
index 66a13fbca7..66a13fbca7 100644
--- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/PlotExample.lhs
+++ b/testsuite/tests/programs/barton-mangler-bug/PlotExample.lhs
diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/TypesettingTricks.hs b/testsuite/tests/programs/barton-mangler-bug/TypesettingTricks.hs
index 446e4e868c..446e4e868c 100644
--- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/TypesettingTricks.hs
+++ b/testsuite/tests/programs/barton-mangler-bug/TypesettingTricks.hs
diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/barton-mangler-bug.stdout b/testsuite/tests/programs/barton-mangler-bug/barton-mangler-bug.stdout
index 7b801af7f3..7b801af7f3 100644
--- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/barton-mangler-bug.stdout
+++ b/testsuite/tests/programs/barton-mangler-bug/barton-mangler-bug.stdout
diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/piece.gnp b/testsuite/tests/programs/barton-mangler-bug/piece.gnp
index 2256bd670e..2256bd670e 100644
--- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/piece.gnp
+++ b/testsuite/tests/programs/barton-mangler-bug/piece.gnp
diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/piece.plt b/testsuite/tests/programs/barton-mangler-bug/piece.plt
index e93d58c398..e93d58c398 100644
--- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/piece.plt
+++ b/testsuite/tests/programs/barton-mangler-bug/piece.plt
diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/sine.gnp b/testsuite/tests/programs/barton-mangler-bug/sine.gnp
index 0e5d95582f..0e5d95582f 100644
--- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/sine.gnp
+++ b/testsuite/tests/programs/barton-mangler-bug/sine.gnp
diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/sine.plt b/testsuite/tests/programs/barton-mangler-bug/sine.plt
index 6168d0e964..6168d0e964 100644
--- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/sine.plt
+++ b/testsuite/tests/programs/barton-mangler-bug/sine.plt
diff --git a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/test.T b/testsuite/tests/programs/barton-mangler-bug/test.T
index 966b971ae9..966b971ae9 100644
--- a/testsuite/tests/ghc-regress/programs/barton-mangler-bug/test.T
+++ b/testsuite/tests/programs/barton-mangler-bug/test.T
diff --git a/testsuite/tests/ghc-regress/programs/cholewo-eval/Arr.lhs b/testsuite/tests/programs/cholewo-eval/Arr.lhs
index 799f493529..799f493529 100644
--- a/testsuite/tests/ghc-regress/programs/cholewo-eval/Arr.lhs
+++ b/testsuite/tests/programs/cholewo-eval/Arr.lhs
diff --git a/testsuite/tests/ghc-regress/programs/cholewo-eval/Main.lhs b/testsuite/tests/programs/cholewo-eval/Main.lhs
index a2e5c8d25f..a2e5c8d25f 100644
--- a/testsuite/tests/ghc-regress/programs/cholewo-eval/Main.lhs
+++ b/testsuite/tests/programs/cholewo-eval/Main.lhs
diff --git a/testsuite/tests/programs/cholewo-eval/Makefile b/testsuite/tests/programs/cholewo-eval/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/cholewo-eval/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/cholewo-eval/cholewo-eval.stdout b/testsuite/tests/programs/cholewo-eval/cholewo-eval.stdout
index 3ea84b769b..3ea84b769b 100644
--- a/testsuite/tests/ghc-regress/programs/cholewo-eval/cholewo-eval.stdout
+++ b/testsuite/tests/programs/cholewo-eval/cholewo-eval.stdout
diff --git a/testsuite/tests/ghc-regress/programs/cholewo-eval/test.T b/testsuite/tests/programs/cholewo-eval/test.T
index 32efd68f7b..32efd68f7b 100644
--- a/testsuite/tests/ghc-regress/programs/cholewo-eval/test.T
+++ b/testsuite/tests/programs/cholewo-eval/test.T
diff --git a/testsuite/tests/ghc-regress/programs/cvh_unboxing/Append.lhs b/testsuite/tests/programs/cvh_unboxing/Append.lhs
index 9c96ed6553..9c96ed6553 100644
--- a/testsuite/tests/ghc-regress/programs/cvh_unboxing/Append.lhs
+++ b/testsuite/tests/programs/cvh_unboxing/Append.lhs
diff --git a/testsuite/tests/ghc-regress/programs/cvh_unboxing/Main.lhs b/testsuite/tests/programs/cvh_unboxing/Main.lhs
index be874a5258..be874a5258 100644
--- a/testsuite/tests/ghc-regress/programs/cvh_unboxing/Main.lhs
+++ b/testsuite/tests/programs/cvh_unboxing/Main.lhs
diff --git a/testsuite/tests/programs/cvh_unboxing/Makefile b/testsuite/tests/programs/cvh_unboxing/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/cvh_unboxing/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/cvh_unboxing/README b/testsuite/tests/programs/cvh_unboxing/README
index e80b542db6..e80b542db6 100644
--- a/testsuite/tests/ghc-regress/programs/cvh_unboxing/README
+++ b/testsuite/tests/programs/cvh_unboxing/README
diff --git a/testsuite/tests/ghc-regress/programs/cvh_unboxing/Types.lhs b/testsuite/tests/programs/cvh_unboxing/Types.lhs
index cba89cf45b..cba89cf45b 100644
--- a/testsuite/tests/ghc-regress/programs/cvh_unboxing/Types.lhs
+++ b/testsuite/tests/programs/cvh_unboxing/Types.lhs
diff --git a/testsuite/tests/ghc-regress/programs/cvh_unboxing/cvh_unboxing.stdout b/testsuite/tests/programs/cvh_unboxing/cvh_unboxing.stdout
index 742e221412..742e221412 100644
--- a/testsuite/tests/ghc-regress/programs/cvh_unboxing/cvh_unboxing.stdout
+++ b/testsuite/tests/programs/cvh_unboxing/cvh_unboxing.stdout
diff --git a/testsuite/tests/ghc-regress/programs/cvh_unboxing/test.T b/testsuite/tests/programs/cvh_unboxing/test.T
index 4208a7f2af..4208a7f2af 100644
--- a/testsuite/tests/ghc-regress/programs/cvh_unboxing/test.T
+++ b/testsuite/tests/programs/cvh_unboxing/test.T
diff --git a/testsuite/tests/ghc-regress/programs/fast2haskell/Fast2haskell.hs b/testsuite/tests/programs/fast2haskell/Fast2haskell.hs
index da8789eca4..da8789eca4 100644
--- a/testsuite/tests/ghc-regress/programs/fast2haskell/Fast2haskell.hs
+++ b/testsuite/tests/programs/fast2haskell/Fast2haskell.hs
diff --git a/testsuite/tests/ghc-regress/programs/fast2haskell/Main.hs b/testsuite/tests/programs/fast2haskell/Main.hs
index 9c4a21dece..9c4a21dece 100644
--- a/testsuite/tests/ghc-regress/programs/fast2haskell/Main.hs
+++ b/testsuite/tests/programs/fast2haskell/Main.hs
diff --git a/testsuite/tests/programs/fast2haskell/Makefile b/testsuite/tests/programs/fast2haskell/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/fast2haskell/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/fast2haskell/fast2haskell.stdout b/testsuite/tests/programs/fast2haskell/fast2haskell.stdout
index 2f493161d6..2f493161d6 100644
--- a/testsuite/tests/ghc-regress/programs/fast2haskell/fast2haskell.stdout
+++ b/testsuite/tests/programs/fast2haskell/fast2haskell.stdout
diff --git a/testsuite/tests/ghc-regress/programs/fast2haskell/test.T b/testsuite/tests/programs/fast2haskell/test.T
index a730ffdfe2..a730ffdfe2 100644
--- a/testsuite/tests/ghc-regress/programs/fast2haskell/test.T
+++ b/testsuite/tests/programs/fast2haskell/test.T
diff --git a/testsuite/tests/ghc-regress/programs/fun_insts/Main.hs b/testsuite/tests/programs/fun_insts/Main.hs
index fece8c9c47..fece8c9c47 100644
--- a/testsuite/tests/ghc-regress/programs/fun_insts/Main.hs
+++ b/testsuite/tests/programs/fun_insts/Main.hs
diff --git a/testsuite/tests/programs/fun_insts/Makefile b/testsuite/tests/programs/fun_insts/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/fun_insts/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/fun_insts/fun_insts.stdout b/testsuite/tests/programs/fun_insts/fun_insts.stdout
index 7886e5523c..7886e5523c 100644
--- a/testsuite/tests/ghc-regress/programs/fun_insts/fun_insts.stdout
+++ b/testsuite/tests/programs/fun_insts/fun_insts.stdout
diff --git a/testsuite/tests/ghc-regress/programs/fun_insts/test.T b/testsuite/tests/programs/fun_insts/test.T
index 5151488038..5151488038 100644
--- a/testsuite/tests/ghc-regress/programs/fun_insts/test.T
+++ b/testsuite/tests/programs/fun_insts/test.T
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/CSG.hs b/testsuite/tests/programs/galois_raytrace/CSG.hs
index ba37a17b25..ba37a17b25 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/CSG.hs
+++ b/testsuite/tests/programs/galois_raytrace/CSG.hs
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/Construct.hs b/testsuite/tests/programs/galois_raytrace/Construct.hs
index 90dbc60f9e..90dbc60f9e 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/Construct.hs
+++ b/testsuite/tests/programs/galois_raytrace/Construct.hs
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/Data.hs b/testsuite/tests/programs/galois_raytrace/Data.hs
index 11e12ab79f..11e12ab79f 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/Data.hs
+++ b/testsuite/tests/programs/galois_raytrace/Data.hs
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/Eval.hs b/testsuite/tests/programs/galois_raytrace/Eval.hs
index 75568f0b04..75568f0b04 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/Eval.hs
+++ b/testsuite/tests/programs/galois_raytrace/Eval.hs
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/Geometry.hs b/testsuite/tests/programs/galois_raytrace/Geometry.hs
index 673c7d4812..673c7d4812 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/Geometry.hs
+++ b/testsuite/tests/programs/galois_raytrace/Geometry.hs
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/Illumination.hs b/testsuite/tests/programs/galois_raytrace/Illumination.hs
index 155a7a9a76..155a7a9a76 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/Illumination.hs
+++ b/testsuite/tests/programs/galois_raytrace/Illumination.hs
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/Intersections.hs b/testsuite/tests/programs/galois_raytrace/Intersections.hs
index c7fe003eb3..c7fe003eb3 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/Intersections.hs
+++ b/testsuite/tests/programs/galois_raytrace/Intersections.hs
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/Interval.hs b/testsuite/tests/programs/galois_raytrace/Interval.hs
index a4d313f66e..a4d313f66e 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/Interval.hs
+++ b/testsuite/tests/programs/galois_raytrace/Interval.hs
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/Main.hs b/testsuite/tests/programs/galois_raytrace/Main.hs
index 4ef9fe3e95..4ef9fe3e95 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/Main.hs
+++ b/testsuite/tests/programs/galois_raytrace/Main.hs
diff --git a/testsuite/tests/programs/galois_raytrace/Makefile b/testsuite/tests/programs/galois_raytrace/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/galois_raytrace/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/Misc.hs b/testsuite/tests/programs/galois_raytrace/Misc.hs
index 104bd06af1..104bd06af1 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/Misc.hs
+++ b/testsuite/tests/programs/galois_raytrace/Misc.hs
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/Parse.hs b/testsuite/tests/programs/galois_raytrace/Parse.hs
index 931655c16e..931655c16e 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/Parse.hs
+++ b/testsuite/tests/programs/galois_raytrace/Parse.hs
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/Pixmap.hs b/testsuite/tests/programs/galois_raytrace/Pixmap.hs
index 11d20f0df2..11d20f0df2 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/Pixmap.hs
+++ b/testsuite/tests/programs/galois_raytrace/Pixmap.hs
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/Primitives.hs b/testsuite/tests/programs/galois_raytrace/Primitives.hs
index 2f21654055..2f21654055 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/Primitives.hs
+++ b/testsuite/tests/programs/galois_raytrace/Primitives.hs
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/RayTrace.hs b/testsuite/tests/programs/galois_raytrace/RayTrace.hs
index cb15388e2c..cb15388e2c 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/RayTrace.hs
+++ b/testsuite/tests/programs/galois_raytrace/RayTrace.hs
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/Surface.hs b/testsuite/tests/programs/galois_raytrace/Surface.hs
index 832f0fcae2..832f0fcae2 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/Surface.hs
+++ b/testsuite/tests/programs/galois_raytrace/Surface.hs
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/galois.gml b/testsuite/tests/programs/galois_raytrace/galois.gml
index 5029d57620..5029d57620 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/galois.gml
+++ b/testsuite/tests/programs/galois_raytrace/galois.gml
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/galois_raytrace.stdout b/testsuite/tests/programs/galois_raytrace/galois_raytrace.stdout
index ca44ff5c4b..ca44ff5c4b 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/galois_raytrace.stdout
+++ b/testsuite/tests/programs/galois_raytrace/galois_raytrace.stdout
diff --git a/testsuite/tests/ghc-regress/programs/galois_raytrace/test.T b/testsuite/tests/programs/galois_raytrace/test.T
index 169e162d6a..169e162d6a 100644
--- a/testsuite/tests/ghc-regress/programs/galois_raytrace/test.T
+++ b/testsuite/tests/programs/galois_raytrace/test.T
diff --git a/testsuite/tests/ghc-regress/programs/hs-boot/A.hs b/testsuite/tests/programs/hs-boot/A.hs
index e09cebb67b..e09cebb67b 100644
--- a/testsuite/tests/ghc-regress/programs/hs-boot/A.hs
+++ b/testsuite/tests/programs/hs-boot/A.hs
diff --git a/testsuite/tests/ghc-regress/programs/hs-boot/A.hs-boot b/testsuite/tests/programs/hs-boot/A.hs-boot
index c80b00d29d..c80b00d29d 100644
--- a/testsuite/tests/ghc-regress/programs/hs-boot/A.hs-boot
+++ b/testsuite/tests/programs/hs-boot/A.hs-boot
diff --git a/testsuite/tests/ghc-regress/programs/hs-boot/B.hs b/testsuite/tests/programs/hs-boot/B.hs
index 13d1ac4948..13d1ac4948 100644
--- a/testsuite/tests/ghc-regress/programs/hs-boot/B.hs
+++ b/testsuite/tests/programs/hs-boot/B.hs
diff --git a/testsuite/tests/ghc-regress/programs/hs-boot/C.hs b/testsuite/tests/programs/hs-boot/C.hs
index b81773302e..b81773302e 100644
--- a/testsuite/tests/ghc-regress/programs/hs-boot/C.hs
+++ b/testsuite/tests/programs/hs-boot/C.hs
diff --git a/testsuite/tests/ghc-regress/programs/hs-boot/Main.hs b/testsuite/tests/programs/hs-boot/Main.hs
index 2f51014fd2..2f51014fd2 100644
--- a/testsuite/tests/ghc-regress/programs/hs-boot/Main.hs
+++ b/testsuite/tests/programs/hs-boot/Main.hs
diff --git a/testsuite/tests/programs/hs-boot/Makefile b/testsuite/tests/programs/hs-boot/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/hs-boot/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/hs-boot/all.T b/testsuite/tests/programs/hs-boot/all.T
index eb48087188..eb48087188 100644
--- a/testsuite/tests/ghc-regress/programs/hs-boot/all.T
+++ b/testsuite/tests/programs/hs-boot/all.T
diff --git a/testsuite/tests/ghc-regress/programs/hs-boot/hs-boot.stderr b/testsuite/tests/programs/hs-boot/hs-boot.stderr
index 99de1b67f5..99de1b67f5 100644
--- a/testsuite/tests/ghc-regress/programs/hs-boot/hs-boot.stderr
+++ b/testsuite/tests/programs/hs-boot/hs-boot.stderr
diff --git a/testsuite/tests/ghc-regress/programs/jl_defaults/Main.hs b/testsuite/tests/programs/jl_defaults/Main.hs
index 7264c53c1e..7264c53c1e 100644
--- a/testsuite/tests/ghc-regress/programs/jl_defaults/Main.hs
+++ b/testsuite/tests/programs/jl_defaults/Main.hs
diff --git a/testsuite/tests/programs/jl_defaults/Makefile b/testsuite/tests/programs/jl_defaults/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/jl_defaults/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/jl_defaults/jl_defaults.stdin b/testsuite/tests/programs/jl_defaults/jl_defaults.stdin
index 9f42b3cdaf..9f42b3cdaf 100644
--- a/testsuite/tests/ghc-regress/programs/jl_defaults/jl_defaults.stdin
+++ b/testsuite/tests/programs/jl_defaults/jl_defaults.stdin
diff --git a/testsuite/tests/ghc-regress/programs/jl_defaults/jl_defaults.stdout b/testsuite/tests/programs/jl_defaults/jl_defaults.stdout
index 96af88d02a..96af88d02a 100644
--- a/testsuite/tests/ghc-regress/programs/jl_defaults/jl_defaults.stdout
+++ b/testsuite/tests/programs/jl_defaults/jl_defaults.stdout
diff --git a/testsuite/tests/ghc-regress/programs/jl_defaults/test.T b/testsuite/tests/programs/jl_defaults/test.T
index 0f6e4cbd69..0f6e4cbd69 100644
--- a/testsuite/tests/ghc-regress/programs/jl_defaults/test.T
+++ b/testsuite/tests/programs/jl_defaults/test.T
diff --git a/testsuite/tests/ghc-regress/programs/joao-circular/Data_Lazy.hs b/testsuite/tests/programs/joao-circular/Data_Lazy.hs
index d5ab24a9ca..d5ab24a9ca 100644
--- a/testsuite/tests/ghc-regress/programs/joao-circular/Data_Lazy.hs
+++ b/testsuite/tests/programs/joao-circular/Data_Lazy.hs
diff --git a/testsuite/tests/ghc-regress/programs/joao-circular/Funcs_Lexer.hs b/testsuite/tests/programs/joao-circular/Funcs_Lexer.hs
index c9f5c07b16..c9f5c07b16 100644
--- a/testsuite/tests/ghc-regress/programs/joao-circular/Funcs_Lexer.hs
+++ b/testsuite/tests/programs/joao-circular/Funcs_Lexer.hs
diff --git a/testsuite/tests/ghc-regress/programs/joao-circular/Funcs_Parser_Lazy.hs b/testsuite/tests/programs/joao-circular/Funcs_Parser_Lazy.hs
index ec47769beb..ec47769beb 100644
--- a/testsuite/tests/ghc-regress/programs/joao-circular/Funcs_Parser_Lazy.hs
+++ b/testsuite/tests/programs/joao-circular/Funcs_Parser_Lazy.hs
diff --git a/testsuite/tests/ghc-regress/programs/joao-circular/LrcPrelude.hs b/testsuite/tests/programs/joao-circular/LrcPrelude.hs
index 84daa7fed8..84daa7fed8 100644
--- a/testsuite/tests/ghc-regress/programs/joao-circular/LrcPrelude.hs
+++ b/testsuite/tests/programs/joao-circular/LrcPrelude.hs
diff --git a/testsuite/tests/ghc-regress/programs/joao-circular/Main.hs b/testsuite/tests/programs/joao-circular/Main.hs
index 2202554816..2202554816 100644
--- a/testsuite/tests/ghc-regress/programs/joao-circular/Main.hs
+++ b/testsuite/tests/programs/joao-circular/Main.hs
diff --git a/testsuite/tests/programs/joao-circular/Makefile b/testsuite/tests/programs/joao-circular/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/joao-circular/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/joao-circular/README b/testsuite/tests/programs/joao-circular/README
index f022b71126..f022b71126 100644
--- a/testsuite/tests/ghc-regress/programs/joao-circular/README
+++ b/testsuite/tests/programs/joao-circular/README
diff --git a/testsuite/tests/ghc-regress/programs/joao-circular/Visfun_Lazy.hs b/testsuite/tests/programs/joao-circular/Visfun_Lazy.hs
index fa768999c0..fa768999c0 100644
--- a/testsuite/tests/ghc-regress/programs/joao-circular/Visfun_Lazy.hs
+++ b/testsuite/tests/programs/joao-circular/Visfun_Lazy.hs
diff --git a/testsuite/tests/ghc-regress/programs/joao-circular/inp b/testsuite/tests/programs/joao-circular/inp
index 9f88682479..9f88682479 100644
--- a/testsuite/tests/ghc-regress/programs/joao-circular/inp
+++ b/testsuite/tests/programs/joao-circular/inp
diff --git a/testsuite/tests/ghc-regress/programs/joao-circular/joao-circular.stdout b/testsuite/tests/programs/joao-circular/joao-circular.stdout
index 0c69f85dbc..0c69f85dbc 100644
--- a/testsuite/tests/ghc-regress/programs/joao-circular/joao-circular.stdout
+++ b/testsuite/tests/programs/joao-circular/joao-circular.stdout
diff --git a/testsuite/tests/ghc-regress/programs/joao-circular/test.T b/testsuite/tests/programs/joao-circular/test.T
index 935ec7e6f4..935ec7e6f4 100644
--- a/testsuite/tests/ghc-regress/programs/joao-circular/test.T
+++ b/testsuite/tests/programs/joao-circular/test.T
diff --git a/testsuite/tests/ghc-regress/programs/jq_readsPrec/Main.hs b/testsuite/tests/programs/jq_readsPrec/Main.hs
index 360a411ef0..360a411ef0 100644
--- a/testsuite/tests/ghc-regress/programs/jq_readsPrec/Main.hs
+++ b/testsuite/tests/programs/jq_readsPrec/Main.hs
diff --git a/testsuite/tests/programs/jq_readsPrec/Makefile b/testsuite/tests/programs/jq_readsPrec/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/jq_readsPrec/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/jq_readsPrec/jq_readsPrec.stdin b/testsuite/tests/programs/jq_readsPrec/jq_readsPrec.stdin
index 8cc78bf4cd..8cc78bf4cd 100644
--- a/testsuite/tests/ghc-regress/programs/jq_readsPrec/jq_readsPrec.stdin
+++ b/testsuite/tests/programs/jq_readsPrec/jq_readsPrec.stdin
diff --git a/testsuite/tests/ghc-regress/programs/jq_readsPrec/jq_readsPrec.stdout b/testsuite/tests/programs/jq_readsPrec/jq_readsPrec.stdout
index 725c38e559..725c38e559 100644
--- a/testsuite/tests/ghc-regress/programs/jq_readsPrec/jq_readsPrec.stdout
+++ b/testsuite/tests/programs/jq_readsPrec/jq_readsPrec.stdout
diff --git a/testsuite/tests/ghc-regress/programs/jq_readsPrec/test.T b/testsuite/tests/programs/jq_readsPrec/test.T
index 393f82c4b3..393f82c4b3 100644
--- a/testsuite/tests/ghc-regress/programs/jq_readsPrec/test.T
+++ b/testsuite/tests/programs/jq_readsPrec/test.T
diff --git a/testsuite/tests/ghc-regress/programs/jtod_circint/Bit.hs b/testsuite/tests/programs/jtod_circint/Bit.hs
index be11a6f517..be11a6f517 100644
--- a/testsuite/tests/ghc-regress/programs/jtod_circint/Bit.hs
+++ b/testsuite/tests/programs/jtod_circint/Bit.hs
diff --git a/testsuite/tests/ghc-regress/programs/jtod_circint/LogFun.hs b/testsuite/tests/programs/jtod_circint/LogFun.hs
index b9a5bf169d..b9a5bf169d 100644
--- a/testsuite/tests/ghc-regress/programs/jtod_circint/LogFun.hs
+++ b/testsuite/tests/programs/jtod_circint/LogFun.hs
diff --git a/testsuite/tests/ghc-regress/programs/jtod_circint/Main.hs b/testsuite/tests/programs/jtod_circint/Main.hs
index a1907dc6a9..a1907dc6a9 100644
--- a/testsuite/tests/ghc-regress/programs/jtod_circint/Main.hs
+++ b/testsuite/tests/programs/jtod_circint/Main.hs
diff --git a/testsuite/tests/programs/jtod_circint/Makefile b/testsuite/tests/programs/jtod_circint/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/jtod_circint/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/jtod_circint/Signal.hs b/testsuite/tests/programs/jtod_circint/Signal.hs
index 38a1fc86f5..38a1fc86f5 100644
--- a/testsuite/tests/ghc-regress/programs/jtod_circint/Signal.hs
+++ b/testsuite/tests/programs/jtod_circint/Signal.hs
diff --git a/testsuite/tests/ghc-regress/programs/jtod_circint/jtod_circint.stdout b/testsuite/tests/programs/jtod_circint/jtod_circint.stdout
index bc629dadd2..bc629dadd2 100644
--- a/testsuite/tests/ghc-regress/programs/jtod_circint/jtod_circint.stdout
+++ b/testsuite/tests/programs/jtod_circint/jtod_circint.stdout
diff --git a/testsuite/tests/ghc-regress/programs/jtod_circint/test.T b/testsuite/tests/programs/jtod_circint/test.T
index 47338d7b89..47338d7b89 100644
--- a/testsuite/tests/ghc-regress/programs/jtod_circint/test.T
+++ b/testsuite/tests/programs/jtod_circint/test.T
diff --git a/testsuite/tests/ghc-regress/programs/jules_xref/Main.hs b/testsuite/tests/programs/jules_xref/Main.hs
index 19f364d0f9..19f364d0f9 100644
--- a/testsuite/tests/ghc-regress/programs/jules_xref/Main.hs
+++ b/testsuite/tests/programs/jules_xref/Main.hs
diff --git a/testsuite/tests/programs/jules_xref/Makefile b/testsuite/tests/programs/jules_xref/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/jules_xref/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/jules_xref/jules_xref.stdin b/testsuite/tests/programs/jules_xref/jules_xref.stdin
index a43907d9bd..a43907d9bd 100644
--- a/testsuite/tests/ghc-regress/programs/jules_xref/jules_xref.stdin
+++ b/testsuite/tests/programs/jules_xref/jules_xref.stdin
diff --git a/testsuite/tests/ghc-regress/programs/jules_xref/jules_xref.stdout b/testsuite/tests/programs/jules_xref/jules_xref.stdout
index 8a8af9e4c6..8a8af9e4c6 100644
--- a/testsuite/tests/ghc-regress/programs/jules_xref/jules_xref.stdout
+++ b/testsuite/tests/programs/jules_xref/jules_xref.stdout
diff --git a/testsuite/tests/ghc-regress/programs/jules_xref/test.T b/testsuite/tests/programs/jules_xref/test.T
index 07da9cbd0d..07da9cbd0d 100644
--- a/testsuite/tests/ghc-regress/programs/jules_xref/test.T
+++ b/testsuite/tests/programs/jules_xref/test.T
diff --git a/testsuite/tests/ghc-regress/programs/jules_xref2/Main.hs b/testsuite/tests/programs/jules_xref2/Main.hs
index 10d20a5671..10d20a5671 100644
--- a/testsuite/tests/ghc-regress/programs/jules_xref2/Main.hs
+++ b/testsuite/tests/programs/jules_xref2/Main.hs
diff --git a/testsuite/tests/programs/jules_xref2/Makefile b/testsuite/tests/programs/jules_xref2/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/jules_xref2/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/jules_xref2/jules_xref2.stdin b/testsuite/tests/programs/jules_xref2/jules_xref2.stdin
index a43907d9bd..a43907d9bd 100644
--- a/testsuite/tests/ghc-regress/programs/jules_xref2/jules_xref2.stdin
+++ b/testsuite/tests/programs/jules_xref2/jules_xref2.stdin
diff --git a/testsuite/tests/ghc-regress/programs/jules_xref2/jules_xref2.stdout b/testsuite/tests/programs/jules_xref2/jules_xref2.stdout
index 6adf88b894..6adf88b894 100644
--- a/testsuite/tests/ghc-regress/programs/jules_xref2/jules_xref2.stdout
+++ b/testsuite/tests/programs/jules_xref2/jules_xref2.stdout
diff --git a/testsuite/tests/ghc-regress/programs/jules_xref2/test.T b/testsuite/tests/programs/jules_xref2/test.T
index 384155c8c7..384155c8c7 100644
--- a/testsuite/tests/ghc-regress/programs/jules_xref2/test.T
+++ b/testsuite/tests/programs/jules_xref2/test.T
diff --git a/testsuite/tests/ghc-regress/programs/launchbury/Main.hs b/testsuite/tests/programs/launchbury/Main.hs
index 6351d54aa7..6351d54aa7 100644
--- a/testsuite/tests/ghc-regress/programs/launchbury/Main.hs
+++ b/testsuite/tests/programs/launchbury/Main.hs
diff --git a/testsuite/tests/programs/launchbury/Makefile b/testsuite/tests/programs/launchbury/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/launchbury/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/launchbury/launchbury.stdin b/testsuite/tests/programs/launchbury/launchbury.stdin
index 085b33d738..085b33d738 100644
--- a/testsuite/tests/ghc-regress/programs/launchbury/launchbury.stdin
+++ b/testsuite/tests/programs/launchbury/launchbury.stdin
diff --git a/testsuite/tests/ghc-regress/programs/launchbury/launchbury.stdout b/testsuite/tests/programs/launchbury/launchbury.stdout
index 9eb035733e..9eb035733e 100644
--- a/testsuite/tests/ghc-regress/programs/launchbury/launchbury.stdout
+++ b/testsuite/tests/programs/launchbury/launchbury.stdout
diff --git a/testsuite/tests/ghc-regress/programs/launchbury/test.T b/testsuite/tests/programs/launchbury/test.T
index 937bb94a6e..937bb94a6e 100644
--- a/testsuite/tests/ghc-regress/programs/launchbury/test.T
+++ b/testsuite/tests/programs/launchbury/test.T
diff --git a/testsuite/tests/ghc-regress/programs/lennart_range/Main.hs b/testsuite/tests/programs/lennart_range/Main.hs
index c45e4b2b36..c45e4b2b36 100644
--- a/testsuite/tests/ghc-regress/programs/lennart_range/Main.hs
+++ b/testsuite/tests/programs/lennart_range/Main.hs
diff --git a/testsuite/tests/programs/lennart_range/Makefile b/testsuite/tests/programs/lennart_range/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/lennart_range/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/lennart_range/lennart_range.stdout b/testsuite/tests/programs/lennart_range/lennart_range.stdout
index 5196dcc970..5196dcc970 100644
--- a/testsuite/tests/ghc-regress/programs/lennart_range/lennart_range.stdout
+++ b/testsuite/tests/programs/lennart_range/lennart_range.stdout
diff --git a/testsuite/tests/ghc-regress/programs/lennart_range/test.T b/testsuite/tests/programs/lennart_range/test.T
index f308f0039d..f308f0039d 100644
--- a/testsuite/tests/ghc-regress/programs/lennart_range/test.T
+++ b/testsuite/tests/programs/lennart_range/test.T
diff --git a/testsuite/tests/ghc-regress/programs/lex/Main.hs b/testsuite/tests/programs/lex/Main.hs
index 4c9a44802d..4c9a44802d 100644
--- a/testsuite/tests/ghc-regress/programs/lex/Main.hs
+++ b/testsuite/tests/programs/lex/Main.hs
diff --git a/testsuite/tests/programs/lex/Makefile b/testsuite/tests/programs/lex/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/lex/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/lex/lex.stdin b/testsuite/tests/programs/lex/lex.stdin
index dcd009c41b..dcd009c41b 100644
--- a/testsuite/tests/ghc-regress/programs/lex/lex.stdin
+++ b/testsuite/tests/programs/lex/lex.stdin
diff --git a/testsuite/tests/ghc-regress/programs/lex/lex.stdout b/testsuite/tests/programs/lex/lex.stdout
index e1e9e468d1..e1e9e468d1 100644
--- a/testsuite/tests/ghc-regress/programs/lex/lex.stdout
+++ b/testsuite/tests/programs/lex/lex.stdout
diff --git a/testsuite/tests/ghc-regress/programs/lex/test.T b/testsuite/tests/programs/lex/test.T
index da6e227a68..da6e227a68 100644
--- a/testsuite/tests/ghc-regress/programs/lex/test.T
+++ b/testsuite/tests/programs/lex/test.T
diff --git a/testsuite/tests/ghc-regress/programs/life_space_leak/Main.hs b/testsuite/tests/programs/life_space_leak/Main.hs
index b794a3779a..b794a3779a 100644
--- a/testsuite/tests/ghc-regress/programs/life_space_leak/Main.hs
+++ b/testsuite/tests/programs/life_space_leak/Main.hs
diff --git a/testsuite/tests/programs/life_space_leak/Makefile b/testsuite/tests/programs/life_space_leak/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/life_space_leak/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/life_space_leak/life.test b/testsuite/tests/programs/life_space_leak/life.test
index 41d7928373..41d7928373 100644
--- a/testsuite/tests/ghc-regress/programs/life_space_leak/life.test
+++ b/testsuite/tests/programs/life_space_leak/life.test
diff --git a/testsuite/tests/ghc-regress/programs/life_space_leak/life_space_leak.stdout b/testsuite/tests/programs/life_space_leak/life_space_leak.stdout
index efb639a1c5..efb639a1c5 100644
--- a/testsuite/tests/ghc-regress/programs/life_space_leak/life_space_leak.stdout
+++ b/testsuite/tests/programs/life_space_leak/life_space_leak.stdout
diff --git a/testsuite/tests/ghc-regress/programs/life_space_leak/test.T b/testsuite/tests/programs/life_space_leak/test.T
index 417342f38e..417342f38e 100644
--- a/testsuite/tests/ghc-regress/programs/life_space_leak/test.T
+++ b/testsuite/tests/programs/life_space_leak/test.T
diff --git a/testsuite/tests/ghc-regress/programs/maessen-hashtab/Data/HashTab.hs b/testsuite/tests/programs/maessen-hashtab/Data/HashTab.hs
index 8251a760c8..8251a760c8 100644
--- a/testsuite/tests/ghc-regress/programs/maessen-hashtab/Data/HashTab.hs
+++ b/testsuite/tests/programs/maessen-hashtab/Data/HashTab.hs
diff --git a/testsuite/tests/ghc-regress/programs/maessen-hashtab/HashTest.hs b/testsuite/tests/programs/maessen-hashtab/HashTest.hs
index 51c60c0640..51c60c0640 100644
--- a/testsuite/tests/ghc-regress/programs/maessen-hashtab/HashTest.hs
+++ b/testsuite/tests/programs/maessen-hashtab/HashTest.hs
diff --git a/testsuite/tests/programs/maessen-hashtab/Makefile b/testsuite/tests/programs/maessen-hashtab/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/maessen-hashtab/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/maessen-hashtab/maessen_hashtab.stdout b/testsuite/tests/programs/maessen-hashtab/maessen_hashtab.stdout
index b667dcaae0..b667dcaae0 100644
--- a/testsuite/tests/ghc-regress/programs/maessen-hashtab/maessen_hashtab.stdout
+++ b/testsuite/tests/programs/maessen-hashtab/maessen_hashtab.stdout
diff --git a/testsuite/tests/ghc-regress/programs/maessen-hashtab/test.T b/testsuite/tests/programs/maessen-hashtab/test.T
index 807cb85e81..807cb85e81 100644
--- a/testsuite/tests/ghc-regress/programs/maessen-hashtab/test.T
+++ b/testsuite/tests/programs/maessen-hashtab/test.T
diff --git a/testsuite/tests/ghc-regress/programs/north_array/Main.hs b/testsuite/tests/programs/north_array/Main.hs
index b6ceb706d6..b6ceb706d6 100644
--- a/testsuite/tests/ghc-regress/programs/north_array/Main.hs
+++ b/testsuite/tests/programs/north_array/Main.hs
diff --git a/testsuite/tests/programs/north_array/Makefile b/testsuite/tests/programs/north_array/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/north_array/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/north_array/north_array.stdout b/testsuite/tests/programs/north_array/north_array.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/programs/north_array/north_array.stdout
+++ b/testsuite/tests/programs/north_array/north_array.stdout
diff --git a/testsuite/tests/ghc-regress/programs/north_array/test.T b/testsuite/tests/programs/north_array/test.T
index e2b89b4501..e2b89b4501 100644
--- a/testsuite/tests/ghc-regress/programs/north_array/test.T
+++ b/testsuite/tests/programs/north_array/test.T
diff --git a/testsuite/tests/ghc-regress/programs/okeefe_neural/Main.hs b/testsuite/tests/programs/okeefe_neural/Main.hs
index 0717238787..0717238787 100644
--- a/testsuite/tests/ghc-regress/programs/okeefe_neural/Main.hs
+++ b/testsuite/tests/programs/okeefe_neural/Main.hs
diff --git a/testsuite/tests/programs/okeefe_neural/Makefile b/testsuite/tests/programs/okeefe_neural/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/okeefe_neural/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/okeefe_neural/test.T b/testsuite/tests/programs/okeefe_neural/test.T
index cf329cf716..cf329cf716 100644
--- a/testsuite/tests/ghc-regress/programs/okeefe_neural/test.T
+++ b/testsuite/tests/programs/okeefe_neural/test.T
diff --git a/testsuite/tests/ghc-regress/programs/record_upd/Main.hs b/testsuite/tests/programs/record_upd/Main.hs
index 3b6b3ae2f9..3b6b3ae2f9 100644
--- a/testsuite/tests/ghc-regress/programs/record_upd/Main.hs
+++ b/testsuite/tests/programs/record_upd/Main.hs
diff --git a/testsuite/tests/programs/record_upd/Makefile b/testsuite/tests/programs/record_upd/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/record_upd/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/record_upd/record_upd.stdout b/testsuite/tests/programs/record_upd/record_upd.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/programs/record_upd/record_upd.stdout
+++ b/testsuite/tests/programs/record_upd/record_upd.stdout
diff --git a/testsuite/tests/ghc-regress/programs/record_upd/test.T b/testsuite/tests/programs/record_upd/test.T
index e98b70c43e..e98b70c43e 100644
--- a/testsuite/tests/ghc-regress/programs/record_upd/test.T
+++ b/testsuite/tests/programs/record_upd/test.T
diff --git a/testsuite/tests/ghc-regress/programs/rittri/Main.hs b/testsuite/tests/programs/rittri/Main.hs
index e62c8a4667..e62c8a4667 100644
--- a/testsuite/tests/ghc-regress/programs/rittri/Main.hs
+++ b/testsuite/tests/programs/rittri/Main.hs
diff --git a/testsuite/tests/programs/rittri/Makefile b/testsuite/tests/programs/rittri/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/rittri/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/rittri/rittri.stdin b/testsuite/tests/programs/rittri/rittri.stdin
index 84e5ba190d..84e5ba190d 100644
--- a/testsuite/tests/ghc-regress/programs/rittri/rittri.stdin
+++ b/testsuite/tests/programs/rittri/rittri.stdin
diff --git a/testsuite/tests/ghc-regress/programs/rittri/rittri.stdout b/testsuite/tests/programs/rittri/rittri.stdout
index c904cda513..c904cda513 100644
--- a/testsuite/tests/ghc-regress/programs/rittri/rittri.stdout
+++ b/testsuite/tests/programs/rittri/rittri.stdout
diff --git a/testsuite/tests/ghc-regress/programs/rittri/test.T b/testsuite/tests/programs/rittri/test.T
index 2e14f6fdcc..2e14f6fdcc 100644
--- a/testsuite/tests/ghc-regress/programs/rittri/test.T
+++ b/testsuite/tests/programs/rittri/test.T
diff --git a/testsuite/tests/ghc-regress/programs/sanders_array/Main.hs b/testsuite/tests/programs/sanders_array/Main.hs
index d5a2b29d12..d5a2b29d12 100644
--- a/testsuite/tests/ghc-regress/programs/sanders_array/Main.hs
+++ b/testsuite/tests/programs/sanders_array/Main.hs
diff --git a/testsuite/tests/programs/sanders_array/Makefile b/testsuite/tests/programs/sanders_array/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/sanders_array/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/sanders_array/sanders_array.stdout b/testsuite/tests/programs/sanders_array/sanders_array.stdout
index d3405a74e2..d3405a74e2 100644
--- a/testsuite/tests/ghc-regress/programs/sanders_array/sanders_array.stdout
+++ b/testsuite/tests/programs/sanders_array/sanders_array.stdout
diff --git a/testsuite/tests/ghc-regress/programs/sanders_array/test.T b/testsuite/tests/programs/sanders_array/test.T
index 03c4d4eece..03c4d4eece 100644
--- a/testsuite/tests/ghc-regress/programs/sanders_array/test.T
+++ b/testsuite/tests/programs/sanders_array/test.T
diff --git a/testsuite/tests/ghc-regress/programs/seward-space-leak/Main.lhs b/testsuite/tests/programs/seward-space-leak/Main.lhs
index 327118d5e3..327118d5e3 100644
--- a/testsuite/tests/ghc-regress/programs/seward-space-leak/Main.lhs
+++ b/testsuite/tests/programs/seward-space-leak/Main.lhs
diff --git a/testsuite/tests/programs/seward-space-leak/Makefile b/testsuite/tests/programs/seward-space-leak/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/seward-space-leak/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/seward-space-leak/README b/testsuite/tests/programs/seward-space-leak/README
index b43c8a7e7b..b43c8a7e7b 100644
--- a/testsuite/tests/ghc-regress/programs/seward-space-leak/README
+++ b/testsuite/tests/programs/seward-space-leak/README
diff --git a/testsuite/tests/ghc-regress/programs/seward-space-leak/cg023.stdout b/testsuite/tests/programs/seward-space-leak/cg023.stdout
index c1f22fbc23..c1f22fbc23 100644
--- a/testsuite/tests/ghc-regress/programs/seward-space-leak/cg023.stdout
+++ b/testsuite/tests/programs/seward-space-leak/cg023.stdout
diff --git a/testsuite/tests/ghc-regress/programs/seward-space-leak/seward-space-leak.stdout b/testsuite/tests/programs/seward-space-leak/seward-space-leak.stdout
index bc59c12aa1..bc59c12aa1 100644
--- a/testsuite/tests/ghc-regress/programs/seward-space-leak/seward-space-leak.stdout
+++ b/testsuite/tests/programs/seward-space-leak/seward-space-leak.stdout
diff --git a/testsuite/tests/ghc-regress/programs/seward-space-leak/test.T b/testsuite/tests/programs/seward-space-leak/test.T
index bdb7759275..bdb7759275 100644
--- a/testsuite/tests/ghc-regress/programs/seward-space-leak/test.T
+++ b/testsuite/tests/programs/seward-space-leak/test.T
diff --git a/testsuite/tests/ghc-regress/programs/strict_anns/Main.hs b/testsuite/tests/programs/strict_anns/Main.hs
index b2ee82d4bc..b2ee82d4bc 100644
--- a/testsuite/tests/ghc-regress/programs/strict_anns/Main.hs
+++ b/testsuite/tests/programs/strict_anns/Main.hs
diff --git a/testsuite/tests/programs/strict_anns/Makefile b/testsuite/tests/programs/strict_anns/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/strict_anns/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/strict_anns/strict_anns.stdout b/testsuite/tests/programs/strict_anns/strict_anns.stdout
index 0f6e62ec68..0f6e62ec68 100644
--- a/testsuite/tests/ghc-regress/programs/strict_anns/strict_anns.stdout
+++ b/testsuite/tests/programs/strict_anns/strict_anns.stdout
diff --git a/testsuite/tests/ghc-regress/programs/strict_anns/test.T b/testsuite/tests/programs/strict_anns/test.T
index 77ed9dab53..77ed9dab53 100644
--- a/testsuite/tests/ghc-regress/programs/strict_anns/test.T
+++ b/testsuite/tests/programs/strict_anns/test.T
diff --git a/testsuite/tests/ghc-regress/programs/thurston-modular-arith/Main.hs b/testsuite/tests/programs/thurston-modular-arith/Main.hs
index 608025b1e1..608025b1e1 100644
--- a/testsuite/tests/ghc-regress/programs/thurston-modular-arith/Main.hs
+++ b/testsuite/tests/programs/thurston-modular-arith/Main.hs
diff --git a/testsuite/tests/programs/thurston-modular-arith/Makefile b/testsuite/tests/programs/thurston-modular-arith/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/programs/thurston-modular-arith/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/programs/thurston-modular-arith/TypeVal.hs b/testsuite/tests/programs/thurston-modular-arith/TypeVal.hs
index f1608a7dfe..f1608a7dfe 100644
--- a/testsuite/tests/ghc-regress/programs/thurston-modular-arith/TypeVal.hs
+++ b/testsuite/tests/programs/thurston-modular-arith/TypeVal.hs
diff --git a/testsuite/tests/ghc-regress/programs/thurston-modular-arith/test.T b/testsuite/tests/programs/thurston-modular-arith/test.T
index 812fb07ba0..812fb07ba0 100644
--- a/testsuite/tests/ghc-regress/programs/thurston-modular-arith/test.T
+++ b/testsuite/tests/programs/thurston-modular-arith/test.T
diff --git a/testsuite/tests/ghc-regress/programs/thurston-modular-arith/thurston-modular-arith.stdout b/testsuite/tests/programs/thurston-modular-arith/thurston-modular-arith.stdout
index 8e3f242235..8e3f242235 100644
--- a/testsuite/tests/ghc-regress/programs/thurston-modular-arith/thurston-modular-arith.stdout
+++ b/testsuite/tests/programs/thurston-modular-arith/thurston-modular-arith.stdout
diff --git a/testsuite/tests/quasiquotation/Makefile b/testsuite/tests/quasiquotation/Makefile
new file mode 100644
index 0000000000..8e2e7e7c78
--- /dev/null
+++ b/testsuite/tests/quasiquotation/Makefile
@@ -0,0 +1,11 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+.PHONY: T4150
+
+T4150:
+	$(RM) T4150A.hi T4150A.o T4150.hi T4150.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c T4150A.hs
+	-'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c T4150.hs
+
diff --git a/testsuite/tests/ghc-regress/quasiquotation/T3953.hs b/testsuite/tests/quasiquotation/T3953.hs
index 2b17419201..2b17419201 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/T3953.hs
+++ b/testsuite/tests/quasiquotation/T3953.hs
diff --git a/testsuite/tests/ghc-regress/quasiquotation/T3953.stderr b/testsuite/tests/quasiquotation/T3953.stderr
index da6f2dcebf..da6f2dcebf 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/T3953.stderr
+++ b/testsuite/tests/quasiquotation/T3953.stderr
diff --git a/testsuite/tests/ghc-regress/quasiquotation/T4150.hs b/testsuite/tests/quasiquotation/T4150.hs
index 3bf7cddc49..3bf7cddc49 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/T4150.hs
+++ b/testsuite/tests/quasiquotation/T4150.hs
diff --git a/testsuite/tests/ghc-regress/quasiquotation/T4150.stderr b/testsuite/tests/quasiquotation/T4150.stderr
index 9e0f4c26ab..9e0f4c26ab 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/T4150.stderr
+++ b/testsuite/tests/quasiquotation/T4150.stderr
diff --git a/testsuite/tests/ghc-regress/quasiquotation/T4150A.hs b/testsuite/tests/quasiquotation/T4150A.hs
index 25ee003fee..25ee003fee 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/T4150A.hs
+++ b/testsuite/tests/quasiquotation/T4150A.hs
diff --git a/testsuite/tests/ghc-regress/quasiquotation/T4150template.txt b/testsuite/tests/quasiquotation/T4150template.txt
index a92d664bc2..a92d664bc2 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/T4150template.txt
+++ b/testsuite/tests/quasiquotation/T4150template.txt
diff --git a/testsuite/tests/ghc-regress/quasiquotation/all.T b/testsuite/tests/quasiquotation/all.T
index 2fa0427813..2fa0427813 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/all.T
+++ b/testsuite/tests/quasiquotation/all.T
diff --git a/testsuite/tests/quasiquotation/qq001/Makefile b/testsuite/tests/quasiquotation/qq001/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/quasiquotation/qq001/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq001/qq001.hs b/testsuite/tests/quasiquotation/qq001/qq001.hs
index 652c8cf874..652c8cf874 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq001/qq001.hs
+++ b/testsuite/tests/quasiquotation/qq001/qq001.hs
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq001/qq001.stderr b/testsuite/tests/quasiquotation/qq001/qq001.stderr
index aa748e60cd..aa748e60cd 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq001/qq001.stderr
+++ b/testsuite/tests/quasiquotation/qq001/qq001.stderr
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq001/test.T b/testsuite/tests/quasiquotation/qq001/test.T
index 2db7546687..2db7546687 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq001/test.T
+++ b/testsuite/tests/quasiquotation/qq001/test.T
diff --git a/testsuite/tests/quasiquotation/qq002/Makefile b/testsuite/tests/quasiquotation/qq002/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/quasiquotation/qq002/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq002/qq002.hs b/testsuite/tests/quasiquotation/qq002/qq002.hs
index a9ac995e5a..a9ac995e5a 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq002/qq002.hs
+++ b/testsuite/tests/quasiquotation/qq002/qq002.hs
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq002/qq002.stderr b/testsuite/tests/quasiquotation/qq002/qq002.stderr
index b32b5ac6a0..b32b5ac6a0 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq002/qq002.stderr
+++ b/testsuite/tests/quasiquotation/qq002/qq002.stderr
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq002/test.T b/testsuite/tests/quasiquotation/qq002/test.T
index 2c39664a85..2c39664a85 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq002/test.T
+++ b/testsuite/tests/quasiquotation/qq002/test.T
diff --git a/testsuite/tests/quasiquotation/qq003/Makefile b/testsuite/tests/quasiquotation/qq003/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/quasiquotation/qq003/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq003/qq003.hs b/testsuite/tests/quasiquotation/qq003/qq003.hs
index 7afbad964e..7afbad964e 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq003/qq003.hs
+++ b/testsuite/tests/quasiquotation/qq003/qq003.hs
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq003/qq003.stderr b/testsuite/tests/quasiquotation/qq003/qq003.stderr
index a1f490fb2c..a1f490fb2c 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq003/qq003.stderr
+++ b/testsuite/tests/quasiquotation/qq003/qq003.stderr
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq003/test.T b/testsuite/tests/quasiquotation/qq003/test.T
index 9c61d0a11a..9c61d0a11a 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq003/test.T
+++ b/testsuite/tests/quasiquotation/qq003/test.T
diff --git a/testsuite/tests/quasiquotation/qq004/Makefile b/testsuite/tests/quasiquotation/qq004/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/quasiquotation/qq004/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq004/qq004.hs b/testsuite/tests/quasiquotation/qq004/qq004.hs
index c95b94ef02..c95b94ef02 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq004/qq004.hs
+++ b/testsuite/tests/quasiquotation/qq004/qq004.hs
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq004/qq004.stderr b/testsuite/tests/quasiquotation/qq004/qq004.stderr
index be61788926..be61788926 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq004/qq004.stderr
+++ b/testsuite/tests/quasiquotation/qq004/qq004.stderr
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq004/test.T b/testsuite/tests/quasiquotation/qq004/test.T
index 13ecda5dad..13ecda5dad 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq004/test.T
+++ b/testsuite/tests/quasiquotation/qq004/test.T
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq005/Expr.hs b/testsuite/tests/quasiquotation/qq005/Expr.hs
index d628e8d52f..d628e8d52f 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq005/Expr.hs
+++ b/testsuite/tests/quasiquotation/qq005/Expr.hs
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq005/Main.hs b/testsuite/tests/quasiquotation/qq005/Main.hs
index d8c8a3433c..d8c8a3433c 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq005/Main.hs
+++ b/testsuite/tests/quasiquotation/qq005/Main.hs
diff --git a/testsuite/tests/quasiquotation/qq005/Makefile b/testsuite/tests/quasiquotation/qq005/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/quasiquotation/qq005/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq005/qq005.stderr b/testsuite/tests/quasiquotation/qq005/qq005.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq005/qq005.stderr
+++ b/testsuite/tests/quasiquotation/qq005/qq005.stderr
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq005/qq005.stdout b/testsuite/tests/quasiquotation/qq005/qq005.stdout
index b9473d1e3b..b9473d1e3b 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq005/qq005.stdout
+++ b/testsuite/tests/quasiquotation/qq005/qq005.stdout
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq005/test.T b/testsuite/tests/quasiquotation/qq005/test.T
index 52671ef838..52671ef838 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq005/test.T
+++ b/testsuite/tests/quasiquotation/qq005/test.T
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq006/Expr.hs b/testsuite/tests/quasiquotation/qq006/Expr.hs
index d628e8d52f..d628e8d52f 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq006/Expr.hs
+++ b/testsuite/tests/quasiquotation/qq006/Expr.hs
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq006/Main.hs b/testsuite/tests/quasiquotation/qq006/Main.hs
index 7e21acc235..7e21acc235 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq006/Main.hs
+++ b/testsuite/tests/quasiquotation/qq006/Main.hs
diff --git a/testsuite/tests/quasiquotation/qq006/Makefile b/testsuite/tests/quasiquotation/qq006/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/quasiquotation/qq006/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq006/qq006.stderr b/testsuite/tests/quasiquotation/qq006/qq006.stderr
index 3eb51824b0..3eb51824b0 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq006/qq006.stderr
+++ b/testsuite/tests/quasiquotation/qq006/qq006.stderr
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq006/test.T b/testsuite/tests/quasiquotation/qq006/test.T
index 21d9a3db1c..21d9a3db1c 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq006/test.T
+++ b/testsuite/tests/quasiquotation/qq006/test.T
diff --git a/testsuite/tests/quasiquotation/qq007/Makefile b/testsuite/tests/quasiquotation/qq007/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/quasiquotation/qq007/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq007/QQ.hs b/testsuite/tests/quasiquotation/qq007/QQ.hs
index 3c13315a31..3c13315a31 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq007/QQ.hs
+++ b/testsuite/tests/quasiquotation/qq007/QQ.hs
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq007/Test.hs b/testsuite/tests/quasiquotation/qq007/Test.hs
index 42cef722d3..42cef722d3 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq007/Test.hs
+++ b/testsuite/tests/quasiquotation/qq007/Test.hs
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq007/test.T b/testsuite/tests/quasiquotation/qq007/test.T
index 6b7ef6dcd7..6b7ef6dcd7 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq007/test.T
+++ b/testsuite/tests/quasiquotation/qq007/test.T
diff --git a/testsuite/tests/quasiquotation/qq008/Makefile b/testsuite/tests/quasiquotation/qq008/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/quasiquotation/qq008/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq008/QQ.hs b/testsuite/tests/quasiquotation/qq008/QQ.hs
index eee8dc9670..eee8dc9670 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq008/QQ.hs
+++ b/testsuite/tests/quasiquotation/qq008/QQ.hs
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq008/Test.hs b/testsuite/tests/quasiquotation/qq008/Test.hs
index c04f427f63..c04f427f63 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq008/Test.hs
+++ b/testsuite/tests/quasiquotation/qq008/Test.hs
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq008/qq008.stderr b/testsuite/tests/quasiquotation/qq008/qq008.stderr
index b13e999463..b13e999463 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq008/qq008.stderr
+++ b/testsuite/tests/quasiquotation/qq008/qq008.stderr
diff --git a/testsuite/tests/ghc-regress/quasiquotation/qq008/test.T b/testsuite/tests/quasiquotation/qq008/test.T
index 02b88dbd0a..02b88dbd0a 100644
--- a/testsuite/tests/ghc-regress/quasiquotation/qq008/test.T
+++ b/testsuite/tests/quasiquotation/qq008/test.T
diff --git a/testsuite/tests/ghc-regress/rebindable/DoParamM.hs b/testsuite/tests/rebindable/DoParamM.hs
index 95ff235cdd..95ff235cdd 100644
--- a/testsuite/tests/ghc-regress/rebindable/DoParamM.hs
+++ b/testsuite/tests/rebindable/DoParamM.hs
diff --git a/testsuite/tests/ghc-regress/rebindable/DoParamM.stderr b/testsuite/tests/rebindable/DoParamM.stderr
index 7abfdd4b56..7abfdd4b56 100644
--- a/testsuite/tests/ghc-regress/rebindable/DoParamM.stderr
+++ b/testsuite/tests/rebindable/DoParamM.stderr
diff --git a/testsuite/tests/ghc-regress/rebindable/DoRestrictedM.hs b/testsuite/tests/rebindable/DoRestrictedM.hs
index dea2b1ea03..dea2b1ea03 100644
--- a/testsuite/tests/ghc-regress/rebindable/DoRestrictedM.hs
+++ b/testsuite/tests/rebindable/DoRestrictedM.hs
diff --git a/testsuite/tests/rebindable/Makefile b/testsuite/tests/rebindable/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/rebindable/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/rebindable/T303.hs b/testsuite/tests/rebindable/T303.hs
index 418a695e8d..418a695e8d 100644
--- a/testsuite/tests/ghc-regress/rebindable/T303.hs
+++ b/testsuite/tests/rebindable/T303.hs
diff --git a/testsuite/tests/ghc-regress/rebindable/T4851.hs b/testsuite/tests/rebindable/T4851.hs
index 38ce45212f..38ce45212f 100644
--- a/testsuite/tests/ghc-regress/rebindable/T4851.hs
+++ b/testsuite/tests/rebindable/T4851.hs
diff --git a/testsuite/tests/ghc-regress/rebindable/T5038.hs b/testsuite/tests/rebindable/T5038.hs
index 42f3df2712..42f3df2712 100644
--- a/testsuite/tests/ghc-regress/rebindable/T5038.hs
+++ b/testsuite/tests/rebindable/T5038.hs
diff --git a/testsuite/tests/ghc-regress/rebindable/T5038.stdout b/testsuite/tests/rebindable/T5038.stdout
index 0cfbf08886..0cfbf08886 100644
--- a/testsuite/tests/ghc-regress/rebindable/T5038.stdout
+++ b/testsuite/tests/rebindable/T5038.stdout
diff --git a/testsuite/tests/ghc-regress/rebindable/all.T b/testsuite/tests/rebindable/all.T
index 7df16d4135..7df16d4135 100644
--- a/testsuite/tests/ghc-regress/rebindable/all.T
+++ b/testsuite/tests/rebindable/all.T
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable1.hs b/testsuite/tests/rebindable/rebindable1.hs
index 1fb0b596fb..1fb0b596fb 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable1.hs
+++ b/testsuite/tests/rebindable/rebindable1.hs
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable1.stderr b/testsuite/tests/rebindable/rebindable1.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable1.stderr
+++ b/testsuite/tests/rebindable/rebindable1.stderr
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable10.hs b/testsuite/tests/rebindable/rebindable10.hs
index 5123f0e175..5123f0e175 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable10.hs
+++ b/testsuite/tests/rebindable/rebindable10.hs
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable10.stdout b/testsuite/tests/rebindable/rebindable10.stdout
index 925fc6dc09..925fc6dc09 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable10.stdout
+++ b/testsuite/tests/rebindable/rebindable10.stdout
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable2.hs b/testsuite/tests/rebindable/rebindable2.hs
index 7b626585ba..7b626585ba 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable2.hs
+++ b/testsuite/tests/rebindable/rebindable2.hs
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable2.stdout b/testsuite/tests/rebindable/rebindable2.stdout
index 970af0f0ab..970af0f0ab 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable2.stdout
+++ b/testsuite/tests/rebindable/rebindable2.stdout
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable3.hs b/testsuite/tests/rebindable/rebindable3.hs
index 682787fced..682787fced 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable3.hs
+++ b/testsuite/tests/rebindable/rebindable3.hs
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable3.stdout b/testsuite/tests/rebindable/rebindable3.stdout
index 970af0f0ab..970af0f0ab 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable3.stdout
+++ b/testsuite/tests/rebindable/rebindable3.stdout
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable4.hs b/testsuite/tests/rebindable/rebindable4.hs
index 2c25c9a03f..2c25c9a03f 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable4.hs
+++ b/testsuite/tests/rebindable/rebindable4.hs
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable4.stdout b/testsuite/tests/rebindable/rebindable4.stdout
index 970af0f0ab..970af0f0ab 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable4.stdout
+++ b/testsuite/tests/rebindable/rebindable4.stdout
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable5.hs b/testsuite/tests/rebindable/rebindable5.hs
index 94b3f4ef7a..94b3f4ef7a 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable5.hs
+++ b/testsuite/tests/rebindable/rebindable5.hs
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable5.stderr b/testsuite/tests/rebindable/rebindable5.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable5.stderr
+++ b/testsuite/tests/rebindable/rebindable5.stderr
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable5.stdout b/testsuite/tests/rebindable/rebindable5.stdout
index 970af0f0ab..970af0f0ab 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable5.stdout
+++ b/testsuite/tests/rebindable/rebindable5.stdout
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable6.hs b/testsuite/tests/rebindable/rebindable6.hs
index 74d861cda8..74d861cda8 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable6.hs
+++ b/testsuite/tests/rebindable/rebindable6.hs
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable6.stderr b/testsuite/tests/rebindable/rebindable6.stderr
index d451400514..d451400514 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable6.stderr
+++ b/testsuite/tests/rebindable/rebindable6.stderr
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable6.stdout b/testsuite/tests/rebindable/rebindable6.stdout
index ff6a69e060..ff6a69e060 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable6.stdout
+++ b/testsuite/tests/rebindable/rebindable6.stdout
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable7.hs b/testsuite/tests/rebindable/rebindable7.hs
index 8e0000e0e5..8e0000e0e5 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable7.hs
+++ b/testsuite/tests/rebindable/rebindable7.hs
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable7.stdout b/testsuite/tests/rebindable/rebindable7.stdout
index f1c101bdd7..f1c101bdd7 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable7.stdout
+++ b/testsuite/tests/rebindable/rebindable7.stdout
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable8.hs b/testsuite/tests/rebindable/rebindable8.hs
index 2c1f484f47..2c1f484f47 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable8.hs
+++ b/testsuite/tests/rebindable/rebindable8.hs
diff --git a/testsuite/tests/ghc-regress/rebindable/rebindable9.hs b/testsuite/tests/rebindable/rebindable9.hs
index 081e22c46f..081e22c46f 100644
--- a/testsuite/tests/ghc-regress/rebindable/rebindable9.hs
+++ b/testsuite/tests/rebindable/rebindable9.hs
diff --git a/testsuite/tests/rename/Makefile b/testsuite/tests/rename/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/rename/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/rename/prog001/Makefile b/testsuite/tests/rename/prog001/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/rename/prog001/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/rename/prog001/Rn037Help.hs b/testsuite/tests/rename/prog001/Rn037Help.hs
index 64d1224f49..64d1224f49 100644
--- a/testsuite/tests/ghc-regress/rename/prog001/Rn037Help.hs
+++ b/testsuite/tests/rename/prog001/Rn037Help.hs
diff --git a/testsuite/tests/ghc-regress/rename/prog001/rn037.hs b/testsuite/tests/rename/prog001/rn037.hs
index 544de2fdd9..544de2fdd9 100644
--- a/testsuite/tests/ghc-regress/rename/prog001/rn037.hs
+++ b/testsuite/tests/rename/prog001/rn037.hs
diff --git a/testsuite/tests/ghc-regress/rename/prog001/test.T b/testsuite/tests/rename/prog001/test.T
index ad1a5fef70..ad1a5fef70 100644
--- a/testsuite/tests/ghc-regress/rename/prog001/test.T
+++ b/testsuite/tests/rename/prog001/test.T
diff --git a/testsuite/tests/rename/prog002/Makefile b/testsuite/tests/rename/prog002/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/rename/prog002/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/rename/prog002/Rn037Help.hs b/testsuite/tests/rename/prog002/Rn037Help.hs
index 64d1224f49..64d1224f49 100644
--- a/testsuite/tests/ghc-regress/rename/prog002/Rn037Help.hs
+++ b/testsuite/tests/rename/prog002/Rn037Help.hs
diff --git a/testsuite/tests/ghc-regress/rename/prog002/rename.prog002.stderr b/testsuite/tests/rename/prog002/rename.prog002.stderr
index 31b672b539..31b672b539 100644
--- a/testsuite/tests/ghc-regress/rename/prog002/rename.prog002.stderr
+++ b/testsuite/tests/rename/prog002/rename.prog002.stderr
diff --git a/testsuite/tests/ghc-regress/rename/prog002/rename.prog002.stderr-hugs b/testsuite/tests/rename/prog002/rename.prog002.stderr-hugs
index cc2a587de2..cc2a587de2 100644
--- a/testsuite/tests/ghc-regress/rename/prog002/rename.prog002.stderr-hugs
+++ b/testsuite/tests/rename/prog002/rename.prog002.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/prog002/rnfail037.hs b/testsuite/tests/rename/prog002/rnfail037.hs
index 0a2935c5ad..0a2935c5ad 100644
--- a/testsuite/tests/ghc-regress/rename/prog002/rnfail037.hs
+++ b/testsuite/tests/rename/prog002/rnfail037.hs
diff --git a/testsuite/tests/ghc-regress/rename/prog002/test.T b/testsuite/tests/rename/prog002/test.T
index 0aa4c39057..0aa4c39057 100644
--- a/testsuite/tests/ghc-regress/rename/prog002/test.T
+++ b/testsuite/tests/rename/prog002/test.T
diff --git a/testsuite/tests/ghc-regress/rename/prog003/A.hs b/testsuite/tests/rename/prog003/A.hs
index 6b68075f96..6b68075f96 100644
--- a/testsuite/tests/ghc-regress/rename/prog003/A.hs
+++ b/testsuite/tests/rename/prog003/A.hs
diff --git a/testsuite/tests/ghc-regress/rename/prog003/B.hs b/testsuite/tests/rename/prog003/B.hs
index 77be6cbc0e..77be6cbc0e 100644
--- a/testsuite/tests/ghc-regress/rename/prog003/B.hs
+++ b/testsuite/tests/rename/prog003/B.hs
diff --git a/testsuite/tests/rename/prog003/Makefile b/testsuite/tests/rename/prog003/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/rename/prog003/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/rename/prog003/rename.prog003.stderr b/testsuite/tests/rename/prog003/rename.prog003.stderr
index 49c264cae8..49c264cae8 100644
--- a/testsuite/tests/ghc-regress/rename/prog003/rename.prog003.stderr
+++ b/testsuite/tests/rename/prog003/rename.prog003.stderr
diff --git a/testsuite/tests/ghc-regress/rename/prog003/rename.prog003.stderr-hugs b/testsuite/tests/rename/prog003/rename.prog003.stderr-hugs
index 5cb62fcdf2..5cb62fcdf2 100644
--- a/testsuite/tests/ghc-regress/rename/prog003/rename.prog003.stderr-hugs
+++ b/testsuite/tests/rename/prog003/rename.prog003.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/prog003/test.T b/testsuite/tests/rename/prog003/test.T
index 7d4c06ab0e..7d4c06ab0e 100644
--- a/testsuite/tests/ghc-regress/rename/prog003/test.T
+++ b/testsuite/tests/rename/prog003/test.T
diff --git a/testsuite/tests/ghc-regress/rename/prog004/A.hs b/testsuite/tests/rename/prog004/A.hs
index 23fe5bb187..23fe5bb187 100644
--- a/testsuite/tests/ghc-regress/rename/prog004/A.hs
+++ b/testsuite/tests/rename/prog004/A.hs
diff --git a/testsuite/tests/ghc-regress/rename/prog004/B.hs b/testsuite/tests/rename/prog004/B.hs
index 47d2903abb..47d2903abb 100644
--- a/testsuite/tests/ghc-regress/rename/prog004/B.hs
+++ b/testsuite/tests/rename/prog004/B.hs
diff --git a/testsuite/tests/ghc-regress/rename/prog004/C.hs b/testsuite/tests/rename/prog004/C.hs
index e66231afec..e66231afec 100644
--- a/testsuite/tests/ghc-regress/rename/prog004/C.hs
+++ b/testsuite/tests/rename/prog004/C.hs
diff --git a/testsuite/tests/rename/prog004/Makefile b/testsuite/tests/rename/prog004/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/rename/prog004/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/rename/prog004/rename.prog004.stderr b/testsuite/tests/rename/prog004/rename.prog004.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/prog004/rename.prog004.stderr
+++ b/testsuite/tests/rename/prog004/rename.prog004.stderr
diff --git a/testsuite/tests/ghc-regress/rename/prog004/test.T b/testsuite/tests/rename/prog004/test.T
index 4d97d580c0..4d97d580c0 100644
--- a/testsuite/tests/ghc-regress/rename/prog004/test.T
+++ b/testsuite/tests/rename/prog004/test.T
diff --git a/testsuite/tests/rename/prog005/Makefile b/testsuite/tests/rename/prog005/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/rename/prog005/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/rename/prog005/VersionGraphClient.hs b/testsuite/tests/rename/prog005/VersionGraphClient.hs
index 3aad9f5180..3aad9f5180 100644
--- a/testsuite/tests/ghc-regress/rename/prog005/VersionGraphClient.hs
+++ b/testsuite/tests/rename/prog005/VersionGraphClient.hs
diff --git a/testsuite/tests/ghc-regress/rename/prog005/VersionGraphClient.hs-boot b/testsuite/tests/rename/prog005/VersionGraphClient.hs-boot
index 6bca0bbf5e..6bca0bbf5e 100644
--- a/testsuite/tests/ghc-regress/rename/prog005/VersionGraphClient.hs-boot
+++ b/testsuite/tests/rename/prog005/VersionGraphClient.hs-boot
diff --git a/testsuite/tests/ghc-regress/rename/prog005/View.hs b/testsuite/tests/rename/prog005/View.hs
index c14d301c3d..c14d301c3d 100644
--- a/testsuite/tests/ghc-regress/rename/prog005/View.hs
+++ b/testsuite/tests/rename/prog005/View.hs
diff --git a/testsuite/tests/ghc-regress/rename/prog005/ViewType.hs b/testsuite/tests/rename/prog005/ViewType.hs
index 8e9dd3cd49..8e9dd3cd49 100644
--- a/testsuite/tests/ghc-regress/rename/prog005/ViewType.hs
+++ b/testsuite/tests/rename/prog005/ViewType.hs
diff --git a/testsuite/tests/ghc-regress/rename/prog005/test.T b/testsuite/tests/rename/prog005/test.T
index 35769bd2bb..35769bd2bb 100644
--- a/testsuite/tests/ghc-regress/rename/prog005/test.T
+++ b/testsuite/tests/rename/prog005/test.T
diff --git a/testsuite/tests/ghc-regress/rename/prog006/A.hs b/testsuite/tests/rename/prog006/A.hs
index 52e442a0c2..52e442a0c2 100644
--- a/testsuite/tests/ghc-regress/rename/prog006/A.hs
+++ b/testsuite/tests/rename/prog006/A.hs
diff --git a/testsuite/tests/ghc-regress/rename/prog006/B/C.hs b/testsuite/tests/rename/prog006/B/C.hs
index ece50b9002..ece50b9002 100644
--- a/testsuite/tests/ghc-regress/rename/prog006/B/C.hs
+++ b/testsuite/tests/rename/prog006/B/C.hs
diff --git a/testsuite/tests/ghc-regress/rename/prog006/Main.hs b/testsuite/tests/rename/prog006/Main.hs
index 13f7265fc4..13f7265fc4 100644
--- a/testsuite/tests/ghc-regress/rename/prog006/Main.hs
+++ b/testsuite/tests/rename/prog006/Main.hs
diff --git a/testsuite/tests/rename/prog006/Makefile b/testsuite/tests/rename/prog006/Makefile
new file mode 100644
index 0000000000..1e643fd6fb
--- /dev/null
+++ b/testsuite/tests/rename/prog006/Makefile
@@ -0,0 +1,39 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+# Original comments relating to GHC 6.4:
+# This test caused a panic in GHC 6.4, but in reality it is user
+# error, caused by compiling separate modules in the program using
+# different search paths.  GHC gets confused when it can't find a
+# module mentioned as a dependency in another interface file.
+
+# Update for GHC 6.6:
+# This test now succeeds, because A.hi records the fact that B.C
+# came from the package test-1.0, so there's no conflict.
+
+# If the package format changes, we might have to re-generate pkg.conf
+# using the supplied Cabal configuration.
+
+LOCAL_PKGCONF=local.package.conf
+LOCAL_GHC_PKG = '$(GHC_PKG)' --no-user-package-conf -f $(LOCAL_PKGCONF)
+
+rn.prog006:
+	rm -f A.hi A.o B/C.hi B/C.o Main.hi Main.o pkg.conf
+	rm -f pwd pwd.exe pwd.exe.manifest pwd.hi pwd.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make pwd -v0
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make -package-name test-1.0 B.C -fforce-recomp -v0
+	rm -f pkg.conf
+	echo "name: test" >>pkg.conf
+	echo "version: 1.0" >>pkg.conf
+	echo "id: test-XXX" >>pkg.conf
+	echo "import-dirs: `./pwd`" >>pkg.conf
+	echo "exposed-modules: B.C" >>pkg.conf
+	echo "[]" >$(LOCAL_PKGCONF)
+	$(LOCAL_GHC_PKG) register pkg.conf -v0
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -package-conf $(LOCAL_PKGCONF) -package test -fforce-recomp A.hs -i
+# The -i clears the search path, so A.hs will find B.C from package test
+	-'$(TEST_HC)' $(TEST_HC_OPTS) -c -package-conf $(LOCAL_PKGCONF) -package test -fforce-recomp Main.hs
+# No -i when compiling Main, so a from-scratch search would find a home-pkg module B.C
+# However, A.hi remembers that B.C came from package test, so all is ok.
+
diff --git a/testsuite/tests/ghc-regress/rename/prog006/Setup.lhs b/testsuite/tests/rename/prog006/Setup.lhs
index b28a8234f9..b28a8234f9 100644
--- a/testsuite/tests/ghc-regress/rename/prog006/Setup.lhs
+++ b/testsuite/tests/rename/prog006/Setup.lhs
diff --git a/testsuite/tests/ghc-regress/rename/prog006/all.T b/testsuite/tests/rename/prog006/all.T
index 4126e6cdf4..4126e6cdf4 100644
--- a/testsuite/tests/ghc-regress/rename/prog006/all.T
+++ b/testsuite/tests/rename/prog006/all.T
diff --git a/testsuite/tests/ghc-regress/rename/prog006/pwd.hs b/testsuite/tests/rename/prog006/pwd.hs
index 177e836fe1..177e836fe1 100644
--- a/testsuite/tests/ghc-regress/rename/prog006/pwd.hs
+++ b/testsuite/tests/rename/prog006/pwd.hs
diff --git a/testsuite/tests/ghc-regress/rename/prog006/rn.prog006.stderr b/testsuite/tests/rename/prog006/rn.prog006.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/prog006/rn.prog006.stderr
+++ b/testsuite/tests/rename/prog006/rn.prog006.stderr
diff --git a/testsuite/tests/ghc-regress/rename/prog006/test.cabal b/testsuite/tests/rename/prog006/test.cabal
index 64fb00e11a..64fb00e11a 100644
--- a/testsuite/tests/ghc-regress/rename/prog006/test.cabal
+++ b/testsuite/tests/rename/prog006/test.cabal
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/2334.hs b/testsuite/tests/rename/should_compile/2334.hs
index 6c1cd80e1f..6c1cd80e1f 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/2334.hs
+++ b/testsuite/tests/rename/should_compile/2334.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Imp100Aux.hs b/testsuite/tests/rename/should_compile/Imp100Aux.hs
index 2ae5f0baa4..2ae5f0baa4 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Imp100Aux.hs
+++ b/testsuite/tests/rename/should_compile/Imp100Aux.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Imp100Aux.hs-boot b/testsuite/tests/rename/should_compile/Imp100Aux.hs-boot
index 934db61841..934db61841 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Imp100Aux.hs-boot
+++ b/testsuite/tests/rename/should_compile/Imp100Aux.hs-boot
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Imp10Aux.hs b/testsuite/tests/rename/should_compile/Imp10Aux.hs
index f838aa558d..f838aa558d 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Imp10Aux.hs
+++ b/testsuite/tests/rename/should_compile/Imp10Aux.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Imp10Aux.hs-boot b/testsuite/tests/rename/should_compile/Imp10Aux.hs-boot
index 248c113ba2..248c113ba2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Imp10Aux.hs-boot
+++ b/testsuite/tests/rename/should_compile/Imp10Aux.hs-boot
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Imp500Aux.hs b/testsuite/tests/rename/should_compile/Imp500Aux.hs
index 20c3c79415..20c3c79415 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Imp500Aux.hs
+++ b/testsuite/tests/rename/should_compile/Imp500Aux.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Imp500Aux.hs-boot b/testsuite/tests/rename/should_compile/Imp500Aux.hs-boot
index 251ac8012c..251ac8012c 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Imp500Aux.hs-boot
+++ b/testsuite/tests/rename/should_compile/Imp500Aux.hs-boot
diff --git a/testsuite/tests/rename/should_compile/Makefile b/testsuite/tests/rename/should_compile/Makefile
new file mode 100644
index 0000000000..5823823c06
--- /dev/null
+++ b/testsuite/tests/rename/should_compile/Makefile
@@ -0,0 +1,44 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+T1792_imports:
+	$(RM) T1792_imports.hi T1792_imports.o T1792_imports.imports
+	'$(TEST_HC)' $(TEST_HC_OPTS) -ddump-minimal-imports -c T1792_imports.hs
+	cat T1792_imports.imports
+
+T3823:
+	$(RM) T3823A.hi-boot T3823A.hi T3823B.hi
+	$(RM) T3823A.o-boot  T3823A.o  T3823B.o
+	-'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make T3823A.hs
+
+T4003:
+	$(RM) T4003A.hi-boot T4003A.hi T4003B.hi
+	$(RM) T4003A.o-boot  T4003A.o  T4003B.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c T4003A.hs-boot
+	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c T4003B.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c T4003A.hs
+
+T3449:
+	$(RM) T3449.hi-boot T3449.hi T3449A.hi
+	$(RM) T3449.o-boot  T3449.o  T3449A.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -Wall -c T3449.hs-boot
+	'$(TEST_HC)' $(TEST_HC_OPTS) -Wall -c T3449A.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -Wall -c T3449.hs
+
+T4239:
+	$(RM) T4239A.hi T4239A.o
+	$(RM) T4239.hi  T4239.o T4239.imports
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T4239A.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T4239.hs -ddump-minimal-imports
+	cat T4239.imports
+
+T4240:
+	$(RM) T4240A.hi T4240A.o
+	$(RM) T4240B.hi T4240B.o
+	$(RM) T4240.hi  T4240.o T4240.imports
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T4240A.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T4240B.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T4240.hs -ddump-minimal-imports
+	cat T4240.imports
+
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Rn042_A.hs b/testsuite/tests/rename/should_compile/Rn042_A.hs
index ea19a1a3f8..ea19a1a3f8 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Rn042_A.hs
+++ b/testsuite/tests/rename/should_compile/Rn042_A.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Rn043_A.hs b/testsuite/tests/rename/should_compile/Rn043_A.hs
index ab24017637..ab24017637 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Rn043_A.hs
+++ b/testsuite/tests/rename/should_compile/Rn043_A.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Rn043_B.hs b/testsuite/tests/rename/should_compile/Rn043_B.hs
index b7f49f4143..b7f49f4143 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Rn043_B.hs
+++ b/testsuite/tests/rename/should_compile/Rn043_B.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Rn044_A.hs b/testsuite/tests/rename/should_compile/Rn044_A.hs
index 475ffe83cb..475ffe83cb 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Rn044_A.hs
+++ b/testsuite/tests/rename/should_compile/Rn044_A.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Rn044_B.hs b/testsuite/tests/rename/should_compile/Rn044_B.hs
index e11f03c10b..e11f03c10b 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Rn044_B.hs
+++ b/testsuite/tests/rename/should_compile/Rn044_B.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Rn050_A.hs b/testsuite/tests/rename/should_compile/Rn050_A.hs
index d4e1f55c7c..d4e1f55c7c 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Rn050_A.hs
+++ b/testsuite/tests/rename/should_compile/Rn050_A.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Rn052Aux.hs b/testsuite/tests/rename/should_compile/Rn052Aux.hs
index 748da06728..748da06728 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Rn052Aux.hs
+++ b/testsuite/tests/rename/should_compile/Rn052Aux.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Rn053_A.hs b/testsuite/tests/rename/should_compile/Rn053_A.hs
index d454462034..d454462034 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Rn053_A.hs
+++ b/testsuite/tests/rename/should_compile/Rn053_A.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Rn053_B.hs b/testsuite/tests/rename/should_compile/Rn053_B.hs
index 49603e8543..49603e8543 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Rn053_B.hs
+++ b/testsuite/tests/rename/should_compile/Rn053_B.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Rn059_A.hs b/testsuite/tests/rename/should_compile/Rn059_A.hs
index ddebd78b11..ddebd78b11 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Rn059_A.hs
+++ b/testsuite/tests/rename/should_compile/Rn059_A.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Rn059_B.hs b/testsuite/tests/rename/should_compile/Rn059_B.hs
index df93ae3688..df93ae3688 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Rn059_B.hs
+++ b/testsuite/tests/rename/should_compile/Rn059_B.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Rn065A.hs b/testsuite/tests/rename/should_compile/Rn065A.hs
index 4c6ff53cd4..4c6ff53cd4 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Rn065A.hs
+++ b/testsuite/tests/rename/should_compile/Rn065A.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Rn066_A.hs b/testsuite/tests/rename/should_compile/Rn066_A.hs
index c6624c3c67..c6624c3c67 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Rn066_A.hs
+++ b/testsuite/tests/rename/should_compile/Rn066_A.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/Rn067_A.hs b/testsuite/tests/rename/should_compile/Rn067_A.hs
index 8d7958d64c..8d7958d64c 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/Rn067_A.hs
+++ b/testsuite/tests/rename/should_compile/Rn067_A.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/RnAux017.hs b/testsuite/tests/rename/should_compile/RnAux017.hs
index 5514524fee..5514524fee 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/RnAux017.hs
+++ b/testsuite/tests/rename/should_compile/RnAux017.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/RnAux017.hs-boot b/testsuite/tests/rename/should_compile/RnAux017.hs-boot
index a2f3cd3916..a2f3cd3916 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/RnAux017.hs-boot
+++ b/testsuite/tests/rename/should_compile/RnAux017.hs-boot
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T1074b.hs b/testsuite/tests/rename/should_compile/T1074b.hs
index f236e9b52e..f236e9b52e 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T1074b.hs
+++ b/testsuite/tests/rename/should_compile/T1074b.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T1789.hs b/testsuite/tests/rename/should_compile/T1789.hs
index efe3840e4f..efe3840e4f 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T1789.hs
+++ b/testsuite/tests/rename/should_compile/T1789.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T1789.stderr b/testsuite/tests/rename/should_compile/T1789.stderr
index dc9a794935..dc9a794935 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T1789.stderr
+++ b/testsuite/tests/rename/should_compile/T1789.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T1789_2.hs b/testsuite/tests/rename/should_compile/T1789_2.hs
index 2ac2a509fe..2ac2a509fe 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T1789_2.hs
+++ b/testsuite/tests/rename/should_compile/T1789_2.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T1792_imports.hs b/testsuite/tests/rename/should_compile/T1792_imports.hs
index 8830bd03e8..8830bd03e8 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T1792_imports.hs
+++ b/testsuite/tests/rename/should_compile/T1792_imports.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T1792_imports.stdout b/testsuite/tests/rename/should_compile/T1792_imports.stdout
index b497d12ec6..b497d12ec6 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T1792_imports.stdout
+++ b/testsuite/tests/rename/should_compile/T1792_imports.stdout
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T1954.hs b/testsuite/tests/rename/should_compile/T1954.hs
index 07bfa3a3e8..07bfa3a3e8 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T1954.hs
+++ b/testsuite/tests/rename/should_compile/T1954.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T1972.hs b/testsuite/tests/rename/should_compile/T1972.hs
index 09dd8acaf4..09dd8acaf4 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T1972.hs
+++ b/testsuite/tests/rename/should_compile/T1972.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T1972.stderr b/testsuite/tests/rename/should_compile/T1972.stderr
index 4f9344c4bc..4f9344c4bc 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T1972.stderr
+++ b/testsuite/tests/rename/should_compile/T1972.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T2205.hs b/testsuite/tests/rename/should_compile/T2205.hs
index 580dea247a..580dea247a 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T2205.hs
+++ b/testsuite/tests/rename/should_compile/T2205.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T2436.hs b/testsuite/tests/rename/should_compile/T2436.hs
index 5cfd64100a..5cfd64100a 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T2436.hs
+++ b/testsuite/tests/rename/should_compile/T2436.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T2436a.hs b/testsuite/tests/rename/should_compile/T2436a.hs
index 4813fd918d..4813fd918d 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T2436a.hs
+++ b/testsuite/tests/rename/should_compile/T2436a.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T2506.hs b/testsuite/tests/rename/should_compile/T2506.hs
index 1e31a12c12..1e31a12c12 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T2506.hs
+++ b/testsuite/tests/rename/should_compile/T2506.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T2914.hs b/testsuite/tests/rename/should_compile/T2914.hs
index 788efef59d..788efef59d 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T2914.hs
+++ b/testsuite/tests/rename/should_compile/T2914.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3221.hs b/testsuite/tests/rename/should_compile/T3221.hs
index 5550fd3fa7..5550fd3fa7 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3221.hs
+++ b/testsuite/tests/rename/should_compile/T3221.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3262.hs b/testsuite/tests/rename/should_compile/T3262.hs
index 01437d8d2f..01437d8d2f 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3262.hs
+++ b/testsuite/tests/rename/should_compile/T3262.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3262.stderr-ghc b/testsuite/tests/rename/should_compile/T3262.stderr-ghc
index 4e730efa8d..4e730efa8d 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3262.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/T3262.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3371.hs b/testsuite/tests/rename/should_compile/T3371.hs
index 9b3d4459f9..9b3d4459f9 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3371.hs
+++ b/testsuite/tests/rename/should_compile/T3371.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3371.stderr b/testsuite/tests/rename/should_compile/T3371.stderr
index b354d9d3d6..b354d9d3d6 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3371.stderr
+++ b/testsuite/tests/rename/should_compile/T3371.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3449.hs b/testsuite/tests/rename/should_compile/T3449.hs
index 462bde67af..462bde67af 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3449.hs
+++ b/testsuite/tests/rename/should_compile/T3449.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3449.hs-boot b/testsuite/tests/rename/should_compile/T3449.hs-boot
index 153f29eef8..153f29eef8 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3449.hs-boot
+++ b/testsuite/tests/rename/should_compile/T3449.hs-boot
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3449.stderr b/testsuite/tests/rename/should_compile/T3449.stderr
index da36d24465..da36d24465 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3449.stderr
+++ b/testsuite/tests/rename/should_compile/T3449.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3449A.hs b/testsuite/tests/rename/should_compile/T3449A.hs
index 6af161cdfd..6af161cdfd 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3449A.hs
+++ b/testsuite/tests/rename/should_compile/T3449A.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3640.hs b/testsuite/tests/rename/should_compile/T3640.hs
index 2f8c2253ab..2f8c2253ab 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3640.hs
+++ b/testsuite/tests/rename/should_compile/T3640.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3823.stderr b/testsuite/tests/rename/should_compile/T3823.stderr
index 0eb8234554..0eb8234554 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3823.stderr
+++ b/testsuite/tests/rename/should_compile/T3823.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3823A.hs b/testsuite/tests/rename/should_compile/T3823A.hs
index 0a5c230973..0a5c230973 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3823A.hs
+++ b/testsuite/tests/rename/should_compile/T3823A.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3823A.hs-boot b/testsuite/tests/rename/should_compile/T3823A.hs-boot
index 3b7dd8bb17..3b7dd8bb17 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3823A.hs-boot
+++ b/testsuite/tests/rename/should_compile/T3823A.hs-boot
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3823B.hs b/testsuite/tests/rename/should_compile/T3823B.hs
index 9f4d03e091..9f4d03e091 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3823B.hs
+++ b/testsuite/tests/rename/should_compile/T3823B.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3901.hs b/testsuite/tests/rename/should_compile/T3901.hs
index 39b521977b..39b521977b 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3901.hs
+++ b/testsuite/tests/rename/should_compile/T3901.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T3943.hs b/testsuite/tests/rename/should_compile/T3943.hs
index efbeb295be..efbeb295be 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T3943.hs
+++ b/testsuite/tests/rename/should_compile/T3943.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T4003A.hs b/testsuite/tests/rename/should_compile/T4003A.hs
index c17fbae456..c17fbae456 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T4003A.hs
+++ b/testsuite/tests/rename/should_compile/T4003A.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T4003A.hs-boot b/testsuite/tests/rename/should_compile/T4003A.hs-boot
index b750e47474..b750e47474 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T4003A.hs-boot
+++ b/testsuite/tests/rename/should_compile/T4003A.hs-boot
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T4003B.hs b/testsuite/tests/rename/should_compile/T4003B.hs
index 24ce2432a2..24ce2432a2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T4003B.hs
+++ b/testsuite/tests/rename/should_compile/T4003B.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T4239.hs b/testsuite/tests/rename/should_compile/T4239.hs
index 5d4f94f857..5d4f94f857 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T4239.hs
+++ b/testsuite/tests/rename/should_compile/T4239.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T4239A.hs b/testsuite/tests/rename/should_compile/T4239A.hs
index ea92d9653b..ea92d9653b 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T4239A.hs
+++ b/testsuite/tests/rename/should_compile/T4239A.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T4240.hs b/testsuite/tests/rename/should_compile/T4240.hs
index 75621cf4d5..75621cf4d5 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T4240.hs
+++ b/testsuite/tests/rename/should_compile/T4240.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T4240.stdout b/testsuite/tests/rename/should_compile/T4240.stdout
index c73585f4a4..c73585f4a4 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T4240.stdout
+++ b/testsuite/tests/rename/should_compile/T4240.stdout
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T4240A.hs b/testsuite/tests/rename/should_compile/T4240A.hs
index 15215e7080..15215e7080 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T4240A.hs
+++ b/testsuite/tests/rename/should_compile/T4240A.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T4240B.hs b/testsuite/tests/rename/should_compile/T4240B.hs
index b3165b3c12..b3165b3c12 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T4240B.hs
+++ b/testsuite/tests/rename/should_compile/T4240B.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T4478.hs b/testsuite/tests/rename/should_compile/T4478.hs
index 0d6a5e1ea6..0d6a5e1ea6 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T4478.hs
+++ b/testsuite/tests/rename/should_compile/T4478.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T4489.hs b/testsuite/tests/rename/should_compile/T4489.hs
index a967cad06d..a967cad06d 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T4489.hs
+++ b/testsuite/tests/rename/should_compile/T4489.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T4489.stderr b/testsuite/tests/rename/should_compile/T4489.stderr
index 8cd400a720..8cd400a720 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T4489.stderr
+++ b/testsuite/tests/rename/should_compile/T4489.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T4534.hs b/testsuite/tests/rename/should_compile/T4534.hs
index 03eb67f23d..03eb67f23d 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T4534.hs
+++ b/testsuite/tests/rename/should_compile/T4534.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T5331.hs b/testsuite/tests/rename/should_compile/T5331.hs
index 4e7343e56b..4e7343e56b 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T5331.hs
+++ b/testsuite/tests/rename/should_compile/T5331.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T5331.stderr b/testsuite/tests/rename/should_compile/T5331.stderr
index 36261c539d..36261c539d 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T5331.stderr
+++ b/testsuite/tests/rename/should_compile/T5331.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T5334.hs b/testsuite/tests/rename/should_compile/T5334.hs
index 83f539d492..83f539d492 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T5334.hs
+++ b/testsuite/tests/rename/should_compile/T5334.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/T5334.stderr b/testsuite/tests/rename/should_compile/T5334.stderr
index de906b9dd6..de906b9dd6 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/T5334.stderr
+++ b/testsuite/tests/rename/should_compile/T5334.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/all.T b/testsuite/tests/rename/should_compile/all.T
index 3946987e37..3946987e37 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/all.T
+++ b/testsuite/tests/rename/should_compile/all.T
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/mc09.hs b/testsuite/tests/rename/should_compile/mc09.hs
index f4a62fa617..f4a62fa617 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/mc09.hs
+++ b/testsuite/tests/rename/should_compile/mc09.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/mc10.hs b/testsuite/tests/rename/should_compile/mc10.hs
index fa9774fdfb..fa9774fdfb 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/mc10.hs
+++ b/testsuite/tests/rename/should_compile/mc10.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/mc10.stderr-ghc b/testsuite/tests/rename/should_compile/mc10.stderr-ghc
index 585bfa4528..585bfa4528 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/mc10.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/mc10.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/mc11.hs b/testsuite/tests/rename/should_compile/mc11.hs
index 250e587a16..250e587a16 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/mc11.hs
+++ b/testsuite/tests/rename/should_compile/mc11.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/mc12.hs b/testsuite/tests/rename/should_compile/mc12.hs
index cd55dfb451..cd55dfb451 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/mc12.hs
+++ b/testsuite/tests/rename/should_compile/mc12.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn003.hs b/testsuite/tests/rename/should_compile/rn003.hs
index bb22583721..bb22583721 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn003.hs
+++ b/testsuite/tests/rename/should_compile/rn003.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn003.stderr b/testsuite/tests/rename/should_compile/rn003.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn003.stderr
+++ b/testsuite/tests/rename/should_compile/rn003.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn005.hs b/testsuite/tests/rename/should_compile/rn005.hs
index 623bd78df3..623bd78df3 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn005.hs
+++ b/testsuite/tests/rename/should_compile/rn005.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn005.stderr b/testsuite/tests/rename/should_compile/rn005.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn005.stderr
+++ b/testsuite/tests/rename/should_compile/rn005.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn006.hs b/testsuite/tests/rename/should_compile/rn006.hs
index 4f4c0a4fed..4f4c0a4fed 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn006.hs
+++ b/testsuite/tests/rename/should_compile/rn006.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn006.stderr b/testsuite/tests/rename/should_compile/rn006.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn006.stderr
+++ b/testsuite/tests/rename/should_compile/rn006.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn009.hs b/testsuite/tests/rename/should_compile/rn009.hs
index 7192e1d45a..7192e1d45a 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn009.hs
+++ b/testsuite/tests/rename/should_compile/rn009.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn009.stderr b/testsuite/tests/rename/should_compile/rn009.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn009.stderr
+++ b/testsuite/tests/rename/should_compile/rn009.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn010.hs b/testsuite/tests/rename/should_compile/rn010.hs
index d1eac0a700..d1eac0a700 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn010.hs
+++ b/testsuite/tests/rename/should_compile/rn010.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn010.stderr b/testsuite/tests/rename/should_compile/rn010.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn010.stderr
+++ b/testsuite/tests/rename/should_compile/rn010.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn011.hs b/testsuite/tests/rename/should_compile/rn011.hs
index df0cb62b25..df0cb62b25 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn011.hs
+++ b/testsuite/tests/rename/should_compile/rn011.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn011.stderr b/testsuite/tests/rename/should_compile/rn011.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn011.stderr
+++ b/testsuite/tests/rename/should_compile/rn011.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn012.hs b/testsuite/tests/rename/should_compile/rn012.hs
index 46bcfce6a3..46bcfce6a3 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn012.hs
+++ b/testsuite/tests/rename/should_compile/rn012.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn012.stderr b/testsuite/tests/rename/should_compile/rn012.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn012.stderr
+++ b/testsuite/tests/rename/should_compile/rn012.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn013.hs b/testsuite/tests/rename/should_compile/rn013.hs
index e48c2c56ee..e48c2c56ee 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn013.hs
+++ b/testsuite/tests/rename/should_compile/rn013.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn013.stderr b/testsuite/tests/rename/should_compile/rn013.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn013.stderr
+++ b/testsuite/tests/rename/should_compile/rn013.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn016.stderr b/testsuite/tests/rename/should_compile/rn016.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn016.stderr
+++ b/testsuite/tests/rename/should_compile/rn016.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn017.hs b/testsuite/tests/rename/should_compile/rn017.hs
index 7d073e90ea..7d073e90ea 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn017.hs
+++ b/testsuite/tests/rename/should_compile/rn017.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn018.stderr b/testsuite/tests/rename/should_compile/rn018.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn018.stderr
+++ b/testsuite/tests/rename/should_compile/rn018.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn019.hs b/testsuite/tests/rename/should_compile/rn019.hs
index 9c393f9119..9c393f9119 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn019.hs
+++ b/testsuite/tests/rename/should_compile/rn019.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn020.hs b/testsuite/tests/rename/should_compile/rn020.hs
index 5485d7cb51..5485d7cb51 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn020.hs
+++ b/testsuite/tests/rename/should_compile/rn020.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn022.hs b/testsuite/tests/rename/should_compile/rn022.hs
index c59b949a48..c59b949a48 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn022.hs
+++ b/testsuite/tests/rename/should_compile/rn022.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn022.stderr b/testsuite/tests/rename/should_compile/rn022.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn022.stderr
+++ b/testsuite/tests/rename/should_compile/rn022.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn023.hs b/testsuite/tests/rename/should_compile/rn023.hs
index 3522ff0ff4..3522ff0ff4 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn023.hs
+++ b/testsuite/tests/rename/should_compile/rn023.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn024.hs b/testsuite/tests/rename/should_compile/rn024.hs
index ae9cc6b4f0..ae9cc6b4f0 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn024.hs
+++ b/testsuite/tests/rename/should_compile/rn024.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn025.hs b/testsuite/tests/rename/should_compile/rn025.hs
index b8bf1ffe94..b8bf1ffe94 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn025.hs
+++ b/testsuite/tests/rename/should_compile/rn025.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn025.stderr b/testsuite/tests/rename/should_compile/rn025.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn025.stderr
+++ b/testsuite/tests/rename/should_compile/rn025.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn026.hs b/testsuite/tests/rename/should_compile/rn026.hs
index 45510361a9..45510361a9 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn026.hs
+++ b/testsuite/tests/rename/should_compile/rn026.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn027.hs b/testsuite/tests/rename/should_compile/rn027.hs
index 76cefe9310..76cefe9310 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn027.hs
+++ b/testsuite/tests/rename/should_compile/rn027.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn028.hs b/testsuite/tests/rename/should_compile/rn028.hs
index 6bbafd7a36..6bbafd7a36 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn028.hs
+++ b/testsuite/tests/rename/should_compile/rn028.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn029.hs b/testsuite/tests/rename/should_compile/rn029.hs
index 76dd993dc9..76dd993dc9 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn029.hs
+++ b/testsuite/tests/rename/should_compile/rn029.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn031.hs b/testsuite/tests/rename/should_compile/rn031.hs
index 7b4a07d626..7b4a07d626 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn031.hs
+++ b/testsuite/tests/rename/should_compile/rn031.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn032.hs b/testsuite/tests/rename/should_compile/rn032.hs
index 6bbafd7a36..6bbafd7a36 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn032.hs
+++ b/testsuite/tests/rename/should_compile/rn032.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn033.hs b/testsuite/tests/rename/should_compile/rn033.hs
index 4c30160a8d..4c30160a8d 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn033.hs
+++ b/testsuite/tests/rename/should_compile/rn033.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn034.hs b/testsuite/tests/rename/should_compile/rn034.hs
index b8fc047171..b8fc047171 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn034.hs
+++ b/testsuite/tests/rename/should_compile/rn034.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn035.hs b/testsuite/tests/rename/should_compile/rn035.hs
index 3de6a9b71d..3de6a9b71d 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn035.hs
+++ b/testsuite/tests/rename/should_compile/rn035.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn036.hs b/testsuite/tests/rename/should_compile/rn036.hs
index 9eb96b1dd6..9eb96b1dd6 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn036.hs
+++ b/testsuite/tests/rename/should_compile/rn036.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn037.hs b/testsuite/tests/rename/should_compile/rn037.hs
index 46de96fae5..46de96fae5 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn037.hs
+++ b/testsuite/tests/rename/should_compile/rn037.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn037.stderr-ghc b/testsuite/tests/rename/should_compile/rn037.stderr-ghc
index 64b604f9bd..64b604f9bd 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn037.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/rn037.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn039.hs b/testsuite/tests/rename/should_compile/rn039.hs
index 9033858158..9033858158 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn039.hs
+++ b/testsuite/tests/rename/should_compile/rn039.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn039.stderr-ghc b/testsuite/tests/rename/should_compile/rn039.stderr-ghc
index f3c9c5bf3d..f3c9c5bf3d 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn039.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/rn039.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn040.hs b/testsuite/tests/rename/should_compile/rn040.hs
index 3b418f5c2f..3b418f5c2f 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn040.hs
+++ b/testsuite/tests/rename/should_compile/rn040.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn040.stderr-ghc b/testsuite/tests/rename/should_compile/rn040.stderr-ghc
index 5de9d0c1c6..5de9d0c1c6 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn040.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/rn040.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn041.hs b/testsuite/tests/rename/should_compile/rn041.hs
index 454227c14d..454227c14d 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn041.hs
+++ b/testsuite/tests/rename/should_compile/rn041.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn041.stderr-ghc b/testsuite/tests/rename/should_compile/rn041.stderr-ghc
index da94a09854..da94a09854 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn041.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/rn041.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn042.hs b/testsuite/tests/rename/should_compile/rn042.hs
index db96e89b73..db96e89b73 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn042.hs
+++ b/testsuite/tests/rename/should_compile/rn042.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn043.hs b/testsuite/tests/rename/should_compile/rn043.hs
index e88e8426df..e88e8426df 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn043.hs
+++ b/testsuite/tests/rename/should_compile/rn043.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn044.hs b/testsuite/tests/rename/should_compile/rn044.hs
index 44e33b40b4..44e33b40b4 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn044.hs
+++ b/testsuite/tests/rename/should_compile/rn044.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn045.hs b/testsuite/tests/rename/should_compile/rn045.hs
index 16a3c49972..16a3c49972 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn045.hs
+++ b/testsuite/tests/rename/should_compile/rn045.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn046.hs b/testsuite/tests/rename/should_compile/rn046.hs
index ba469f3aec..ba469f3aec 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn046.hs
+++ b/testsuite/tests/rename/should_compile/rn046.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn046.stderr-ghc b/testsuite/tests/rename/should_compile/rn046.stderr-ghc
index ebde8af373..ebde8af373 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn046.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/rn046.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn047.hs b/testsuite/tests/rename/should_compile/rn047.hs
index f4526aa384..f4526aa384 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn047.hs
+++ b/testsuite/tests/rename/should_compile/rn047.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn047.stderr-ghc b/testsuite/tests/rename/should_compile/rn047.stderr-ghc
index 8b9614cb17..8b9614cb17 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn047.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/rn047.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn048.hs b/testsuite/tests/rename/should_compile/rn048.hs
index e34c979258..e34c979258 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn048.hs
+++ b/testsuite/tests/rename/should_compile/rn048.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn049.hs b/testsuite/tests/rename/should_compile/rn049.hs
index 83f6c5c276..83f6c5c276 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn049.hs
+++ b/testsuite/tests/rename/should_compile/rn049.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn049.stderr b/testsuite/tests/rename/should_compile/rn049.stderr
index 766c681051..766c681051 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn049.stderr
+++ b/testsuite/tests/rename/should_compile/rn049.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn050.hs b/testsuite/tests/rename/should_compile/rn050.hs
index 4dd1e6c4c4..4dd1e6c4c4 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn050.hs
+++ b/testsuite/tests/rename/should_compile/rn050.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn050.stderr b/testsuite/tests/rename/should_compile/rn050.stderr
index d323205aed..d323205aed 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn050.stderr
+++ b/testsuite/tests/rename/should_compile/rn050.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn051.hs b/testsuite/tests/rename/should_compile/rn051.hs
index ee5b53ee8e..ee5b53ee8e 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn051.hs
+++ b/testsuite/tests/rename/should_compile/rn051.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn052.hs b/testsuite/tests/rename/should_compile/rn052.hs
index 47e115a25c..47e115a25c 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn052.hs
+++ b/testsuite/tests/rename/should_compile/rn052.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn053.hs b/testsuite/tests/rename/should_compile/rn053.hs
index 6994bf29bd..6994bf29bd 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn053.hs
+++ b/testsuite/tests/rename/should_compile/rn053.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn054.hs b/testsuite/tests/rename/should_compile/rn054.hs
index 9706072cb6..9706072cb6 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn054.hs
+++ b/testsuite/tests/rename/should_compile/rn054.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn055.hs b/testsuite/tests/rename/should_compile/rn055.hs
index d5ec280d4a..d5ec280d4a 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn055.hs
+++ b/testsuite/tests/rename/should_compile/rn055.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn055.stderr-ghc b/testsuite/tests/rename/should_compile/rn055.stderr-ghc
index 1b928b46cf..1b928b46cf 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn055.stderr-ghc
+++ b/testsuite/tests/rename/should_compile/rn055.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn056.hs b/testsuite/tests/rename/should_compile/rn056.hs
index 5e775dd112..5e775dd112 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn056.hs
+++ b/testsuite/tests/rename/should_compile/rn056.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn056.stderr b/testsuite/tests/rename/should_compile/rn056.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn056.stderr
+++ b/testsuite/tests/rename/should_compile/rn056.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn057.hs b/testsuite/tests/rename/should_compile/rn057.hs
index b6ca224ffb..b6ca224ffb 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn057.hs
+++ b/testsuite/tests/rename/should_compile/rn057.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn057.stderr b/testsuite/tests/rename/should_compile/rn057.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn057.stderr
+++ b/testsuite/tests/rename/should_compile/rn057.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn058.hs b/testsuite/tests/rename/should_compile/rn058.hs
index 838f58b1c7..838f58b1c7 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn058.hs
+++ b/testsuite/tests/rename/should_compile/rn058.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn059.hs b/testsuite/tests/rename/should_compile/rn059.hs
index e46c666433..e46c666433 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn059.hs
+++ b/testsuite/tests/rename/should_compile/rn059.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn060.hs b/testsuite/tests/rename/should_compile/rn060.hs
index aa6ff02191..aa6ff02191 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn060.hs
+++ b/testsuite/tests/rename/should_compile/rn060.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn061.hs b/testsuite/tests/rename/should_compile/rn061.hs
index caeb1c9e79..caeb1c9e79 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn061.hs
+++ b/testsuite/tests/rename/should_compile/rn061.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn062.hs b/testsuite/tests/rename/should_compile/rn062.hs
index dbb5493fb9..dbb5493fb9 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn062.hs
+++ b/testsuite/tests/rename/should_compile/rn062.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn063.hs b/testsuite/tests/rename/should_compile/rn063.hs
index 4f40cce7ee..4f40cce7ee 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn063.hs
+++ b/testsuite/tests/rename/should_compile/rn063.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn063.stderr b/testsuite/tests/rename/should_compile/rn063.stderr
index c437dd3c6a..c437dd3c6a 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn063.stderr
+++ b/testsuite/tests/rename/should_compile/rn063.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn064.hs b/testsuite/tests/rename/should_compile/rn064.hs
index 658d87b348..658d87b348 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn064.hs
+++ b/testsuite/tests/rename/should_compile/rn064.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn064.stderr b/testsuite/tests/rename/should_compile/rn064.stderr
index f23a96bb54..f23a96bb54 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn064.stderr
+++ b/testsuite/tests/rename/should_compile/rn064.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn065.hs b/testsuite/tests/rename/should_compile/rn065.hs
index 2da09d0d74..2da09d0d74 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn065.hs
+++ b/testsuite/tests/rename/should_compile/rn065.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn066.hs b/testsuite/tests/rename/should_compile/rn066.hs
index c41265ecf5..c41265ecf5 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn066.hs
+++ b/testsuite/tests/rename/should_compile/rn066.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn066.stderr b/testsuite/tests/rename/should_compile/rn066.stderr
index 6a95f2f93c..6a95f2f93c 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn066.stderr
+++ b/testsuite/tests/rename/should_compile/rn066.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/rn067.hs b/testsuite/tests/rename/should_compile/rn067.hs
index d0e2d2ede2..d0e2d2ede2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/rn067.hs
+++ b/testsuite/tests/rename/should_compile/rn067.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/timing001.hs b/testsuite/tests/rename/should_compile/timing001.hs
index b84b341f19..b84b341f19 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/timing001.hs
+++ b/testsuite/tests/rename/should_compile/timing001.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/timing001.stderr b/testsuite/tests/rename/should_compile/timing001.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/timing001.stderr
+++ b/testsuite/tests/rename/should_compile/timing001.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/timing002.hs b/testsuite/tests/rename/should_compile/timing002.hs
index f81b026a67..f81b026a67 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/timing002.hs
+++ b/testsuite/tests/rename/should_compile/timing002.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/timing002.stderr b/testsuite/tests/rename/should_compile/timing002.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/timing002.stderr
+++ b/testsuite/tests/rename/should_compile/timing002.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/timing003.hs b/testsuite/tests/rename/should_compile/timing003.hs
index c268646daf..c268646daf 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/timing003.hs
+++ b/testsuite/tests/rename/should_compile/timing003.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_compile/timing003.stderr b/testsuite/tests/rename/should_compile/timing003.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_compile/timing003.stderr
+++ b/testsuite/tests/rename/should_compile/timing003.stderr
diff --git a/testsuite/tests/rename/should_fail/Makefile b/testsuite/tests/rename/should_fail/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/rename/should_fail/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/RnFail047_A.hs b/testsuite/tests/rename/should_fail/RnFail047_A.hs
index dfe63adbaa..dfe63adbaa 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/RnFail047_A.hs
+++ b/testsuite/tests/rename/should_fail/RnFail047_A.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/RnFail047_A.hs-boot b/testsuite/tests/rename/should_fail/RnFail047_A.hs-boot
index 5bfff40b96..5bfff40b96 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/RnFail047_A.hs-boot
+++ b/testsuite/tests/rename/should_fail/RnFail047_A.hs-boot
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/RnFail055.hs b/testsuite/tests/rename/should_fail/RnFail055.hs
index bd95add36b..bd95add36b 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/RnFail055.hs
+++ b/testsuite/tests/rename/should_fail/RnFail055.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/RnFail055.hs-boot b/testsuite/tests/rename/should_fail/RnFail055.hs-boot
index 57a97d3695..57a97d3695 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/RnFail055.hs-boot
+++ b/testsuite/tests/rename/should_fail/RnFail055.hs-boot
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/RnFail055_aux.hs b/testsuite/tests/rename/should_fail/RnFail055_aux.hs
index 4e1f12bf81..4e1f12bf81 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/RnFail055_aux.hs
+++ b/testsuite/tests/rename/should_fail/RnFail055_aux.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/Rnfail040_A.hs b/testsuite/tests/rename/should_fail/Rnfail040_A.hs
index 6de0f88ac9..6de0f88ac9 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/Rnfail040_A.hs
+++ b/testsuite/tests/rename/should_fail/Rnfail040_A.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T1595a.hs b/testsuite/tests/rename/should_fail/T1595a.hs
index 5497a7a269..5497a7a269 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T1595a.hs
+++ b/testsuite/tests/rename/should_fail/T1595a.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T1595a.stderr b/testsuite/tests/rename/should_fail/T1595a.stderr
index 3c9adca7f7..3c9adca7f7 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T1595a.stderr
+++ b/testsuite/tests/rename/should_fail/T1595a.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T2310.hs b/testsuite/tests/rename/should_fail/T2310.hs
index 6094b8e211..6094b8e211 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T2310.hs
+++ b/testsuite/tests/rename/should_fail/T2310.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T2310.stderr b/testsuite/tests/rename/should_fail/T2310.stderr
index 6500eef1fc..6500eef1fc 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T2310.stderr
+++ b/testsuite/tests/rename/should_fail/T2310.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T2490.hs b/testsuite/tests/rename/should_fail/T2490.hs
index 31afc0987a..31afc0987a 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T2490.hs
+++ b/testsuite/tests/rename/should_fail/T2490.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T2490.stderr b/testsuite/tests/rename/should_fail/T2490.stderr
index 15beadab1e..15beadab1e 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T2490.stderr
+++ b/testsuite/tests/rename/should_fail/T2490.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T2723.hs b/testsuite/tests/rename/should_fail/T2723.hs
index 74f11af778..74f11af778 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T2723.hs
+++ b/testsuite/tests/rename/should_fail/T2723.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T2723.stderr b/testsuite/tests/rename/should_fail/T2723.stderr
index 7ede041658..7ede041658 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T2723.stderr
+++ b/testsuite/tests/rename/should_fail/T2723.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T2901.hs b/testsuite/tests/rename/should_fail/T2901.hs
index a703a5e53d..a703a5e53d 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T2901.hs
+++ b/testsuite/tests/rename/should_fail/T2901.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T2901.stderr b/testsuite/tests/rename/should_fail/T2901.stderr
index 7b3e9d5145..7b3e9d5145 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T2901.stderr
+++ b/testsuite/tests/rename/should_fail/T2901.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T2993.hs b/testsuite/tests/rename/should_fail/T2993.hs
index 99f2a89ca1..99f2a89ca1 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T2993.hs
+++ b/testsuite/tests/rename/should_fail/T2993.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T2993.stderr b/testsuite/tests/rename/should_fail/T2993.stderr
index 0ba55ddd36..0ba55ddd36 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T2993.stderr
+++ b/testsuite/tests/rename/should_fail/T2993.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T3265.hs b/testsuite/tests/rename/should_fail/T3265.hs
index e938bbc34d..e938bbc34d 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T3265.hs
+++ b/testsuite/tests/rename/should_fail/T3265.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T3265.stderr b/testsuite/tests/rename/should_fail/T3265.stderr
index 37642ff16b..37642ff16b 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T3265.stderr
+++ b/testsuite/tests/rename/should_fail/T3265.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T3792.hs b/testsuite/tests/rename/should_fail/T3792.hs
index e01efb9418..e01efb9418 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T3792.hs
+++ b/testsuite/tests/rename/should_fail/T3792.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T3792.stderr b/testsuite/tests/rename/should_fail/T3792.stderr
index 892fb11083..892fb11083 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T3792.stderr
+++ b/testsuite/tests/rename/should_fail/T3792.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T4042.hs b/testsuite/tests/rename/should_fail/T4042.hs
index 221b5519ef..221b5519ef 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T4042.hs
+++ b/testsuite/tests/rename/should_fail/T4042.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T4042.stderr b/testsuite/tests/rename/should_fail/T4042.stderr
index f8c7e433a6..f8c7e433a6 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T4042.stderr
+++ b/testsuite/tests/rename/should_fail/T4042.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T5211.hs b/testsuite/tests/rename/should_fail/T5211.hs
index 2d0e69af7b..2d0e69af7b 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T5211.hs
+++ b/testsuite/tests/rename/should_fail/T5211.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/T5211.stderr b/testsuite/tests/rename/should_fail/T5211.stderr
index a33a02750c..a33a02750c 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/T5211.stderr
+++ b/testsuite/tests/rename/should_fail/T5211.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/all.T b/testsuite/tests/rename/should_fail/all.T
index 78d35ce37c..78d35ce37c 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/all.T
+++ b/testsuite/tests/rename/should_fail/all.T
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/mc13.hs b/testsuite/tests/rename/should_fail/mc13.hs
index 2686005f7f..2686005f7f 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/mc13.hs
+++ b/testsuite/tests/rename/should_fail/mc13.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/mc13.stderr b/testsuite/tests/rename/should_fail/mc13.stderr
index 82f8dd5f18..82f8dd5f18 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/mc13.stderr
+++ b/testsuite/tests/rename/should_fail/mc13.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/mc14.hs b/testsuite/tests/rename/should_fail/mc14.hs
index e2cf74cbf5..e2cf74cbf5 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/mc14.hs
+++ b/testsuite/tests/rename/should_fail/mc14.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/mc14.stderr b/testsuite/tests/rename/should_fail/mc14.stderr
index 1eadb9d4b7..1eadb9d4b7 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/mc14.stderr
+++ b/testsuite/tests/rename/should_fail/mc14.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rn_dup.hs b/testsuite/tests/rename/should_fail/rn_dup.hs
index 927e15ff32..927e15ff32 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rn_dup.hs
+++ b/testsuite/tests/rename/should_fail/rn_dup.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rn_dup.stderr b/testsuite/tests/rename/should_fail/rn_dup.stderr
index 88e2f86413..88e2f86413 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rn_dup.stderr
+++ b/testsuite/tests/rename/should_fail/rn_dup.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail001.hs b/testsuite/tests/rename/should_fail/rnfail001.hs
index f6758a1b2b..f6758a1b2b 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail001.hs
+++ b/testsuite/tests/rename/should_fail/rnfail001.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail001.stderr b/testsuite/tests/rename/should_fail/rnfail001.stderr
index 5414f93f27..5414f93f27 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail001.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail001.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail001.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail001.stderr-hugs
index 9103ec5b64..9103ec5b64 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail001.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail001.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail002.hs b/testsuite/tests/rename/should_fail/rnfail002.hs
index ab387223fc..ab387223fc 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail002.hs
+++ b/testsuite/tests/rename/should_fail/rnfail002.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail002.stderr b/testsuite/tests/rename/should_fail/rnfail002.stderr
index db236f3073..db236f3073 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail002.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail002.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail002.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail002.stderr-hugs
index 46f18320e9..46f18320e9 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail002.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail002.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail003.hs b/testsuite/tests/rename/should_fail/rnfail003.hs
index fb62bac074..fb62bac074 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail003.hs
+++ b/testsuite/tests/rename/should_fail/rnfail003.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail003.stderr b/testsuite/tests/rename/should_fail/rnfail003.stderr
index 0398a4d9c7..0398a4d9c7 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail003.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail003.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail003.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail003.stderr-hugs
index 9ebafc363e..9ebafc363e 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail003.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail003.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail004.hs b/testsuite/tests/rename/should_fail/rnfail004.hs
index 90a97f894c..90a97f894c 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail004.hs
+++ b/testsuite/tests/rename/should_fail/rnfail004.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail004.stderr b/testsuite/tests/rename/should_fail/rnfail004.stderr
index edff58cf6f..edff58cf6f 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail004.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail004.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail004.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail004.stderr-hugs
index 3ad3a13469..3ad3a13469 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail004.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail004.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail005.stderr b/testsuite/tests/rename/should_fail/rnfail005.stderr
index 9ad30e8755..9ad30e8755 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail005.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail005.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail007.hs b/testsuite/tests/rename/should_fail/rnfail007.hs
index 272abcf9fb..272abcf9fb 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail007.hs
+++ b/testsuite/tests/rename/should_fail/rnfail007.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail007.stderr b/testsuite/tests/rename/should_fail/rnfail007.stderr
index a00dc892d5..a00dc892d5 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail007.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail007.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail008.hs b/testsuite/tests/rename/should_fail/rnfail008.hs
index 196214a840..196214a840 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail008.hs
+++ b/testsuite/tests/rename/should_fail/rnfail008.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail008.stderr b/testsuite/tests/rename/should_fail/rnfail008.stderr
index 91818fc656..91818fc656 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail008.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail008.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail008.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail008.stderr-hugs
index cd6711a842..cd6711a842 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail008.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail008.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail009.hs b/testsuite/tests/rename/should_fail/rnfail009.hs
index 1557f48c7b..1557f48c7b 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail009.hs
+++ b/testsuite/tests/rename/should_fail/rnfail009.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail009.stderr b/testsuite/tests/rename/should_fail/rnfail009.stderr
index 9cddc115d6..9cddc115d6 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail009.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail009.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail009.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail009.stderr-hugs
index 2775982760..2775982760 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail009.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail009.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail010.hs b/testsuite/tests/rename/should_fail/rnfail010.hs
index d5e51ed4fd..d5e51ed4fd 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail010.hs
+++ b/testsuite/tests/rename/should_fail/rnfail010.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail010.stderr b/testsuite/tests/rename/should_fail/rnfail010.stderr
index 0855b4b731..0855b4b731 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail010.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail010.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail010.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail010.stderr-hugs
index 1a35934d4c..1a35934d4c 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail010.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail010.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail011.hs b/testsuite/tests/rename/should_fail/rnfail011.hs
index b342618e15..b342618e15 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail011.hs
+++ b/testsuite/tests/rename/should_fail/rnfail011.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail011.stderr b/testsuite/tests/rename/should_fail/rnfail011.stderr
index d76a63a410..d76a63a410 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail011.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail011.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail011.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail011.stderr-hugs
index 3ed800c263..3ed800c263 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail011.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail011.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail012.hs b/testsuite/tests/rename/should_fail/rnfail012.hs
index 725b0d1632..725b0d1632 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail012.hs
+++ b/testsuite/tests/rename/should_fail/rnfail012.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail012.stderr b/testsuite/tests/rename/should_fail/rnfail012.stderr
index 93bfec9346..93bfec9346 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail012.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail012.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail012.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail012.stderr-hugs
index 5908cb6f67..5908cb6f67 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail012.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail012.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail013.hs b/testsuite/tests/rename/should_fail/rnfail013.hs
index 4d30ded185..4d30ded185 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail013.hs
+++ b/testsuite/tests/rename/should_fail/rnfail013.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail013.stderr b/testsuite/tests/rename/should_fail/rnfail013.stderr
index 761f2f0a0e..761f2f0a0e 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail013.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail013.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail013.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail013.stderr-hugs
index 3342f19b3c..3342f19b3c 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail013.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail013.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail015.hs b/testsuite/tests/rename/should_fail/rnfail015.hs
index 20f9934f4b..20f9934f4b 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail015.hs
+++ b/testsuite/tests/rename/should_fail/rnfail015.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail015.stderr b/testsuite/tests/rename/should_fail/rnfail015.stderr
index bf1e382f6c..bf1e382f6c 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail015.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail015.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail015.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail015.stderr-hugs
index a91ae7cb04..a91ae7cb04 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail015.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail015.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail016.hs b/testsuite/tests/rename/should_fail/rnfail016.hs
index 1fa71c583a..1fa71c583a 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail016.hs
+++ b/testsuite/tests/rename/should_fail/rnfail016.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail016.stderr b/testsuite/tests/rename/should_fail/rnfail016.stderr
index ed9debda77..ed9debda77 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail016.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail016.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail016.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail016.stderr-hugs
index 76c2827039..76c2827039 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail016.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail016.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail017.hs b/testsuite/tests/rename/should_fail/rnfail017.hs
index 327a9d6abd..327a9d6abd 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail017.hs
+++ b/testsuite/tests/rename/should_fail/rnfail017.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail017.stderr b/testsuite/tests/rename/should_fail/rnfail017.stderr
index f04b1d0990..f04b1d0990 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail017.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail017.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail018.hs b/testsuite/tests/rename/should_fail/rnfail018.hs
index 1b3ad82762..1b3ad82762 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail018.hs
+++ b/testsuite/tests/rename/should_fail/rnfail018.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail018.stderr b/testsuite/tests/rename/should_fail/rnfail018.stderr
index 3bae3eb527..3bae3eb527 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail018.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail018.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail019.hs b/testsuite/tests/rename/should_fail/rnfail019.hs
index ec97efe1cf..ec97efe1cf 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail019.hs
+++ b/testsuite/tests/rename/should_fail/rnfail019.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail019.stderr b/testsuite/tests/rename/should_fail/rnfail019.stderr
index f990e2d2cd..f990e2d2cd 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail019.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail019.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail019.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail019.stderr-hugs
index 1e09963ae1..1e09963ae1 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail019.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail019.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail020.hs b/testsuite/tests/rename/should_fail/rnfail020.hs
index decd2e80ad..decd2e80ad 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail020.hs
+++ b/testsuite/tests/rename/should_fail/rnfail020.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail020.stderr b/testsuite/tests/rename/should_fail/rnfail020.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail020.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail020.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail021.hs b/testsuite/tests/rename/should_fail/rnfail021.hs
index a8062967e1..a8062967e1 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail021.hs
+++ b/testsuite/tests/rename/should_fail/rnfail021.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail021.stderr b/testsuite/tests/rename/should_fail/rnfail021.stderr
index 1cf26eca36..1cf26eca36 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail021.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail021.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail021.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail021.stderr-hugs
index cb4c6c422a..cb4c6c422a 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail021.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail021.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail022.hs b/testsuite/tests/rename/should_fail/rnfail022.hs
index 05c842e770..05c842e770 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail022.hs
+++ b/testsuite/tests/rename/should_fail/rnfail022.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail022.stderr b/testsuite/tests/rename/should_fail/rnfail022.stderr
index 011d6790d7..011d6790d7 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail022.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail022.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail022.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail022.stderr-hugs
index b58124c912..b58124c912 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail022.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail022.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail023.hs b/testsuite/tests/rename/should_fail/rnfail023.hs
index bf7c4a2f20..bf7c4a2f20 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail023.hs
+++ b/testsuite/tests/rename/should_fail/rnfail023.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail023.stderr b/testsuite/tests/rename/should_fail/rnfail023.stderr
index ec9d81ab76..ec9d81ab76 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail023.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail023.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail023.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail023.stderr-hugs
index 1f8191015d..1f8191015d 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail023.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail023.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail024.hs b/testsuite/tests/rename/should_fail/rnfail024.hs
index 4663319ce9..4663319ce9 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail024.hs
+++ b/testsuite/tests/rename/should_fail/rnfail024.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail024.stderr b/testsuite/tests/rename/should_fail/rnfail024.stderr
index 19b9f33921..19b9f33921 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail024.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail024.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail024.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail024.stderr-hugs
index 1b89d6825a..1b89d6825a 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail024.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail024.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail025.hs b/testsuite/tests/rename/should_fail/rnfail025.hs
index 42cf3d76f5..42cf3d76f5 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail025.hs
+++ b/testsuite/tests/rename/should_fail/rnfail025.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail025.stderr b/testsuite/tests/rename/should_fail/rnfail025.stderr
index 4c2e25a07c..4c2e25a07c 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail025.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail025.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail025.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail025.stderr-hugs
index 7a2bcb5945..7a2bcb5945 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail025.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail025.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail026.hs b/testsuite/tests/rename/should_fail/rnfail026.hs
index 3256876e68..3256876e68 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail026.hs
+++ b/testsuite/tests/rename/should_fail/rnfail026.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail026.stderr b/testsuite/tests/rename/should_fail/rnfail026.stderr
index 6aa899b36d..6aa899b36d 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail026.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail026.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail026.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail026.stderr-hugs
index 245ba83337..245ba83337 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail026.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail026.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail027.hs b/testsuite/tests/rename/should_fail/rnfail027.hs
index fc6d8c87d4..fc6d8c87d4 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail027.hs
+++ b/testsuite/tests/rename/should_fail/rnfail027.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail027.stderr b/testsuite/tests/rename/should_fail/rnfail027.stderr
index 31214a1a42..31214a1a42 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail027.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail027.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail027.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail027.stderr-hugs
index df1f912339..df1f912339 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail027.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail027.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail028.hs b/testsuite/tests/rename/should_fail/rnfail028.hs
index 13e2237aba..13e2237aba 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail028.hs
+++ b/testsuite/tests/rename/should_fail/rnfail028.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail028.stderr b/testsuite/tests/rename/should_fail/rnfail028.stderr
index f09cda3f33..f09cda3f33 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail028.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail028.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail028.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail028.stderr-hugs
index d1aa3d5903..d1aa3d5903 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail028.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail028.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail029.hs b/testsuite/tests/rename/should_fail/rnfail029.hs
index 8d8608e41f..8d8608e41f 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail029.hs
+++ b/testsuite/tests/rename/should_fail/rnfail029.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail029.stderr b/testsuite/tests/rename/should_fail/rnfail029.stderr
index e22f4c33ae..e22f4c33ae 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail029.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail029.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail029.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail029.stderr-hugs
index a2f0265916..a2f0265916 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail029.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail029.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail030.hs b/testsuite/tests/rename/should_fail/rnfail030.hs
index 23c54c8feb..23c54c8feb 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail030.hs
+++ b/testsuite/tests/rename/should_fail/rnfail030.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail030.stderr b/testsuite/tests/rename/should_fail/rnfail030.stderr
index 749206a814..749206a814 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail030.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail030.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail030.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail030.stderr-hugs
index eb846ddfac..eb846ddfac 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail030.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail030.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail031.hs b/testsuite/tests/rename/should_fail/rnfail031.hs
index ce86cf935a..ce86cf935a 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail031.hs
+++ b/testsuite/tests/rename/should_fail/rnfail031.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail031.stderr b/testsuite/tests/rename/should_fail/rnfail031.stderr
index ad04461dc3..ad04461dc3 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail031.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail031.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail031.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail031.stderr-hugs
index 2036937995..2036937995 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail031.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail031.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail032.hs b/testsuite/tests/rename/should_fail/rnfail032.hs
index 2970030ab0..2970030ab0 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail032.hs
+++ b/testsuite/tests/rename/should_fail/rnfail032.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail032.stderr b/testsuite/tests/rename/should_fail/rnfail032.stderr
index ea80202dd0..ea80202dd0 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail032.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail032.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail032.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail032.stderr-hugs
index fef6e8e210..fef6e8e210 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail032.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail032.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail033.hs b/testsuite/tests/rename/should_fail/rnfail033.hs
index 7d8b4c4fdc..7d8b4c4fdc 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail033.hs
+++ b/testsuite/tests/rename/should_fail/rnfail033.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail033.stderr b/testsuite/tests/rename/should_fail/rnfail033.stderr
index c9abd0f87a..c9abd0f87a 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail033.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail033.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail033.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail033.stderr-hugs
index d651e56ebe..d651e56ebe 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail033.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail033.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail034.hs b/testsuite/tests/rename/should_fail/rnfail034.hs
index 25d9189472..25d9189472 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail034.hs
+++ b/testsuite/tests/rename/should_fail/rnfail034.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail034.stderr b/testsuite/tests/rename/should_fail/rnfail034.stderr
index 2ec0a3b8e5..2ec0a3b8e5 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail034.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail034.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail034.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail034.stderr-hugs
index e1e0a9a566..e1e0a9a566 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail034.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail034.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail035.hs b/testsuite/tests/rename/should_fail/rnfail035.hs
index 4f57c06374..4f57c06374 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail035.hs
+++ b/testsuite/tests/rename/should_fail/rnfail035.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail035.stderr b/testsuite/tests/rename/should_fail/rnfail035.stderr
index 83eb2d85e3..83eb2d85e3 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail035.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail035.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail035.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail035.stderr-hugs
index 105e56f36c..105e56f36c 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail035.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail035.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail038.hs b/testsuite/tests/rename/should_fail/rnfail038.hs
index b96000a873..b96000a873 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail038.hs
+++ b/testsuite/tests/rename/should_fail/rnfail038.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail038.stderr b/testsuite/tests/rename/should_fail/rnfail038.stderr
index 71c31d6d1b..71c31d6d1b 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail038.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail038.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail038.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail038.stderr-hugs
index ee3487e0d4..ee3487e0d4 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail038.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail038.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail039.hs b/testsuite/tests/rename/should_fail/rnfail039.hs
index 428d8d9716..428d8d9716 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail039.hs
+++ b/testsuite/tests/rename/should_fail/rnfail039.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail039.stderr b/testsuite/tests/rename/should_fail/rnfail039.stderr
index 6283dccd33..6283dccd33 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail039.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail039.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail039.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail039.stderr-hugs
index 43c760998e..43c760998e 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail039.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail039.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail040.hs b/testsuite/tests/rename/should_fail/rnfail040.hs
index 5ba4d41bec..5ba4d41bec 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail040.hs
+++ b/testsuite/tests/rename/should_fail/rnfail040.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail040.stderr b/testsuite/tests/rename/should_fail/rnfail040.stderr
index 25e3c1153f..25e3c1153f 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail040.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail040.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail040.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail040.stderr-hugs
index 913c1b455c..913c1b455c 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail040.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail040.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail041.hs b/testsuite/tests/rename/should_fail/rnfail041.hs
index 57f79705b5..57f79705b5 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail041.hs
+++ b/testsuite/tests/rename/should_fail/rnfail041.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail041.stderr b/testsuite/tests/rename/should_fail/rnfail041.stderr
index 0c5c60d4d2..0c5c60d4d2 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail041.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail041.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail041.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail041.stderr-hugs
index 2b8745ec9b..2b8745ec9b 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail041.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail041.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail042.hs b/testsuite/tests/rename/should_fail/rnfail042.hs
index 16c01f3450..16c01f3450 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail042.hs
+++ b/testsuite/tests/rename/should_fail/rnfail042.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail042.stderr b/testsuite/tests/rename/should_fail/rnfail042.stderr
index 9e030d7bf8..9e030d7bf8 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail042.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail042.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail042.stderr-hugs b/testsuite/tests/rename/should_fail/rnfail042.stderr-hugs
index 66c517d13c..66c517d13c 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail042.stderr-hugs
+++ b/testsuite/tests/rename/should_fail/rnfail042.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail043.hs b/testsuite/tests/rename/should_fail/rnfail043.hs
index 492cebb516..492cebb516 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail043.hs
+++ b/testsuite/tests/rename/should_fail/rnfail043.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail043.stderr b/testsuite/tests/rename/should_fail/rnfail043.stderr
index 428c1944dc..428c1944dc 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail043.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail043.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail044.hs b/testsuite/tests/rename/should_fail/rnfail044.hs
index ed72b9abae..ed72b9abae 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail044.hs
+++ b/testsuite/tests/rename/should_fail/rnfail044.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail044.stderr b/testsuite/tests/rename/should_fail/rnfail044.stderr
index 2b27ad4fea..2b27ad4fea 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail044.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail044.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail045.hs b/testsuite/tests/rename/should_fail/rnfail045.hs
index 641bec0a6a..641bec0a6a 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail045.hs
+++ b/testsuite/tests/rename/should_fail/rnfail045.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail045.stderr b/testsuite/tests/rename/should_fail/rnfail045.stderr
index d8c80008c0..d8c80008c0 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail045.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail045.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail046.hs b/testsuite/tests/rename/should_fail/rnfail046.hs
index f8aa7a734c..f8aa7a734c 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail046.hs
+++ b/testsuite/tests/rename/should_fail/rnfail046.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail046.stderr b/testsuite/tests/rename/should_fail/rnfail046.stderr
index 49cfe356f4..49cfe356f4 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail046.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail046.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail047.hs b/testsuite/tests/rename/should_fail/rnfail047.hs
index 55bd0b8d68..55bd0b8d68 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail047.hs
+++ b/testsuite/tests/rename/should_fail/rnfail047.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail047.stderr b/testsuite/tests/rename/should_fail/rnfail047.stderr
index 380bbd906b..380bbd906b 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail047.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail047.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail048.hs b/testsuite/tests/rename/should_fail/rnfail048.hs
index d1c8d73eb0..d1c8d73eb0 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail048.hs
+++ b/testsuite/tests/rename/should_fail/rnfail048.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail048.stderr b/testsuite/tests/rename/should_fail/rnfail048.stderr
index 885229d745..885229d745 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail048.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail048.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail049.hs b/testsuite/tests/rename/should_fail/rnfail049.hs
index 7f4b6c7842..7f4b6c7842 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail049.hs
+++ b/testsuite/tests/rename/should_fail/rnfail049.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail049.stderr b/testsuite/tests/rename/should_fail/rnfail049.stderr
index 6b753fbf2d..6b753fbf2d 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail049.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail049.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail050.hs b/testsuite/tests/rename/should_fail/rnfail050.hs
index 0c3b262a0f..0c3b262a0f 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail050.hs
+++ b/testsuite/tests/rename/should_fail/rnfail050.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail050.stderr b/testsuite/tests/rename/should_fail/rnfail050.stderr
index d097fc5b44..d097fc5b44 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail050.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail050.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail051.hs b/testsuite/tests/rename/should_fail/rnfail051.hs
index 227e040033..227e040033 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail051.hs
+++ b/testsuite/tests/rename/should_fail/rnfail051.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail051.stderr b/testsuite/tests/rename/should_fail/rnfail051.stderr
index 36eccc5724..36eccc5724 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail051.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail051.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail052.hs b/testsuite/tests/rename/should_fail/rnfail052.hs
index 63a0dfd6d1..63a0dfd6d1 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail052.hs
+++ b/testsuite/tests/rename/should_fail/rnfail052.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail052.stderr b/testsuite/tests/rename/should_fail/rnfail052.stderr
index f6d0929bca..f6d0929bca 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail052.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail052.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail053.hs b/testsuite/tests/rename/should_fail/rnfail053.hs
index dbc219271b..dbc219271b 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail053.hs
+++ b/testsuite/tests/rename/should_fail/rnfail053.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail053.stderr b/testsuite/tests/rename/should_fail/rnfail053.stderr
index 47f44c4464..47f44c4464 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail053.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail053.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail054.hs b/testsuite/tests/rename/should_fail/rnfail054.hs
index f83a0f9970..f83a0f9970 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail054.hs
+++ b/testsuite/tests/rename/should_fail/rnfail054.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail054.stderr b/testsuite/tests/rename/should_fail/rnfail054.stderr
index ab952aadeb..ab952aadeb 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail054.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail054.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail055.stderr b/testsuite/tests/rename/should_fail/rnfail055.stderr
index 7c30e7828e..7c30e7828e 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail055.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail055.stderr
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail056.hs b/testsuite/tests/rename/should_fail/rnfail056.hs
index 23ec008dc6..23ec008dc6 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail056.hs
+++ b/testsuite/tests/rename/should_fail/rnfail056.hs
diff --git a/testsuite/tests/ghc-regress/rename/should_fail/rnfail056.stderr b/testsuite/tests/rename/should_fail/rnfail056.stderr
index 3ddf502dee..3ddf502dee 100644
--- a/testsuite/tests/ghc-regress/rename/should_fail/rnfail056.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail056.stderr
diff --git a/testsuite/tests/ghc-regress/rts/2047.hs b/testsuite/tests/rts/2047.hs
index 08b72664a9..08b72664a9 100644
--- a/testsuite/tests/ghc-regress/rts/2047.hs
+++ b/testsuite/tests/rts/2047.hs
diff --git a/testsuite/tests/ghc-regress/rts/2783.hs b/testsuite/tests/rts/2783.hs
index 5edca4e7cd..5edca4e7cd 100644
--- a/testsuite/tests/ghc-regress/rts/2783.hs
+++ b/testsuite/tests/rts/2783.hs
diff --git a/testsuite/tests/ghc-regress/rts/2783.stderr b/testsuite/tests/rts/2783.stderr
index 86d45f2a1a..86d45f2a1a 100644
--- a/testsuite/tests/ghc-regress/rts/2783.stderr
+++ b/testsuite/tests/rts/2783.stderr
diff --git a/testsuite/tests/ghc-regress/rts/3236.c b/testsuite/tests/rts/3236.c
index 92d4c12dcd..92d4c12dcd 100644
--- a/testsuite/tests/ghc-regress/rts/3236.c
+++ b/testsuite/tests/rts/3236.c
diff --git a/testsuite/tests/ghc-regress/rts/3236.stderr b/testsuite/tests/rts/3236.stderr
index c1f0511021..c1f0511021 100644
--- a/testsuite/tests/ghc-regress/rts/3236.stderr
+++ b/testsuite/tests/rts/3236.stderr
diff --git a/testsuite/tests/ghc-regress/rts/3424.hs b/testsuite/tests/rts/3424.hs
index e168df49c0..e168df49c0 100644
--- a/testsuite/tests/ghc-regress/rts/3424.hs
+++ b/testsuite/tests/rts/3424.hs
diff --git a/testsuite/tests/ghc-regress/rts/3424.stdout b/testsuite/tests/rts/3424.stdout
index e905960197..e905960197 100644
--- a/testsuite/tests/ghc-regress/rts/3424.stdout
+++ b/testsuite/tests/rts/3424.stdout
diff --git a/testsuite/tests/ghc-regress/rts/4059.hs b/testsuite/tests/rts/4059.hs
index 5af5bbc4aa..5af5bbc4aa 100644
--- a/testsuite/tests/ghc-regress/rts/4059.hs
+++ b/testsuite/tests/rts/4059.hs
diff --git a/testsuite/tests/ghc-regress/rts/4059_c.c b/testsuite/tests/rts/4059_c.c
index 3595b82cae..3595b82cae 100644
--- a/testsuite/tests/ghc-regress/rts/4059_c.c
+++ b/testsuite/tests/rts/4059_c.c
diff --git a/testsuite/tests/ghc-regress/rts/4850.hs b/testsuite/tests/rts/4850.hs
index 72616d97eb..72616d97eb 100644
--- a/testsuite/tests/ghc-regress/rts/4850.hs
+++ b/testsuite/tests/rts/4850.hs
diff --git a/testsuite/tests/ghc-regress/rts/4850.stdout b/testsuite/tests/rts/4850.stdout
index b8626c4cff..b8626c4cff 100644
--- a/testsuite/tests/ghc-regress/rts/4850.stdout
+++ b/testsuite/tests/rts/4850.stdout
diff --git a/testsuite/tests/ghc-regress/rts/5250.hs b/testsuite/tests/rts/5250.hs
index f10c2e7c47..f10c2e7c47 100644
--- a/testsuite/tests/ghc-regress/rts/5250.hs
+++ b/testsuite/tests/rts/5250.hs
diff --git a/testsuite/tests/rts/Makefile b/testsuite/tests/rts/Makefile
new file mode 100644
index 0000000000..4a65b487fa
--- /dev/null
+++ b/testsuite/tests/rts/Makefile
@@ -0,0 +1,38 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+outofmem-prep::
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make -fforce-recomp outofmem.hs -o outofmem
+
+outofmem::
+	@$(MAKE) outofmem-prep >prep.out 2>prep.out
+	@ulimit -v 10000000 2>/dev/null; ./outofmem || echo "exit($$?)"
+
+outofmem2-prep::
+	'$(TEST_HC)' $(TEST_HC_OPTS) -rtsopts --make -fforce-recomp outofmem2.hs -o outofmem2
+
+outofmem2::
+	@$(MAKE) outofmem2-prep >prep.out 2>prep.out
+	@ulimit -v 1000000 2>/dev/null; ./outofmem2 +RTS -M5m -RTS || echo "exit($$?)"
+
+T2615-prep:
+	$(RM) libfoo_T2615.so
+	'$(TEST_HC)' $(TEST_HC_OPTS) -fPIC -c libfoo_T2615.c -o libfoo_T2615.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -shared -no-auto-link-packages libfoo_T2615.o -o libfoo_T2615.so
+
+.PHONY: T4059
+T4059:
+	$(RM) 4059_c.o 4059.o 4059.hi
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make 4059 4059_c.c
+	./4059
+
+exec_signals-prep:
+	$(CC) -o exec_signals_child exec_signals_child.c
+	$(CC) -o exec_signals_prepare exec_signals_prepare.c
+
+.PHONY: 4850
+4850:
+	$(RM) 4850.o 4850.hi 4850$(exeext)
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 -rtsopts -debug -threaded --make 4850
+	./4850 +RTS -s 2>&1 | grep Task | wc -l | tr -d ' '
diff --git a/testsuite/tests/ghc-regress/rts/T2615.hs b/testsuite/tests/rts/T2615.hs
index ee04d93bcf..ee04d93bcf 100644
--- a/testsuite/tests/ghc-regress/rts/T2615.hs
+++ b/testsuite/tests/rts/T2615.hs
diff --git a/testsuite/tests/ghc-regress/rts/T2615.stdout b/testsuite/tests/rts/T2615.stdout
index 16a9ae1c20..16a9ae1c20 100644
--- a/testsuite/tests/ghc-regress/rts/T2615.stdout
+++ b/testsuite/tests/rts/T2615.stdout
diff --git a/testsuite/tests/ghc-regress/rts/T4059.stdout b/testsuite/tests/rts/T4059.stdout
index 34f64643a5..34f64643a5 100644
--- a/testsuite/tests/ghc-regress/rts/T4059.stdout
+++ b/testsuite/tests/rts/T4059.stdout
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
new file mode 100644
index 0000000000..0b37ed19e4
--- /dev/null
+++ b/testsuite/tests/rts/all.T
@@ -0,0 +1,117 @@
+test('testblockalloc', compose(c_src, 
+                       compose(only_ways(['normal','threaded1']),
+                               extra_run_opts('+RTS -I0'))), 
+                       compile_and_run, [''])
+
+
+# See bug #101, test requires +RTS -c (or equivalently +RTS -M<something>)
+# only GHCi triggers the bug, but we run the test all ways for completeness.
+test('bug1010', normal, compile_and_run, ['+RTS -c -RTS'])
+test('derefnull',
+     composes([
+             # LLVM Optimiser considers dereference of a null pointer
+             # undefined and marks the code as unreachable which means
+             # that later optimisations remove it altogether.
+             omit_ways(['optllvm']),
+             # SIGSEGV on Linux (which we make the default)
+             exit_code(139),
+             # Apparently the output can be different on different
+             # Linux setups, so just ignore it. As long as we get
+             # the right exit code we're OK.
+             if_os('linux', ignore_output),
+             # SIGBUS on OX X (PPC and x86 only; amd64 gives SEGV)
+             if_platform('i386-apple-darwin', exit_code(138)),
+             if_platform('powerpc-apple-darwin', exit_code(138)),
+             if_platform('i386-unknown-mingw32', exit_code(1))]),
+     compile_and_run, [''])
+test('divbyzero',
+     composes([
+             # SIGFPE on Linux
+             exit_code(136),
+             # Apparently the output can be different on different
+             # Linux setups, so just ignore it. As long as we get
+             # the right exit code we're OK.
+             if_os('linux', ignore_output),
+             if_platform('i386-unknown-mingw32', exit_code(1))]),
+     compile_and_run, [''])
+
+test('outofmem', normal, run_command, ['$MAKE -s --no-print-directory outofmem'])
+test('outofmem2', extra_run_opts('+RTS -M5m -RTS'),
+                  run_command, ['$MAKE -s --no-print-directory outofmem2'])
+
+test('2047', compose(ignore_output, extra_run_opts('+RTS -c -RTS')),
+             compile_and_run, ['-package containers'])
+
+# Blackhole-detection test.
+# Skip GHCi due to #2786
+test('2783', [ omit_ways(['ghci']), exit_code(1) ], compile_and_run, [''])
+
+# Test the work-stealing deque implementation.  We run this test in
+# both threaded1 (-threaded -debug) and threaded2 (-threaded) ways.
+test('testwsdeque', [unless_in_tree_compiler(skip),
+                    c_src, only_ways(['threaded1', 'threaded2'])],
+                    compile_and_run, ['-I../../../rts'])
+
+test('3236', [c_src, only_ways(['normal','threaded1']), exit_code(1)], compile_and_run, [''])
+
+test('stack001', extra_run_opts('+RTS -K32m -RTS'), compile_and_run, [''])
+test('stack002', extra_run_opts('+RTS -K32m -k4m -RTS'), compile_and_run, [''])
+
+# run this test with very small stack chunks to exercise the stack
+# overflow/underflow machinery.
+test('stack003', [ omit_ways('ghci'), # uses unboxed tuples
+                   extra_run_opts('500000 +RTS -kc1k -kb100 -K96m -RTS') ],
+                 compile_and_run, [''])
+
+test('atomicinc', [ c_src, only_ways(['normal']) ], compile_and_run, [''])
+
+test('3424', # it's slow:
+             [ skip_if_fast, only_ways(['normal','threaded1','ghci']) ],
+             compile_and_run, [''])
+
+# Test for out-of-range heap size
+test('rtsflags001', [ only_ways(['normal']), exit_code(1), extra_run_opts('+RTS -H0m -RTS') ], compile_and_run, [''])
+
+# Test to see if linker scripts link properly to real ELF files
+test('T2615',
+     [ if_platform('i386-unknown-mingw32',skip),
+       # OS X doesn't seem to support linker scripts
+       if_os('darwin', skip),
+       # Solaris' linker does not support GNUish linker scripts
+       if_os('solaris2', skip),
+       cmd_prefix('$MAKE T2615-prep && ' +
+                  # Add current directory to dlopen search path
+                  'LD_LIBRARY_PATH=$LD_LIBRARY_PATH:. '),
+       extra_clean(['libfoo_T2615.so'])],
+     compile_and_run,
+     ['-package ghc'])
+
+# omit dyn and profiling ways, because we don't build dyn_l or p_l
+# variants of the RTS by default
+test('traceEvent', [ omit_ways(['dyn'] + prof_ways), 
+                     extra_run_opts('+RTS -ls -RTS') ], 
+                   compile_and_run, ['-eventlog'])
+
+test('T4059', normal, run_command, ['$MAKE -s --no-print-directory T4059'])
+
+# Test for #4274
+test('exec_signals', [
+     if_platform('i386-unknown-mingw32',skip),
+     cmd_prefix('$MAKE exec_signals-prep && ./exec_signals_prepare'),
+     extra_clean(['exec_signals_child', 'exec_signals_prepare'])
+    ], compile_and_run, [''])
+
+test('return_mem_to_os', normal, compile_and_run, [''])
+
+test('4850', extra_clean(['4850.o','4850.hi','4850']),
+             run_command, ['$MAKE -s --no-print-directory 4850'])
+
+def config_5250(opts):
+    if not (config.arch in ['i386','x86_64']):
+        opts.skip = 1;
+
+test('5250', [ config_5250,
+               extra_clean(['spalign.o']),
+               omit_ways(['ghci']) ],
+             compile_and_run, ['spalign.c'])
+
diff --git a/testsuite/tests/ghc-regress/rts/atomicinc.c b/testsuite/tests/rts/atomicinc.c
index 8f1c8bf3ed..8f1c8bf3ed 100644
--- a/testsuite/tests/ghc-regress/rts/atomicinc.c
+++ b/testsuite/tests/rts/atomicinc.c
diff --git a/testsuite/tests/ghc-regress/rts/bug1010.hs b/testsuite/tests/rts/bug1010.hs
index 50329b738b..50329b738b 100644
--- a/testsuite/tests/ghc-regress/rts/bug1010.hs
+++ b/testsuite/tests/rts/bug1010.hs
diff --git a/testsuite/tests/ghc-regress/rts/bug1010.stdout b/testsuite/tests/rts/bug1010.stdout
index 8a0934b514..8a0934b514 100644
--- a/testsuite/tests/ghc-regress/rts/bug1010.stdout
+++ b/testsuite/tests/rts/bug1010.stdout
diff --git a/testsuite/tests/ghc-regress/rts/derefnull.hs b/testsuite/tests/rts/derefnull.hs
index 474ff62c4c..474ff62c4c 100644
--- a/testsuite/tests/ghc-regress/rts/derefnull.hs
+++ b/testsuite/tests/rts/derefnull.hs
diff --git a/testsuite/tests/ghc-regress/rts/derefnull.stderr-x86_64-unknown-openbsd b/testsuite/tests/rts/derefnull.stderr-x86_64-unknown-openbsd
index d1ecae163f..d1ecae163f 100644
--- a/testsuite/tests/ghc-regress/rts/derefnull.stderr-x86_64-unknown-openbsd
+++ b/testsuite/tests/rts/derefnull.stderr-x86_64-unknown-openbsd
diff --git a/testsuite/tests/ghc-regress/rts/derefnull.stdout-i386-unknown-mingw32 b/testsuite/tests/rts/derefnull.stdout-i386-unknown-mingw32
index 5f2034dd57..5f2034dd57 100644
--- a/testsuite/tests/ghc-regress/rts/derefnull.stdout-i386-unknown-mingw32
+++ b/testsuite/tests/rts/derefnull.stdout-i386-unknown-mingw32
diff --git a/testsuite/tests/ghc-regress/rts/divbyzero.hs b/testsuite/tests/rts/divbyzero.hs
index 0cf82bbae5..0cf82bbae5 100644
--- a/testsuite/tests/ghc-regress/rts/divbyzero.hs
+++ b/testsuite/tests/rts/divbyzero.hs
diff --git a/testsuite/tests/ghc-regress/rts/divbyzero.stderr-x86_64-unknown-openbsd b/testsuite/tests/rts/divbyzero.stderr-x86_64-unknown-openbsd
index da6f639f9d..da6f639f9d 100644
--- a/testsuite/tests/ghc-regress/rts/divbyzero.stderr-x86_64-unknown-openbsd
+++ b/testsuite/tests/rts/divbyzero.stderr-x86_64-unknown-openbsd
diff --git a/testsuite/tests/ghc-regress/rts/divbyzero.stdout-i386-unknown-mingw32 b/testsuite/tests/rts/divbyzero.stdout-i386-unknown-mingw32
index 466709b368..466709b368 100644
--- a/testsuite/tests/ghc-regress/rts/divbyzero.stdout-i386-unknown-mingw32
+++ b/testsuite/tests/rts/divbyzero.stdout-i386-unknown-mingw32
diff --git a/testsuite/tests/ghc-regress/rts/exec_signals.hs b/testsuite/tests/rts/exec_signals.hs
index a9433d206a..a9433d206a 100644
--- a/testsuite/tests/ghc-regress/rts/exec_signals.hs
+++ b/testsuite/tests/rts/exec_signals.hs
diff --git a/testsuite/tests/ghc-regress/rts/exec_signals_child.c b/testsuite/tests/rts/exec_signals_child.c
index 4b84008928..4b84008928 100644
--- a/testsuite/tests/ghc-regress/rts/exec_signals_child.c
+++ b/testsuite/tests/rts/exec_signals_child.c
diff --git a/testsuite/tests/ghc-regress/rts/exec_signals_prepare.c b/testsuite/tests/rts/exec_signals_prepare.c
index 26f30acc57..26f30acc57 100644
--- a/testsuite/tests/ghc-regress/rts/exec_signals_prepare.c
+++ b/testsuite/tests/rts/exec_signals_prepare.c
diff --git a/testsuite/tests/ghc-regress/rts/libfoo_T2615.c b/testsuite/tests/rts/libfoo_T2615.c
index a83cb18e7a..a83cb18e7a 100644
--- a/testsuite/tests/ghc-regress/rts/libfoo_T2615.c
+++ b/testsuite/tests/rts/libfoo_T2615.c
diff --git a/testsuite/tests/ghc-regress/rts/libfoo_script_T2615.so b/testsuite/tests/rts/libfoo_script_T2615.so
index d744ae9604..d744ae9604 100644
--- a/testsuite/tests/ghc-regress/rts/libfoo_script_T2615.so
+++ b/testsuite/tests/rts/libfoo_script_T2615.so
diff --git a/testsuite/tests/ghc-regress/rts/outofmem.hs b/testsuite/tests/rts/outofmem.hs
index 9392ab1da0..9392ab1da0 100644
--- a/testsuite/tests/ghc-regress/rts/outofmem.hs
+++ b/testsuite/tests/rts/outofmem.hs
diff --git a/testsuite/tests/ghc-regress/rts/outofmem.stderr b/testsuite/tests/rts/outofmem.stderr
index 81856a7544..81856a7544 100644
--- a/testsuite/tests/ghc-regress/rts/outofmem.stderr
+++ b/testsuite/tests/rts/outofmem.stderr
diff --git a/testsuite/tests/ghc-regress/rts/outofmem.stderr-i386-apple-darwin b/testsuite/tests/rts/outofmem.stderr-i386-apple-darwin
index 929879a922..929879a922 100644
--- a/testsuite/tests/ghc-regress/rts/outofmem.stderr-i386-apple-darwin
+++ b/testsuite/tests/rts/outofmem.stderr-i386-apple-darwin
diff --git a/testsuite/tests/ghc-regress/rts/outofmem.stderr-i386-unknown-mingw32 b/testsuite/tests/rts/outofmem.stderr-i386-unknown-mingw32
index 81856a7544..81856a7544 100644
--- a/testsuite/tests/ghc-regress/rts/outofmem.stderr-i386-unknown-mingw32
+++ b/testsuite/tests/rts/outofmem.stderr-i386-unknown-mingw32
diff --git a/testsuite/tests/ghc-regress/rts/outofmem.stderr-powerpc-apple-darwin b/testsuite/tests/rts/outofmem.stderr-powerpc-apple-darwin
index 929879a922..929879a922 100644
--- a/testsuite/tests/ghc-regress/rts/outofmem.stderr-powerpc-apple-darwin
+++ b/testsuite/tests/rts/outofmem.stderr-powerpc-apple-darwin
diff --git a/testsuite/tests/ghc-regress/rts/outofmem.stderr-ws-32 b/testsuite/tests/rts/outofmem.stderr-ws-32
index 6147d23e91..6147d23e91 100644
--- a/testsuite/tests/ghc-regress/rts/outofmem.stderr-ws-32
+++ b/testsuite/tests/rts/outofmem.stderr-ws-32
diff --git a/testsuite/tests/ghc-regress/rts/outofmem.stderr-ws-64 b/testsuite/tests/rts/outofmem.stderr-ws-64
index 42a4696fcf..42a4696fcf 100644
--- a/testsuite/tests/ghc-regress/rts/outofmem.stderr-ws-64
+++ b/testsuite/tests/rts/outofmem.stderr-ws-64
diff --git a/testsuite/tests/ghc-regress/rts/outofmem.stdout b/testsuite/tests/rts/outofmem.stdout
index 63a3a6988c..63a3a6988c 100644
--- a/testsuite/tests/ghc-regress/rts/outofmem.stdout
+++ b/testsuite/tests/rts/outofmem.stdout
diff --git a/testsuite/tests/ghc-regress/rts/outofmem2.hs b/testsuite/tests/rts/outofmem2.hs
index b206d7147e..b206d7147e 100644
--- a/testsuite/tests/ghc-regress/rts/outofmem2.hs
+++ b/testsuite/tests/rts/outofmem2.hs
diff --git a/testsuite/tests/ghc-regress/rts/outofmem2.stderr b/testsuite/tests/rts/outofmem2.stderr
index 5fa8ba00e7..5fa8ba00e7 100644
--- a/testsuite/tests/ghc-regress/rts/outofmem2.stderr
+++ b/testsuite/tests/rts/outofmem2.stderr
diff --git a/testsuite/tests/ghc-regress/rts/outofmem2.stdout b/testsuite/tests/rts/outofmem2.stdout
index 1acdde769d..1acdde769d 100644
--- a/testsuite/tests/ghc-regress/rts/outofmem2.stdout
+++ b/testsuite/tests/rts/outofmem2.stdout
diff --git a/testsuite/tests/ghc-regress/rts/return_mem_to_os.hs b/testsuite/tests/rts/return_mem_to_os.hs
index 242ccc3bb0..242ccc3bb0 100644
--- a/testsuite/tests/ghc-regress/rts/return_mem_to_os.hs
+++ b/testsuite/tests/rts/return_mem_to_os.hs
diff --git a/testsuite/tests/ghc-regress/rts/return_mem_to_os.stdout b/testsuite/tests/rts/return_mem_to_os.stdout
index 01ddffa89e..01ddffa89e 100644
--- a/testsuite/tests/ghc-regress/rts/return_mem_to_os.stdout
+++ b/testsuite/tests/rts/return_mem_to_os.stdout
diff --git a/testsuite/tests/ghc-regress/rts/rtsflags001.hs b/testsuite/tests/rts/rtsflags001.hs
index b3549c2fe3..b3549c2fe3 100644
--- a/testsuite/tests/ghc-regress/rts/rtsflags001.hs
+++ b/testsuite/tests/rts/rtsflags001.hs
diff --git a/testsuite/tests/ghc-regress/rts/rtsflags001.stderr-ws-32 b/testsuite/tests/rts/rtsflags001.stderr-ws-32
index 2bdd8ab066..2bdd8ab066 100644
--- a/testsuite/tests/ghc-regress/rts/rtsflags001.stderr-ws-32
+++ b/testsuite/tests/rts/rtsflags001.stderr-ws-32
diff --git a/testsuite/tests/ghc-regress/rts/rtsflags001.stderr-ws-64 b/testsuite/tests/rts/rtsflags001.stderr-ws-64
index f50a3ee22b..f50a3ee22b 100644
--- a/testsuite/tests/ghc-regress/rts/rtsflags001.stderr-ws-64
+++ b/testsuite/tests/rts/rtsflags001.stderr-ws-64
diff --git a/testsuite/tests/ghc-regress/rts/spalign.c b/testsuite/tests/rts/spalign.c
index 0b776e17cc..0b776e17cc 100644
--- a/testsuite/tests/ghc-regress/rts/spalign.c
+++ b/testsuite/tests/rts/spalign.c
diff --git a/testsuite/tests/ghc-regress/rts/stack001.hs b/testsuite/tests/rts/stack001.hs
index 4676e046ac..4676e046ac 100644
--- a/testsuite/tests/ghc-regress/rts/stack001.hs
+++ b/testsuite/tests/rts/stack001.hs
diff --git a/testsuite/tests/ghc-regress/rts/stack002.hs b/testsuite/tests/rts/stack002.hs
index e6c8ee8d69..e6c8ee8d69 100644
--- a/testsuite/tests/ghc-regress/rts/stack002.hs
+++ b/testsuite/tests/rts/stack002.hs
diff --git a/testsuite/tests/ghc-regress/rts/stack003.hs b/testsuite/tests/rts/stack003.hs
index 4b6b29fa8d..4b6b29fa8d 100644
--- a/testsuite/tests/ghc-regress/rts/stack003.hs
+++ b/testsuite/tests/rts/stack003.hs
diff --git a/testsuite/tests/ghc-regress/rts/stack003.stdout b/testsuite/tests/rts/stack003.stdout
index 1567408305..1567408305 100644
--- a/testsuite/tests/ghc-regress/rts/stack003.stdout
+++ b/testsuite/tests/rts/stack003.stdout
diff --git a/testsuite/tests/ghc-regress/rts/testblockalloc.c b/testsuite/tests/rts/testblockalloc.c
index 5ccc14bf59..5ccc14bf59 100644
--- a/testsuite/tests/ghc-regress/rts/testblockalloc.c
+++ b/testsuite/tests/rts/testblockalloc.c
diff --git a/testsuite/tests/ghc-regress/rts/testheapalloced.c b/testsuite/tests/rts/testheapalloced.c
index cc4dad40d4..cc4dad40d4 100644
--- a/testsuite/tests/ghc-regress/rts/testheapalloced.c
+++ b/testsuite/tests/rts/testheapalloced.c
diff --git a/testsuite/tests/ghc-regress/rts/testwsdeque.c b/testsuite/tests/rts/testwsdeque.c
index 51aeec1ca4..51aeec1ca4 100644
--- a/testsuite/tests/ghc-regress/rts/testwsdeque.c
+++ b/testsuite/tests/rts/testwsdeque.c
diff --git a/testsuite/tests/ghc-regress/rts/traceEvent.hs b/testsuite/tests/rts/traceEvent.hs
index ef641816d4..ef641816d4 100644
--- a/testsuite/tests/ghc-regress/rts/traceEvent.hs
+++ b/testsuite/tests/rts/traceEvent.hs
diff --git a/testsuite/tests/safeHaskell/Makefile b/testsuite/tests/safeHaskell/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/safeHaskell/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check01.hs b/testsuite/tests/safeHaskell/check/Check01.hs
index bd018acb50..bd018acb50 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check01.hs
+++ b/testsuite/tests/safeHaskell/check/Check01.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check01.stderr b/testsuite/tests/safeHaskell/check/Check01.stderr
index 70722f32b8..70722f32b8 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check01.stderr
+++ b/testsuite/tests/safeHaskell/check/Check01.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check01_A.hs b/testsuite/tests/safeHaskell/check/Check01_A.hs
index 8b318a5124..8b318a5124 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check01_A.hs
+++ b/testsuite/tests/safeHaskell/check/Check01_A.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check01_B.hs b/testsuite/tests/safeHaskell/check/Check01_B.hs
index b584e51b97..b584e51b97 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check01_B.hs
+++ b/testsuite/tests/safeHaskell/check/Check01_B.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check02.hs b/testsuite/tests/safeHaskell/check/Check02.hs
index 3f15cb4ba9..3f15cb4ba9 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check02.hs
+++ b/testsuite/tests/safeHaskell/check/Check02.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check02.stderr b/testsuite/tests/safeHaskell/check/Check02.stderr
index 708541b8ed..708541b8ed 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check02.stderr
+++ b/testsuite/tests/safeHaskell/check/Check02.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check02_A.hs b/testsuite/tests/safeHaskell/check/Check02_A.hs
index d43dab727a..d43dab727a 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check02_A.hs
+++ b/testsuite/tests/safeHaskell/check/Check02_A.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check02_B.hs b/testsuite/tests/safeHaskell/check/Check02_B.hs
index 10d45ccfbb..10d45ccfbb 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check02_B.hs
+++ b/testsuite/tests/safeHaskell/check/Check02_B.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check03.hs b/testsuite/tests/safeHaskell/check/Check03.hs
index e06b4f83fb..e06b4f83fb 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check03.hs
+++ b/testsuite/tests/safeHaskell/check/Check03.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check03.stderr b/testsuite/tests/safeHaskell/check/Check03.stderr
index 343803f6ff..343803f6ff 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check03.stderr
+++ b/testsuite/tests/safeHaskell/check/Check03.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check03_A.hs b/testsuite/tests/safeHaskell/check/Check03_A.hs
index e7b8d75d03..e7b8d75d03 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check03_A.hs
+++ b/testsuite/tests/safeHaskell/check/Check03_A.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check03_B.hs b/testsuite/tests/safeHaskell/check/Check03_B.hs
index bce45af4e5..bce45af4e5 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check03_B.hs
+++ b/testsuite/tests/safeHaskell/check/Check03_B.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check04.hs b/testsuite/tests/safeHaskell/check/Check04.hs
index 9891de36ee..9891de36ee 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check04.hs
+++ b/testsuite/tests/safeHaskell/check/Check04.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check04.stderr b/testsuite/tests/safeHaskell/check/Check04.stderr
index ec3bdb1585..ec3bdb1585 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check04.stderr
+++ b/testsuite/tests/safeHaskell/check/Check04.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check04_1.hs b/testsuite/tests/safeHaskell/check/Check04_1.hs
index e823c889d6..e823c889d6 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check04_1.hs
+++ b/testsuite/tests/safeHaskell/check/Check04_1.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check04_A.hs b/testsuite/tests/safeHaskell/check/Check04_A.hs
index 3f6b5f00e9..3f6b5f00e9 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check04_A.hs
+++ b/testsuite/tests/safeHaskell/check/Check04_A.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/Check04_B.hs b/testsuite/tests/safeHaskell/check/Check04_B.hs
index 5280c51fad..5280c51fad 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/Check04_B.hs
+++ b/testsuite/tests/safeHaskell/check/Check04_B.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/CheckA.hs b/testsuite/tests/safeHaskell/check/CheckA.hs
index 80f9ae4ee0..80f9ae4ee0 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/CheckA.hs
+++ b/testsuite/tests/safeHaskell/check/CheckA.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/CheckB.hs b/testsuite/tests/safeHaskell/check/CheckB.hs
index 7e649a1598..7e649a1598 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/CheckB.hs
+++ b/testsuite/tests/safeHaskell/check/CheckB.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/CheckB.stderr b/testsuite/tests/safeHaskell/check/CheckB.stderr
index f8321b3704..f8321b3704 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/CheckB.stderr
+++ b/testsuite/tests/safeHaskell/check/CheckB.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/CheckB_Aux.hs b/testsuite/tests/safeHaskell/check/CheckB_Aux.hs
index c04d5102d7..c04d5102d7 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/CheckB_Aux.hs
+++ b/testsuite/tests/safeHaskell/check/CheckB_Aux.hs
diff --git a/testsuite/tests/safeHaskell/check/Makefile b/testsuite/tests/safeHaskell/check/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/safeHaskell/check/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/all.T b/testsuite/tests/safeHaskell/check/all.T
index 2e769ba1aa..2e769ba1aa 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/all.T
+++ b/testsuite/tests/safeHaskell/check/all.T
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/ImpSafe01.hs b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.hs
index deb0d57f8d..deb0d57f8d 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/ImpSafe01.hs
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/ImpSafe01.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr
index 9ca2bbe817..9ca2bbe817 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/ImpSafe01.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe01.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/ImpSafeOnly01.hs b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly01.hs
index 2143d3139b..2143d3139b 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/ImpSafeOnly01.hs
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly01.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/ImpSafeOnly02.hs b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly02.hs
index 27281b9cce..27281b9cce 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/ImpSafeOnly02.hs
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly02.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/ImpSafeOnly03.hs b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly03.hs
index d09e39937d..d09e39937d 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/ImpSafeOnly03.hs
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly03.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/ImpSafeOnly03.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly03.stderr
index bc6eecffee..bc6eecffee 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/ImpSafeOnly03.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly03.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/M_SafePkg.hs b/testsuite/tests/safeHaskell/check/pkg01/M_SafePkg.hs
index 14c21132e7..14c21132e7 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/M_SafePkg.hs
+++ b/testsuite/tests/safeHaskell/check/pkg01/M_SafePkg.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/M_SafePkg2.hs b/testsuite/tests/safeHaskell/check/pkg01/M_SafePkg2.hs
index 74c263f61d..74c263f61d 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/M_SafePkg2.hs
+++ b/testsuite/tests/safeHaskell/check/pkg01/M_SafePkg2.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/M_SafePkg3.hs b/testsuite/tests/safeHaskell/check/pkg01/M_SafePkg3.hs
index 67714c4731..67714c4731 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/M_SafePkg3.hs
+++ b/testsuite/tests/safeHaskell/check/pkg01/M_SafePkg3.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/M_SafePkg4.hs b/testsuite/tests/safeHaskell/check/pkg01/M_SafePkg4.hs
index 52367b113b..52367b113b 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/M_SafePkg4.hs
+++ b/testsuite/tests/safeHaskell/check/pkg01/M_SafePkg4.hs
diff --git a/testsuite/tests/safeHaskell/check/pkg01/Makefile b/testsuite/tests/safeHaskell/check/pkg01/Makefile
new file mode 100644
index 0000000000..7cc80494a1
--- /dev/null
+++ b/testsuite/tests/safeHaskell/check/pkg01/Makefile
@@ -0,0 +1,46 @@
+TOP=../../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+clean:
+	rm -rf setup a.out
+	rm -rf dist
+	find . -name "*.o" | xargs rm -f
+	find . -name "*.hi" | xargs rm -f
+	rm -rf local.db
+	rm -rf install
+
+# We use the global package database as there's no easy way to tell
+# ghc-pkg (via Cabal) to use one in ., and the global one at least
+# won't affect the installed GHC and is more likely to work
+
+PREFIX := $(abspath install)
+$(eval $(call canonicalise,PREFIX))
+
+PKGCONF = local.db
+LGHC_PKG = '$(GHC_PKG)' --no-user-package-conf -f '$(PKGCONF)'
+
+safePkg01:
+	'$(MAKE)' clean
+	'$(TEST_HC)' --make -o setup Setup.hs -v0
+
+	'$(GHC_PKG)' init local.db
+	./setup configure -v0 --prefix='$(PREFIX)' --with-compiler='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS) -trust base' --with-hc-pkg='$(GHC_PKG)' --package-db='$(PKGCONF)' $(PROF)
+	./setup build -v0
+	./setup copy -v0
+	./setup register --inplace -v0
+	$(LGHC_PKG) list
+	$(LGHC_PKG) field safePkg01-1.0 trusted
+	echo
+	echo 'M_SafePkg'
+	'$(TEST_HC)' --show-iface dist/build/M_SafePkg.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+	echo
+	echo 'M_SafePkg2'
+	'$(TEST_HC)' --show-iface dist/build/M_SafePkg2.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+	echo
+	echo 'M_SafePkg3'
+	'$(TEST_HC)' --show-iface dist/build/M_SafePkg3.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+	echo
+	echo 'M_SafePkg4'
+	'$(TEST_HC)' --show-iface dist/build/M_SafePkg4.hi | grep -E '^package dependencies:|^trusted:|^require own pkg trusted:'
+
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/Setup.hs b/testsuite/tests/safeHaskell/check/pkg01/Setup.hs
index 6479cb1c16..6479cb1c16 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/Setup.hs
+++ b/testsuite/tests/safeHaskell/check/pkg01/Setup.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/all.T b/testsuite/tests/safeHaskell/check/pkg01/all.T
index bdbdc4c56d..bdbdc4c56d 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/all.T
+++ b/testsuite/tests/safeHaskell/check/pkg01/all.T
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/p.cabal b/testsuite/tests/safeHaskell/check/pkg01/p.cabal
index f6d84b5f8a..f6d84b5f8a 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/p.cabal
+++ b/testsuite/tests/safeHaskell/check/pkg01/p.cabal
diff --git a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
index c1a5642c17..c1a5642c17 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/check/pkg01/safePkg01.stdout
+++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/Flags01.hs b/testsuite/tests/safeHaskell/flags/Flags01.hs
index 0e1d120a81..0e1d120a81 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/Flags01.hs
+++ b/testsuite/tests/safeHaskell/flags/Flags01.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/Flags01_A.cpp b/testsuite/tests/safeHaskell/flags/Flags01_A.cpp
index 9170664236..9170664236 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/Flags01_A.cpp
+++ b/testsuite/tests/safeHaskell/flags/Flags01_A.cpp
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/Flags02.hs b/testsuite/tests/safeHaskell/flags/Flags02.hs
index 525064dedf..525064dedf 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/Flags02.hs
+++ b/testsuite/tests/safeHaskell/flags/Flags02.hs
diff --git a/testsuite/tests/safeHaskell/flags/Makefile b/testsuite/tests/safeHaskell/flags/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/safeHaskell/flags/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags01.hs b/testsuite/tests/safeHaskell/flags/SafeFlags01.hs
index f5790eba64..f5790eba64 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags01.hs
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags01.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags02.hs b/testsuite/tests/safeHaskell/flags/SafeFlags02.hs
index 50a1101bd4..50a1101bd4 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags02.hs
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags02.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags03.hs b/testsuite/tests/safeHaskell/flags/SafeFlags03.hs
index ea83a06210..ea83a06210 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags03.hs
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags03.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags04.hs b/testsuite/tests/safeHaskell/flags/SafeFlags04.hs
index b966eba1a0..b966eba1a0 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags04.hs
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags04.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags04.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags04.stderr
index 2a550f25a1..2a550f25a1 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags04.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags04.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags05.hs b/testsuite/tests/safeHaskell/flags/SafeFlags05.hs
index 0f316d475b..0f316d475b 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags05.hs
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags05.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags06.hs b/testsuite/tests/safeHaskell/flags/SafeFlags06.hs
index 81fd3257ae..81fd3257ae 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags06.hs
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags06.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags07.hs b/testsuite/tests/safeHaskell/flags/SafeFlags07.hs
index 0339fe362f..0339fe362f 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags07.hs
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags07.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags07.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags07.stderr
index 3c3317f20c..3c3317f20c 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags07.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags07.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags08.hs b/testsuite/tests/safeHaskell/flags/SafeFlags08.hs
index 445e591b1e..445e591b1e 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags08.hs
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags08.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags08.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags08.stderr
index e72e6e459f..e72e6e459f 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags08.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags08.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags09.hs b/testsuite/tests/safeHaskell/flags/SafeFlags09.hs
index d03b0dacbf..d03b0dacbf 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags09.hs
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags09.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags09.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags09.stderr
index 2bc5aed21c..2bc5aed21c 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags09.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags09.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags10.hs b/testsuite/tests/safeHaskell/flags/SafeFlags10.hs
index 43ba5c81cd..43ba5c81cd 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags10.hs
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags10.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags10.stderr b/testsuite/tests/safeHaskell/flags/SafeFlags10.stderr
index 86346b77fe..86346b77fe 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags10.stderr
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags10.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags11.hs b/testsuite/tests/safeHaskell/flags/SafeFlags11.hs
index e90b105dde..e90b105dde 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/SafeFlags11.hs
+++ b/testsuite/tests/safeHaskell/flags/SafeFlags11.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/flags/all.T b/testsuite/tests/safeHaskell/flags/all.T
index 7848b8328d..7848b8328d 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/flags/all.T
+++ b/testsuite/tests/safeHaskell/flags/all.T
diff --git a/testsuite/tests/safeHaskell/safeLanguage/Makefile b/testsuite/tests/safeHaskell/safeLanguage/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/safeHaskell/safeLanguage/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang01.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang01.hs
index 5920c03161..5920c03161 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang01.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang01.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang01.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang01.stderr
index 18320eb727..18320eb727 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang01.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang01.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang02.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang02.hs
index 9bf1c82a09..9bf1c82a09 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang02.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang02.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang02.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang02.stderr
index 6e3546968b..6e3546968b 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang02.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang02.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang03.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang03.hs
index 4f3bce7e0a..4f3bce7e0a 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang03.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang03.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang03.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang03.stderr
index fdcc5997d5..fdcc5997d5 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang03.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang03.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang04.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang04.hs
index a9ac3619f3..a9ac3619f3 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang04.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang04.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang04.stdout b/testsuite/tests/safeHaskell/safeLanguage/SafeLang04.stdout
index b80e6135bd..b80e6135bd 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang04.stdout
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang04.stdout
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang05.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang05.hs
index 1dd9016152..1dd9016152 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang05.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang05.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang05.stdout b/testsuite/tests/safeHaskell/safeLanguage/SafeLang05.stdout
index 2334866860..2334866860 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang05.stdout
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang05.stdout
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang06.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang06.hs
index 685846f150..685846f150 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang06.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang06.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang06.stdout b/testsuite/tests/safeHaskell/safeLanguage/SafeLang06.stdout
index ed005737b7..ed005737b7 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang06.stdout
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang06.stdout
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang06_A.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang06_A.hs
index d092ae7a1a..d092ae7a1a 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang06_A.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang06_A.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.hs
index 006cd0ea08..006cd0ea08 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.stderr
index 1218b29a6d..1218b29a6d 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang07.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07_A.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang07_A.hs
index 6ef49d5946..6ef49d5946 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang07_A.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang07_A.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang08.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang08.hs
index 7249c8d0ec..7249c8d0ec 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang08.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang08.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang08.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang08.stderr
index fc7c7fa00d..fc7c7fa00d 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang08.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang08.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang08_A.c b/testsuite/tests/safeHaskell/safeLanguage/SafeLang08_A.c
index d77ebad560..d77ebad560 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang08_A.c
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang08_A.c
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang09.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang09.hs
index 4e20f177bf..4e20f177bf 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang09.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang09.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang09.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang09.stderr
index 27d951e959..27d951e959 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang09.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang09.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang09_A.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang09_A.hs
index 129c2c4b56..129c2c4b56 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang09_A.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang09_A.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang09_B.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang09_B.hs
index 76e0fe5a1c..76e0fe5a1c 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang09_B.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang09_B.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang10.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.hs
index ff5c168cff..ff5c168cff 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang10.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang10.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr
index d9a671b08d..d9a671b08d 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang10.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang10.stdout b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stdout
index 32f4c5bbce..32f4c5bbce 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang10.stdout
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10.stdout
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang10_A.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10_A.hs
index 7be17b5ec0..7be17b5ec0 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang10_A.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10_A.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang10_B.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10_B.hs
index 5b9954c12e..5b9954c12e 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang10_B.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang10_B.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang11.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang11.hs
index 11b32ec57c..11b32ec57c 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang11.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang11.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang11.stdout b/testsuite/tests/safeHaskell/safeLanguage/SafeLang11.stdout
index 34f1bf217a..34f1bf217a 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang11.stdout
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang11.stdout
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang11_A.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang11_A.hs
index 7eb818183c..7eb818183c 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang11_A.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang11_A.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang11_B.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang11_B.hs
index 8d81be6abc..8d81be6abc 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang11_B.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang11_B.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang12.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.hs
index 5817e54095..5817e54095 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang12.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang12.stderr b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr
index 1466921b07..1466921b07 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang12.stderr
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang12_B.hs b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12_B.hs
index f6ce559448..f6ce559448 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/SafeLang12_B.hs
+++ b/testsuite/tests/safeHaskell/safeLanguage/SafeLang12_B.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/all.T b/testsuite/tests/safeHaskell/safeLanguage/all.T
index 7074c0f75c..7074c0f75c 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/safeLanguage/all.T
+++ b/testsuite/tests/safeHaskell/safeLanguage/all.T
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/BadImport01.hs b/testsuite/tests/safeHaskell/unsafeLibs/BadImport01.hs
index ae72dd6cd3..ae72dd6cd3 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/BadImport01.hs
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport01.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/BadImport01.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport01.stderr
index 983e043591..983e043591 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/BadImport01.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport01.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/BadImport02.hs b/testsuite/tests/safeHaskell/unsafeLibs/BadImport02.hs
index e9d5ca7577..e9d5ca7577 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/BadImport02.hs
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport02.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/BadImport02.stdout b/testsuite/tests/safeHaskell/unsafeLibs/BadImport02.stdout
index c0f565d07c..c0f565d07c 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/BadImport02.stdout
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport02.stdout
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/BadImport02_A.hs b/testsuite/tests/safeHaskell/unsafeLibs/BadImport02_A.hs
index 2ca43343eb..2ca43343eb 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/BadImport02_A.hs
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport02_A.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/BadImport03.hs b/testsuite/tests/safeHaskell/unsafeLibs/BadImport03.hs
index 835009a276..835009a276 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/BadImport03.hs
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport03.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/BadImport03.stderr b/testsuite/tests/safeHaskell/unsafeLibs/BadImport03.stderr
index b1fcc3ca09..b1fcc3ca09 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/BadImport03.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/BadImport03.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep01.hs b/testsuite/tests/safeHaskell/unsafeLibs/Dep01.hs
index 5ee1cd0288..5ee1cd0288 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep01.hs
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep01.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep01.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep01.stderr
index a21b4861dd..a21b4861dd 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep01.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep01.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep02.hs b/testsuite/tests/safeHaskell/unsafeLibs/Dep02.hs
index f9dbb26064..f9dbb26064 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep02.hs
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep02.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep02.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep02.stderr
index 8ae7621251..8ae7621251 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep02.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep02.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep03.hs b/testsuite/tests/safeHaskell/unsafeLibs/Dep03.hs
index b5f39affc7..b5f39affc7 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep03.hs
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep03.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep03.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep03.stderr
index 51c4d0a850..51c4d0a850 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep03.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep03.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep04.hs b/testsuite/tests/safeHaskell/unsafeLibs/Dep04.hs
index 5ff23ea0ad..5ff23ea0ad 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep04.hs
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep04.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep04.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep04.stderr
index ef81bf4212..ef81bf4212 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep04.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep04.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep05.hs b/testsuite/tests/safeHaskell/unsafeLibs/Dep05.hs
index da25c1a52a..da25c1a52a 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep05.hs
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep05.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep05.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep05.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep05.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep05.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep06.hs b/testsuite/tests/safeHaskell/unsafeLibs/Dep06.hs
index 0a5811d02b..0a5811d02b 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep06.hs
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep06.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep06.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep06.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep06.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep06.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep07.hs b/testsuite/tests/safeHaskell/unsafeLibs/Dep07.hs
index 6f0df7af11..6f0df7af11 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep07.hs
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep07.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep07.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep07.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep07.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep07.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep08.hs b/testsuite/tests/safeHaskell/unsafeLibs/Dep08.hs
index a3fbc7be61..a3fbc7be61 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep08.hs
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep08.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep08.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep08.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep08.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep08.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep09.hs b/testsuite/tests/safeHaskell/unsafeLibs/Dep09.hs
index beeb7ffe95..beeb7ffe95 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep09.hs
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep09.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep09.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep09.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep09.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep09.stderr
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep10.hs b/testsuite/tests/safeHaskell/unsafeLibs/Dep10.hs
index 70d660ed1c..70d660ed1c 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep10.hs
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep10.hs
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep10.stderr b/testsuite/tests/safeHaskell/unsafeLibs/Dep10.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/Dep10.stderr
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Dep10.stderr
diff --git a/testsuite/tests/safeHaskell/unsafeLibs/Makefile b/testsuite/tests/safeHaskell/unsafeLibs/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/safeHaskell/unsafeLibs/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/all.T b/testsuite/tests/safeHaskell/unsafeLibs/all.T
index c985b65c3c..c985b65c3c 100644
--- a/testsuite/tests/ghc-regress/safeHaskell/unsafeLibs/all.T
+++ b/testsuite/tests/safeHaskell/unsafeLibs/all.T
diff --git a/testsuite/tests/simplCore/Makefile b/testsuite/tests/simplCore/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/simplCore/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/simplCore/prog001/Makefile b/testsuite/tests/simplCore/prog001/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/simplCore/prog001/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/simplCore/prog001/Simpl006Help.hs b/testsuite/tests/simplCore/prog001/Simpl006Help.hs
index 81baad3aee..81baad3aee 100644
--- a/testsuite/tests/ghc-regress/simplCore/prog001/Simpl006Help.hs
+++ b/testsuite/tests/simplCore/prog001/Simpl006Help.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/prog001/simpl006.hs b/testsuite/tests/simplCore/prog001/simpl006.hs
index ac38869638..ac38869638 100644
--- a/testsuite/tests/ghc-regress/simplCore/prog001/simpl006.hs
+++ b/testsuite/tests/simplCore/prog001/simpl006.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/prog001/test.T b/testsuite/tests/simplCore/prog001/test.T
index bfe2dcfaa3..bfe2dcfaa3 100644
--- a/testsuite/tests/ghc-regress/simplCore/prog001/test.T
+++ b/testsuite/tests/simplCore/prog001/test.T
diff --git a/testsuite/tests/simplCore/prog002/Makefile b/testsuite/tests/simplCore/prog002/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/simplCore/prog002/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/simplCore/prog002/Simpl009Help.hs b/testsuite/tests/simplCore/prog002/Simpl009Help.hs
index ac75943016..ac75943016 100644
--- a/testsuite/tests/ghc-regress/simplCore/prog002/Simpl009Help.hs
+++ b/testsuite/tests/simplCore/prog002/Simpl009Help.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/prog002/simpl009.hs b/testsuite/tests/simplCore/prog002/simpl009.hs
index bac2bafbdb..bac2bafbdb 100644
--- a/testsuite/tests/ghc-regress/simplCore/prog002/simpl009.hs
+++ b/testsuite/tests/simplCore/prog002/simpl009.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/prog002/test.T b/testsuite/tests/simplCore/prog002/test.T
index 1394874e16..1394874e16 100644
--- a/testsuite/tests/ghc-regress/simplCore/prog002/test.T
+++ b/testsuite/tests/simplCore/prog002/test.T
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/EvalTest.hs b/testsuite/tests/simplCore/should_compile/EvalTest.hs
index 8fce496ab3..8fce496ab3 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/EvalTest.hs
+++ b/testsuite/tests/simplCore/should_compile/EvalTest.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/EvalTest.stdout b/testsuite/tests/simplCore/should_compile/EvalTest.stdout
index 4c7cb1c0b0..4c7cb1c0b0 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/EvalTest.stdout
+++ b/testsuite/tests/simplCore/should_compile/EvalTest.stdout
diff --git a/testsuite/tests/simplCore/should_compile/Makefile b/testsuite/tests/simplCore/should_compile/Makefile
new file mode 100644
index 0000000000..99ebd0f1e7
--- /dev/null
+++ b/testsuite/tests/simplCore/should_compile/Makefile
@@ -0,0 +1,51 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+T3055:
+	$(RM) -f T3055.o T3055.hi T3055.simpl
+	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c T3055.hs -ddump-simpl > T3055.simpl
+	grep 'I# (-28)' T3055.simpl | sed 's/.*\(I# (-28)\).*/\1/'
+
+T3772:
+	$(RM) -f T3772*.hi T3772*.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T3772_A.hs 
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T3772.hs -dsuppress-uniques -ddump-simpl
+
+T4306:
+	$(RM) -f T4306.hi T4306.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4306.hs 
+	'$(TEST_HC)' $(TEST_HC_OPTS) --show-iface T4306.hi | grep 'wupd ::'
+
+T4201:
+	$(RM) -f T4201.hi T4201.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4201.hs 
+	'$(TEST_HC)' $(TEST_HC_OPTS) --show-iface T4201.hi | grep 'Sym'
+
+# This one looped as a result of bogus specialisation
+T4903:
+	$(RM) -f T4903.hi T4903a.hi T4903a.o T4903.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4903a.hs -dcore-lint
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4903.hs -dcore-lint
+
+T4918:
+	$(RM) -f T4918.hi T4918.o T4918a.hi T4918a.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4918a.hs 
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4918.hs 
+	'$(TEST_HC)' $(TEST_HC_OPTS) --show-iface T4918.hi | grep 'C#'
+
+EvalTest:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O EvalTest.hs -ddump-simpl -dsuppress-uniques | grep 'rght.*Dmd'
+
+T5168:
+	-('$(TEST_HC)' $(TEST_HC_OPTS) -c -O T5168.hs -ddump-simpl -dsuppress-uniques | grep 'patError')
+
+# When SpecConstr works there are no STUArrays at all
+# The "-(...)" ignores the (expected) non-zero exit code from grep
+# when there are (as expected) no matches
+T4945:
+	-('$(TEST_HC)' $(TEST_HC_OPTS) -c -O2 -fno-liberate-case T4945.hs -ddump-simpl -dsuppress-uniques | grep 'STUArray')
+
+# When this one works there are no 'lets' at all
+T4957:
+	-('$(TEST_HC)' $(TEST_HC_OPTS) -c -O T4957.hs -ddump-simpl -dsuppress-uniques | grep 'let')
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/Simpl020_A.hs b/testsuite/tests/simplCore/should_compile/Simpl020_A.hs
index d7ac756b65..d7ac756b65 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/Simpl020_A.hs
+++ b/testsuite/tests/simplCore/should_compile/Simpl020_A.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T1647.hs b/testsuite/tests/simplCore/should_compile/T1647.hs
index b785a405d0..b785a405d0 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T1647.hs
+++ b/testsuite/tests/simplCore/should_compile/T1647.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T2520.hs b/testsuite/tests/simplCore/should_compile/T2520.hs
index f0115474ea..f0115474ea 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T2520.hs
+++ b/testsuite/tests/simplCore/should_compile/T2520.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T3016.hs b/testsuite/tests/simplCore/should_compile/T3016.hs
index d05bd1008d..d05bd1008d 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T3016.hs
+++ b/testsuite/tests/simplCore/should_compile/T3016.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T3055.hs b/testsuite/tests/simplCore/should_compile/T3055.hs
index 50853874db..50853874db 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T3055.hs
+++ b/testsuite/tests/simplCore/should_compile/T3055.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T3055.stdout b/testsuite/tests/simplCore/should_compile/T3055.stdout
index 2fe7a367a0..2fe7a367a0 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T3055.stdout
+++ b/testsuite/tests/simplCore/should_compile/T3055.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T3118.hs b/testsuite/tests/simplCore/should_compile/T3118.hs
index 57b1ad0c92..57b1ad0c92 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T3118.hs
+++ b/testsuite/tests/simplCore/should_compile/T3118.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T3234.hs b/testsuite/tests/simplCore/should_compile/T3234.hs
index 7969bf60fa..7969bf60fa 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T3234.hs
+++ b/testsuite/tests/simplCore/should_compile/T3234.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T3234.stderr b/testsuite/tests/simplCore/should_compile/T3234.stderr
index 7aa09b7e4e..7aa09b7e4e 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T3234.stderr
+++ b/testsuite/tests/simplCore/should_compile/T3234.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T3717.hs b/testsuite/tests/simplCore/should_compile/T3717.hs
index eab0540f13..eab0540f13 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T3717.hs
+++ b/testsuite/tests/simplCore/should_compile/T3717.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T3717.stderr b/testsuite/tests/simplCore/should_compile/T3717.stderr
index 828f789bfd..828f789bfd 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T3717.stderr
+++ b/testsuite/tests/simplCore/should_compile/T3717.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T3717.stderr-ghc-7.0 b/testsuite/tests/simplCore/should_compile/T3717.stderr-ghc-7.0
index c7db559d6c..c7db559d6c 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T3717.stderr-ghc-7.0
+++ b/testsuite/tests/simplCore/should_compile/T3717.stderr-ghc-7.0
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T3772.hs b/testsuite/tests/simplCore/should_compile/T3772.hs
index 588337d241..588337d241 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T3772.hs
+++ b/testsuite/tests/simplCore/should_compile/T3772.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T3772.stdout b/testsuite/tests/simplCore/should_compile/T3772.stdout
index f3bccb5426..f3bccb5426 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T3772.stdout
+++ b/testsuite/tests/simplCore/should_compile/T3772.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T3772.stdout-ghc-7.0 b/testsuite/tests/simplCore/should_compile/T3772.stdout-ghc-7.0
index c226e09309..c226e09309 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T3772.stdout-ghc-7.0
+++ b/testsuite/tests/simplCore/should_compile/T3772.stdout-ghc-7.0
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T3772_A.hs b/testsuite/tests/simplCore/should_compile/T3772_A.hs
index e6b57c98b3..e6b57c98b3 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T3772_A.hs
+++ b/testsuite/tests/simplCore/should_compile/T3772_A.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T3831.hs b/testsuite/tests/simplCore/should_compile/T3831.hs
index 55b4d08f3a..55b4d08f3a 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T3831.hs
+++ b/testsuite/tests/simplCore/should_compile/T3831.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4201.hs b/testsuite/tests/simplCore/should_compile/T4201.hs
index dfebd0534e..dfebd0534e 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4201.hs
+++ b/testsuite/tests/simplCore/should_compile/T4201.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4201.stdout b/testsuite/tests/simplCore/should_compile/T4201.stdout
index 0009de14cc..0009de14cc 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4201.stdout
+++ b/testsuite/tests/simplCore/should_compile/T4201.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4203.hs b/testsuite/tests/simplCore/should_compile/T4203.hs
index 9423de7a36..9423de7a36 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4203.hs
+++ b/testsuite/tests/simplCore/should_compile/T4203.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4306.hs b/testsuite/tests/simplCore/should_compile/T4306.hs
index ba32981f61..ba32981f61 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4306.hs
+++ b/testsuite/tests/simplCore/should_compile/T4306.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4306.stdout b/testsuite/tests/simplCore/should_compile/T4306.stdout
index b2a93ff1cc..b2a93ff1cc 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4306.stdout
+++ b/testsuite/tests/simplCore/should_compile/T4306.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4345.hs b/testsuite/tests/simplCore/should_compile/T4345.hs
index 0a0dada9cb..0a0dada9cb 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4345.hs
+++ b/testsuite/tests/simplCore/should_compile/T4345.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4398.hs b/testsuite/tests/simplCore/should_compile/T4398.hs
index 3cb0647c1c..3cb0647c1c 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4398.hs
+++ b/testsuite/tests/simplCore/should_compile/T4398.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4398.stderr b/testsuite/tests/simplCore/should_compile/T4398.stderr
index ab17c8a4e9..ab17c8a4e9 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4398.stderr
+++ b/testsuite/tests/simplCore/should_compile/T4398.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4903.hs b/testsuite/tests/simplCore/should_compile/T4903.hs
index 70250d1d14..70250d1d14 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4903.hs
+++ b/testsuite/tests/simplCore/should_compile/T4903.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4903a.hs b/testsuite/tests/simplCore/should_compile/T4903a.hs
index e78859c55f..e78859c55f 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4903a.hs
+++ b/testsuite/tests/simplCore/should_compile/T4903a.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4908.hs b/testsuite/tests/simplCore/should_compile/T4908.hs
index 78634e72bb..78634e72bb 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4908.hs
+++ b/testsuite/tests/simplCore/should_compile/T4908.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4908.stderr b/testsuite/tests/simplCore/should_compile/T4908.stderr
index 9e24e6fca8..9e24e6fca8 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4908.stderr
+++ b/testsuite/tests/simplCore/should_compile/T4908.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4908.stderr-ghc-7.0 b/testsuite/tests/simplCore/should_compile/T4908.stderr-ghc-7.0
index 44e691547e..44e691547e 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4908.stderr-ghc-7.0
+++ b/testsuite/tests/simplCore/should_compile/T4908.stderr-ghc-7.0
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4918.hs b/testsuite/tests/simplCore/should_compile/T4918.hs
index ea5efade29..ea5efade29 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4918.hs
+++ b/testsuite/tests/simplCore/should_compile/T4918.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4918.stdout b/testsuite/tests/simplCore/should_compile/T4918.stdout
index c79b116f03..c79b116f03 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4918.stdout
+++ b/testsuite/tests/simplCore/should_compile/T4918.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4918a.hs b/testsuite/tests/simplCore/should_compile/T4918a.hs
index 5db7cb00b8..5db7cb00b8 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4918a.hs
+++ b/testsuite/tests/simplCore/should_compile/T4918a.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4930.hs b/testsuite/tests/simplCore/should_compile/T4930.hs
index ae5d4fd5f7..ae5d4fd5f7 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4930.hs
+++ b/testsuite/tests/simplCore/should_compile/T4930.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4930.stderr b/testsuite/tests/simplCore/should_compile/T4930.stderr
index bb1637cb82..bb1637cb82 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4930.stderr
+++ b/testsuite/tests/simplCore/should_compile/T4930.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4945.hs b/testsuite/tests/simplCore/should_compile/T4945.hs
index fba6e61ad6..fba6e61ad6 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4945.hs
+++ b/testsuite/tests/simplCore/should_compile/T4945.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T4957.hs b/testsuite/tests/simplCore/should_compile/T4957.hs
index 63086cd78d..63086cd78d 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T4957.hs
+++ b/testsuite/tests/simplCore/should_compile/T4957.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T5168.hs b/testsuite/tests/simplCore/should_compile/T5168.hs
index 22b4349fa2..22b4349fa2 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T5168.hs
+++ b/testsuite/tests/simplCore/should_compile/T5168.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/T5329.hs b/testsuite/tests/simplCore/should_compile/T5329.hs
index cf659110ca..cf659110ca 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/T5329.hs
+++ b/testsuite/tests/simplCore/should_compile/T5329.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T
index 2705d8f3a3..2705d8f3a3 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/all.T
+++ b/testsuite/tests/simplCore/should_compile/all.T
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/dfun-loop.hs b/testsuite/tests/simplCore/should_compile/dfun-loop.hs
index 4ad23f3401..4ad23f3401 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/dfun-loop.hs
+++ b/testsuite/tests/simplCore/should_compile/dfun-loop.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/rule1.hs b/testsuite/tests/simplCore/should_compile/rule1.hs
index 923f4805fb..923f4805fb 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/rule1.hs
+++ b/testsuite/tests/simplCore/should_compile/rule1.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/rule2.hs b/testsuite/tests/simplCore/should_compile/rule2.hs
index 2b091de5e9..2b091de5e9 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/rule2.hs
+++ b/testsuite/tests/simplCore/should_compile/rule2.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/rule2.stderr b/testsuite/tests/simplCore/should_compile/rule2.stderr
index 2bdb17fa4a..2bdb17fa4a 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/rule2.stderr
+++ b/testsuite/tests/simplCore/should_compile/rule2.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl-T1370.hs b/testsuite/tests/simplCore/should_compile/simpl-T1370.hs
index 7524f13bac..7524f13bac 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl-T1370.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl-T1370.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl001.hs b/testsuite/tests/simplCore/should_compile/simpl001.hs
index 4b2bfcc240..4b2bfcc240 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl001.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl001.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl001.stderr b/testsuite/tests/simplCore/should_compile/simpl001.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl001.stderr
+++ b/testsuite/tests/simplCore/should_compile/simpl001.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl002.hs b/testsuite/tests/simplCore/should_compile/simpl002.hs
index b262f47d38..b262f47d38 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl002.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl002.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl002.stderr b/testsuite/tests/simplCore/should_compile/simpl002.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl002.stderr
+++ b/testsuite/tests/simplCore/should_compile/simpl002.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl003.hs b/testsuite/tests/simplCore/should_compile/simpl003.hs
index 8bf9d6bfd1..8bf9d6bfd1 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl003.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl003.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl003.stderr b/testsuite/tests/simplCore/should_compile/simpl003.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl003.stderr
+++ b/testsuite/tests/simplCore/should_compile/simpl003.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl004.hs b/testsuite/tests/simplCore/should_compile/simpl004.hs
index 08282c69ea..08282c69ea 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl004.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl004.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl004.stderr b/testsuite/tests/simplCore/should_compile/simpl004.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl004.stderr
+++ b/testsuite/tests/simplCore/should_compile/simpl004.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl005.hs b/testsuite/tests/simplCore/should_compile/simpl005.hs
index abf98a30d2..abf98a30d2 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl005.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl005.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl005.stderr b/testsuite/tests/simplCore/should_compile/simpl005.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl005.stderr
+++ b/testsuite/tests/simplCore/should_compile/simpl005.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl007.hs b/testsuite/tests/simplCore/should_compile/simpl007.hs
index 2b42cc29ee..2b42cc29ee 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl007.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl007.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl009.hs b/testsuite/tests/simplCore/should_compile/simpl009.hs
index c66587d3e3..c66587d3e3 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl009.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl009.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl010.hs b/testsuite/tests/simplCore/should_compile/simpl010.hs
index da2af345f2..da2af345f2 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl010.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl010.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl011.hs b/testsuite/tests/simplCore/should_compile/simpl011.hs
index c660394e92..c660394e92 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl011.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl011.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl012.hs b/testsuite/tests/simplCore/should_compile/simpl012.hs
index 09af3e5618..09af3e5618 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl012.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl012.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl013.hs b/testsuite/tests/simplCore/should_compile/simpl013.hs
index c91cf50d9c..c91cf50d9c 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl013.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl013.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl014.hs b/testsuite/tests/simplCore/should_compile/simpl014.hs
index c610df527a..c610df527a 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl014.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl014.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl015.hs b/testsuite/tests/simplCore/should_compile/simpl015.hs
index 2ce70406be..2ce70406be 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl015.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl015.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl016.hs b/testsuite/tests/simplCore/should_compile/simpl016.hs
index 6ba088e6fa..6ba088e6fa 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl016.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl016.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl016.stderr b/testsuite/tests/simplCore/should_compile/simpl016.stderr
index 681dd10cab..681dd10cab 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl016.stderr
+++ b/testsuite/tests/simplCore/should_compile/simpl016.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl017.hs b/testsuite/tests/simplCore/should_compile/simpl017.hs
index 8c801a44f3..8c801a44f3 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl017.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl017.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl017.stderr b/testsuite/tests/simplCore/should_compile/simpl017.stderr
index ab82e56c36..ab82e56c36 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl017.stderr
+++ b/testsuite/tests/simplCore/should_compile/simpl017.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl018.hs b/testsuite/tests/simplCore/should_compile/simpl018.hs
index 1b7ce8ddcd..1b7ce8ddcd 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl018.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl018.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl019.hs b/testsuite/tests/simplCore/should_compile/simpl019.hs
index 66b8fc4764..66b8fc4764 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl019.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl019.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl020.hs b/testsuite/tests/simplCore/should_compile/simpl020.hs
index d969ce1fd9..d969ce1fd9 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl020.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl020.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl020.stderr b/testsuite/tests/simplCore/should_compile/simpl020.stderr
index 9d768d2913..9d768d2913 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/simpl020.stderr
+++ b/testsuite/tests/simplCore/should_compile/simpl020.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/spec-inline.hs b/testsuite/tests/simplCore/should_compile/spec-inline.hs
index 6c690ea12e..6c690ea12e 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/spec-inline.hs
+++ b/testsuite/tests/simplCore/should_compile/spec-inline.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/spec-inline.stderr b/testsuite/tests/simplCore/should_compile/spec-inline.stderr
index cd5d922ffc..cd5d922ffc 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/spec-inline.stderr
+++ b/testsuite/tests/simplCore/should_compile/spec-inline.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/spec-inline.stderr-ghc-7.0 b/testsuite/tests/simplCore/should_compile/spec-inline.stderr-ghc-7.0
index dd3a7eb44a..dd3a7eb44a 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/spec-inline.stderr-ghc-7.0
+++ b/testsuite/tests/simplCore/should_compile/spec-inline.stderr-ghc-7.0
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/spec001.hs b/testsuite/tests/simplCore/should_compile/spec001.hs
index 0abfd6a5a5..0abfd6a5a5 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/spec001.hs
+++ b/testsuite/tests/simplCore/should_compile/spec001.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/spec002.hs b/testsuite/tests/simplCore/should_compile/spec002.hs
index 1fb88d995c..1fb88d995c 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/spec002.hs
+++ b/testsuite/tests/simplCore/should_compile/spec002.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/spec003.hs b/testsuite/tests/simplCore/should_compile/spec003.hs
index 7ebb901106..7ebb901106 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/spec003.hs
+++ b/testsuite/tests/simplCore/should_compile/spec003.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_compile/strict-float.hs b/testsuite/tests/simplCore/should_compile/strict-float.hs
index 77954b76bb..77954b76bb 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_compile/strict-float.hs
+++ b/testsuite/tests/simplCore/should_compile/strict-float.hs
diff --git a/testsuite/tests/simplCore/should_run/Makefile b/testsuite/tests/simplCore/should_run/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/simplCore/should_run/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/SeqRule.hs b/testsuite/tests/simplCore/should_run/SeqRule.hs
index b1569efd7b..b1569efd7b 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/SeqRule.hs
+++ b/testsuite/tests/simplCore/should_run/SeqRule.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/SeqRule.stdout b/testsuite/tests/simplCore/should_run/SeqRule.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/SeqRule.stdout
+++ b/testsuite/tests/simplCore/should_run/SeqRule.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T2486.hs b/testsuite/tests/simplCore/should_run/T2486.hs
index 2f5df48532..2f5df48532 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T2486.hs
+++ b/testsuite/tests/simplCore/should_run/T2486.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T2486.stderr b/testsuite/tests/simplCore/should_run/T2486.stderr
index 968e8dbdb4..968e8dbdb4 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T2486.stderr
+++ b/testsuite/tests/simplCore/should_run/T2486.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T2756.hs b/testsuite/tests/simplCore/should_run/T2756.hs
index cb59d50c9b..cb59d50c9b 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T2756.hs
+++ b/testsuite/tests/simplCore/should_run/T2756.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T2756.stdout b/testsuite/tests/simplCore/should_run/T2756.stdout
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T2756.stdout
+++ b/testsuite/tests/simplCore/should_run/T2756.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T3403.hs b/testsuite/tests/simplCore/should_run/T3403.hs
index 276aae88b2..276aae88b2 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T3403.hs
+++ b/testsuite/tests/simplCore/should_run/T3403.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T3403.stdout b/testsuite/tests/simplCore/should_run/T3403.stdout
index aa47d0d46d..aa47d0d46d 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T3403.stdout
+++ b/testsuite/tests/simplCore/should_run/T3403.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T3437.hs b/testsuite/tests/simplCore/should_run/T3437.hs
index 9ef6ee8b82..9ef6ee8b82 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T3437.hs
+++ b/testsuite/tests/simplCore/should_run/T3437.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T3437.stdout b/testsuite/tests/simplCore/should_run/T3437.stdout
index fe51488c70..fe51488c70 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T3437.stdout
+++ b/testsuite/tests/simplCore/should_run/T3437.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T3591.hs b/testsuite/tests/simplCore/should_run/T3591.hs
index 491ba5fa17..491ba5fa17 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T3591.hs
+++ b/testsuite/tests/simplCore/should_run/T3591.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T3591.stderr b/testsuite/tests/simplCore/should_run/T3591.stderr
index 3fcef522a9..3fcef522a9 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T3591.stderr
+++ b/testsuite/tests/simplCore/should_run/T3591.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T3591.stdout b/testsuite/tests/simplCore/should_run/T3591.stdout
index 0c69a05357..0c69a05357 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T3591.stdout
+++ b/testsuite/tests/simplCore/should_run/T3591.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T3959.hs b/testsuite/tests/simplCore/should_run/T3959.hs
index 725f315da8..725f315da8 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T3959.hs
+++ b/testsuite/tests/simplCore/should_run/T3959.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T3959.stdout b/testsuite/tests/simplCore/should_run/T3959.stdout
index 6a452c185a..6a452c185a 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T3959.stdout
+++ b/testsuite/tests/simplCore/should_run/T3959.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T3972.hs b/testsuite/tests/simplCore/should_run/T3972.hs
index 324ddd4f9a..324ddd4f9a 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T3972.hs
+++ b/testsuite/tests/simplCore/should_run/T3972.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T3972A.hs b/testsuite/tests/simplCore/should_run/T3972A.hs
index b8202f7448..b8202f7448 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T3972A.hs
+++ b/testsuite/tests/simplCore/should_run/T3972A.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T3983.hs b/testsuite/tests/simplCore/should_run/T3983.hs
index 7a665256b1..7a665256b1 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T3983.hs
+++ b/testsuite/tests/simplCore/should_run/T3983.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T3983.stdout b/testsuite/tests/simplCore/should_run/T3983.stdout
index bc59c12aa1..bc59c12aa1 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T3983.stdout
+++ b/testsuite/tests/simplCore/should_run/T3983.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T3983_Bar.hs b/testsuite/tests/simplCore/should_run/T3983_Bar.hs
index ee6fe36e86..ee6fe36e86 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T3983_Bar.hs
+++ b/testsuite/tests/simplCore/should_run/T3983_Bar.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T3983_Foo.hs b/testsuite/tests/simplCore/should_run/T3983_Foo.hs
index b2519632a9..b2519632a9 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T3983_Foo.hs
+++ b/testsuite/tests/simplCore/should_run/T3983_Foo.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T4814.hs b/testsuite/tests/simplCore/should_run/T4814.hs
index 45551ffd23..45551ffd23 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T4814.hs
+++ b/testsuite/tests/simplCore/should_run/T4814.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T4814.stdout b/testsuite/tests/simplCore/should_run/T4814.stdout
index 00750edc07..00750edc07 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T4814.stdout
+++ b/testsuite/tests/simplCore/should_run/T4814.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T5315.hs b/testsuite/tests/simplCore/should_run/T5315.hs
index 5b2ff39346..5b2ff39346 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T5315.hs
+++ b/testsuite/tests/simplCore/should_run/T5315.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/T5315.stdout b/testsuite/tests/simplCore/should_run/T5315.stdout
index 345e6aef71..345e6aef71 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/T5315.stdout
+++ b/testsuite/tests/simplCore/should_run/T5315.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/all.T b/testsuite/tests/simplCore/should_run/all.T
index 174fa180c8..174fa180c8 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/all.T
+++ b/testsuite/tests/simplCore/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun001.hs b/testsuite/tests/simplCore/should_run/simplrun001.hs
index 6cbbf76a91..6cbbf76a91 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun001.hs
+++ b/testsuite/tests/simplCore/should_run/simplrun001.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun001.stderr b/testsuite/tests/simplCore/should_run/simplrun001.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun001.stderr
+++ b/testsuite/tests/simplCore/should_run/simplrun001.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun001.stdout b/testsuite/tests/simplCore/should_run/simplrun001.stdout
index 573541ac97..573541ac97 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun001.stdout
+++ b/testsuite/tests/simplCore/should_run/simplrun001.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun002.hs b/testsuite/tests/simplCore/should_run/simplrun002.hs
index c6d9267d40..c6d9267d40 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun002.hs
+++ b/testsuite/tests/simplCore/should_run/simplrun002.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun002.stderr b/testsuite/tests/simplCore/should_run/simplrun002.stderr
index dcd7a5d6d5..dcd7a5d6d5 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun002.stderr
+++ b/testsuite/tests/simplCore/should_run/simplrun002.stderr
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun002.stdout b/testsuite/tests/simplCore/should_run/simplrun002.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun002.stdout
+++ b/testsuite/tests/simplCore/should_run/simplrun002.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun003.hs b/testsuite/tests/simplCore/should_run/simplrun003.hs
index 45aa73578e..45aa73578e 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun003.hs
+++ b/testsuite/tests/simplCore/should_run/simplrun003.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun003.stdout b/testsuite/tests/simplCore/should_run/simplrun003.stdout
index d00491fd7e..d00491fd7e 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun003.stdout
+++ b/testsuite/tests/simplCore/should_run/simplrun003.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun004.hs b/testsuite/tests/simplCore/should_run/simplrun004.hs
index 16e7566ee2..16e7566ee2 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun004.hs
+++ b/testsuite/tests/simplCore/should_run/simplrun004.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun004.stdout b/testsuite/tests/simplCore/should_run/simplrun004.stdout
index 7cdf0c5bab..7cdf0c5bab 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun004.stdout
+++ b/testsuite/tests/simplCore/should_run/simplrun004.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun005.hs b/testsuite/tests/simplCore/should_run/simplrun005.hs
index d177568e4b..d177568e4b 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun005.hs
+++ b/testsuite/tests/simplCore/should_run/simplrun005.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun005.stdout b/testsuite/tests/simplCore/should_run/simplrun005.stdout
index c21fc4a1b9..c21fc4a1b9 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun005.stdout
+++ b/testsuite/tests/simplCore/should_run/simplrun005.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun007.hs b/testsuite/tests/simplCore/should_run/simplrun007.hs
index 12bfb2d335..12bfb2d335 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun007.hs
+++ b/testsuite/tests/simplCore/should_run/simplrun007.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun007.stdout b/testsuite/tests/simplCore/should_run/simplrun007.stdout
index 3283b5c891..3283b5c891 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun007.stdout
+++ b/testsuite/tests/simplCore/should_run/simplrun007.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun007.stdout-ws-64 b/testsuite/tests/simplCore/should_run/simplrun007.stdout-ws-64
index 47e0adb0d3..47e0adb0d3 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun007.stdout-ws-64
+++ b/testsuite/tests/simplCore/should_run/simplrun007.stdout-ws-64
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun008.hs b/testsuite/tests/simplCore/should_run/simplrun008.hs
index 782f0e40ac..782f0e40ac 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun008.hs
+++ b/testsuite/tests/simplCore/should_run/simplrun008.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun008.stdout b/testsuite/tests/simplCore/should_run/simplrun008.stdout
index e04622af3d..e04622af3d 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun008.stdout
+++ b/testsuite/tests/simplCore/should_run/simplrun008.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun009.hs b/testsuite/tests/simplCore/should_run/simplrun009.hs
index 826cdeef77..826cdeef77 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun009.hs
+++ b/testsuite/tests/simplCore/should_run/simplrun009.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun009.stdout b/testsuite/tests/simplCore/should_run/simplrun009.stdout
index 209e3ef4b6..209e3ef4b6 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun009.stdout
+++ b/testsuite/tests/simplCore/should_run/simplrun009.stdout
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun010.hs b/testsuite/tests/simplCore/should_run/simplrun010.hs
index 0fbc33ac81..0fbc33ac81 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun010.hs
+++ b/testsuite/tests/simplCore/should_run/simplrun010.hs
diff --git a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun010.stderr b/testsuite/tests/simplCore/should_run/simplrun010.stderr
index 57647f1f92..57647f1f92 100644
--- a/testsuite/tests/ghc-regress/simplCore/should_run/simplrun010.stderr
+++ b/testsuite/tests/simplCore/should_run/simplrun010.stderr
diff --git a/testsuite/tests/stranal/Makefile b/testsuite/tests/stranal/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/stranal/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/stranal/should_compile/Makefile b/testsuite/tests/stranal/should_compile/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/stranal/should_compile/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/T1988.hs b/testsuite/tests/stranal/should_compile/T1988.hs
index da99806ce1..da99806ce1 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/T1988.hs
+++ b/testsuite/tests/stranal/should_compile/T1988.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/all.T b/testsuite/tests/stranal/should_compile/all.T
index 5814f39f7d..5814f39f7d 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/all.T
+++ b/testsuite/tests/stranal/should_compile/all.T
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/default.hs b/testsuite/tests/stranal/should_compile/default.hs
index 43eb9f0633..43eb9f0633 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/default.hs
+++ b/testsuite/tests/stranal/should_compile/default.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/default.stderr b/testsuite/tests/stranal/should_compile/default.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/default.stderr
+++ b/testsuite/tests/stranal/should_compile/default.stderr
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/fact.hs b/testsuite/tests/stranal/should_compile/fact.hs
index 9f23f9021e..9f23f9021e 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/fact.hs
+++ b/testsuite/tests/stranal/should_compile/fact.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/fact.stderr b/testsuite/tests/stranal/should_compile/fact.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/fact.stderr
+++ b/testsuite/tests/stranal/should_compile/fact.stderr
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/fun.hs b/testsuite/tests/stranal/should_compile/fun.hs
index 5bab460f3f..5bab460f3f 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/fun.hs
+++ b/testsuite/tests/stranal/should_compile/fun.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/fun.stderr b/testsuite/tests/stranal/should_compile/fun.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/fun.stderr
+++ b/testsuite/tests/stranal/should_compile/fun.stderr
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/goo.hs b/testsuite/tests/stranal/should_compile/goo.hs
index 00282bb79e..00282bb79e 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/goo.hs
+++ b/testsuite/tests/stranal/should_compile/goo.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/goo.stderr b/testsuite/tests/stranal/should_compile/goo.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/goo.stderr
+++ b/testsuite/tests/stranal/should_compile/goo.stderr
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/ins.hs b/testsuite/tests/stranal/should_compile/ins.hs
index a50320cefa..a50320cefa 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/ins.hs
+++ b/testsuite/tests/stranal/should_compile/ins.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/ins.stderr b/testsuite/tests/stranal/should_compile/ins.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/ins.stderr
+++ b/testsuite/tests/stranal/should_compile/ins.stderr
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/map.hs b/testsuite/tests/stranal/should_compile/map.hs
index f4ec1ec769..f4ec1ec769 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/map.hs
+++ b/testsuite/tests/stranal/should_compile/map.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/map.stderr b/testsuite/tests/stranal/should_compile/map.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/map.stderr
+++ b/testsuite/tests/stranal/should_compile/map.stderr
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/newtype.hs b/testsuite/tests/stranal/should_compile/newtype.hs
index c68df28111..c68df28111 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/newtype.hs
+++ b/testsuite/tests/stranal/should_compile/newtype.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/sim.hs b/testsuite/tests/stranal/should_compile/sim.hs
index d6de6ec09d..d6de6ec09d 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/sim.hs
+++ b/testsuite/tests/stranal/should_compile/sim.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/sim.stderr b/testsuite/tests/stranal/should_compile/sim.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/sim.stderr
+++ b/testsuite/tests/stranal/should_compile/sim.stderr
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/str001.hs b/testsuite/tests/stranal/should_compile/str001.hs
index 6d27a923fd..6d27a923fd 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/str001.hs
+++ b/testsuite/tests/stranal/should_compile/str001.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/str001.stderr b/testsuite/tests/stranal/should_compile/str001.stderr
index 968ccf8885..968ccf8885 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/str001.stderr
+++ b/testsuite/tests/stranal/should_compile/str001.stderr
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/str002.hs b/testsuite/tests/stranal/should_compile/str002.hs
index 65fb8a7ba2..65fb8a7ba2 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/str002.hs
+++ b/testsuite/tests/stranal/should_compile/str002.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/str002.stderr b/testsuite/tests/stranal/should_compile/str002.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/str002.stderr
+++ b/testsuite/tests/stranal/should_compile/str002.stderr
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/syn.hs b/testsuite/tests/stranal/should_compile/syn.hs
index 6693db70d9..6693db70d9 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/syn.hs
+++ b/testsuite/tests/stranal/should_compile/syn.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/syn.stderr b/testsuite/tests/stranal/should_compile/syn.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/syn.stderr
+++ b/testsuite/tests/stranal/should_compile/syn.stderr
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/test.hs b/testsuite/tests/stranal/should_compile/test.hs
index c984c320d1..c984c320d1 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/test.hs
+++ b/testsuite/tests/stranal/should_compile/test.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/test.stderr b/testsuite/tests/stranal/should_compile/test.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/test.stderr
+++ b/testsuite/tests/stranal/should_compile/test.stderr
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/tst.hs b/testsuite/tests/stranal/should_compile/tst.hs
index 561292107b..561292107b 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/tst.hs
+++ b/testsuite/tests/stranal/should_compile/tst.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/tst.stderr b/testsuite/tests/stranal/should_compile/tst.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/tst.stderr
+++ b/testsuite/tests/stranal/should_compile/tst.stderr
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/unu.hs b/testsuite/tests/stranal/should_compile/unu.hs
index 54bb25e9ab..54bb25e9ab 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/unu.hs
+++ b/testsuite/tests/stranal/should_compile/unu.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_compile/unu.stderr b/testsuite/tests/stranal/should_compile/unu.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/stranal/should_compile/unu.stderr
+++ b/testsuite/tests/stranal/should_compile/unu.stderr
diff --git a/testsuite/tests/stranal/should_run/Makefile b/testsuite/tests/stranal/should_run/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/stranal/should_run/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/stranal/should_run/T2756b.hs b/testsuite/tests/stranal/should_run/T2756b.hs
index cb59d50c9b..cb59d50c9b 100644
--- a/testsuite/tests/ghc-regress/stranal/should_run/T2756b.hs
+++ b/testsuite/tests/stranal/should_run/T2756b.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_run/all.T b/testsuite/tests/stranal/should_run/all.T
index d94a7c492d..d94a7c492d 100644
--- a/testsuite/tests/ghc-regress/stranal/should_run/all.T
+++ b/testsuite/tests/stranal/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/stranal/should_run/strun001.hs b/testsuite/tests/stranal/should_run/strun001.hs
index 43820f3028..43820f3028 100644
--- a/testsuite/tests/ghc-regress/stranal/should_run/strun001.hs
+++ b/testsuite/tests/stranal/should_run/strun001.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_run/strun001.stdout b/testsuite/tests/stranal/should_run/strun001.stdout
index 9cba23c739..9cba23c739 100644
--- a/testsuite/tests/ghc-regress/stranal/should_run/strun001.stdout
+++ b/testsuite/tests/stranal/should_run/strun001.stdout
diff --git a/testsuite/tests/ghc-regress/stranal/should_run/strun002.hs b/testsuite/tests/stranal/should_run/strun002.hs
index 145166964d..145166964d 100644
--- a/testsuite/tests/ghc-regress/stranal/should_run/strun002.hs
+++ b/testsuite/tests/stranal/should_run/strun002.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_run/strun002.stderr b/testsuite/tests/stranal/should_run/strun002.stderr
index ac89b7f80b..ac89b7f80b 100644
--- a/testsuite/tests/ghc-regress/stranal/should_run/strun002.stderr
+++ b/testsuite/tests/stranal/should_run/strun002.stderr
diff --git a/testsuite/tests/ghc-regress/stranal/should_run/strun003.hs b/testsuite/tests/stranal/should_run/strun003.hs
index eaedd59e8c..eaedd59e8c 100644
--- a/testsuite/tests/ghc-regress/stranal/should_run/strun003.hs
+++ b/testsuite/tests/stranal/should_run/strun003.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_run/strun003.stdout b/testsuite/tests/stranal/should_run/strun003.stdout
index 9766475a41..9766475a41 100644
--- a/testsuite/tests/ghc-regress/stranal/should_run/strun003.stdout
+++ b/testsuite/tests/stranal/should_run/strun003.stdout
diff --git a/testsuite/tests/ghc-regress/stranal/should_run/strun004.hs b/testsuite/tests/stranal/should_run/strun004.hs
index ff58f72ce5..ff58f72ce5 100644
--- a/testsuite/tests/ghc-regress/stranal/should_run/strun004.hs
+++ b/testsuite/tests/stranal/should_run/strun004.hs
diff --git a/testsuite/tests/ghc-regress/stranal/should_run/strun004.stdout b/testsuite/tests/stranal/should_run/strun004.stdout
index 697cb3a26d..697cb3a26d 100644
--- a/testsuite/tests/ghc-regress/stranal/should_run/strun004.stdout
+++ b/testsuite/tests/stranal/should_run/strun004.stdout
diff --git a/testsuite/tests/ghc-regress/th/2014/A.hs b/testsuite/tests/th/2014/A.hs
index d843c00b78..d843c00b78 100644
--- a/testsuite/tests/ghc-regress/th/2014/A.hs
+++ b/testsuite/tests/th/2014/A.hs
diff --git a/testsuite/tests/ghc-regress/th/2014/A.hs-boot b/testsuite/tests/th/2014/A.hs-boot
index d843c00b78..d843c00b78 100644
--- a/testsuite/tests/ghc-regress/th/2014/A.hs-boot
+++ b/testsuite/tests/th/2014/A.hs-boot
diff --git a/testsuite/tests/ghc-regress/th/2014/B.hs b/testsuite/tests/th/2014/B.hs
index 0233a40209..0233a40209 100644
--- a/testsuite/tests/ghc-regress/th/2014/B.hs
+++ b/testsuite/tests/th/2014/B.hs
diff --git a/testsuite/tests/ghc-regress/th/2014/C.hs b/testsuite/tests/th/2014/C.hs
index 5ddff11497..5ddff11497 100644
--- a/testsuite/tests/ghc-regress/th/2014/C.hs
+++ b/testsuite/tests/th/2014/C.hs
diff --git a/testsuite/tests/th/2014/Makefile b/testsuite/tests/th/2014/Makefile
new file mode 100644
index 0000000000..eafbcfb7e0
--- /dev/null
+++ b/testsuite/tests/th/2014/Makefile
@@ -0,0 +1,9 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+2014 :
+	'$(TEST_HC)' $(TEST_HC_OPTS) -fforce-recomp -c A.hs-boot
+	'$(TEST_HC)' $(TEST_HC_OPTS) -fforce-recomp -c A.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -fforce-recomp -c B.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -fforce-recomp -c C.hs -v0
diff --git a/testsuite/tests/ghc-regress/th/2014/all.T b/testsuite/tests/th/2014/all.T
index c6792677d9..c6792677d9 100644
--- a/testsuite/tests/ghc-regress/th/2014/all.T
+++ b/testsuite/tests/th/2014/all.T
diff --git a/testsuite/tests/th/Makefile b/testsuite/tests/th/Makefile
new file mode 100644
index 0000000000..dc60d5b6b9
--- /dev/null
+++ b/testsuite/tests/th/Makefile
@@ -0,0 +1,19 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+# Trac 2386 requires batch-compile not --make
+# Very important: without -O 
+T2386:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c T2386_Lib.hs -fforce-recomp
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 -c T2386.hs -fforce-recomp
+
+
+HC_OPTS = -XTemplateHaskell -package template-haskell
+
+TH_spliceE5_prof::
+	$(RM) TH_spliceE5_prof*.o TH_spliceE5_prof*.hi TH_spliceE5_prof*.p_o 
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(HC_OPTS) --make -v0 TH_spliceE5_prof.hs -c
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(HC_OPTS) --make -v0 TH_spliceE5_prof.hs -prof -auto-all -osuf p_o -o $@
+	./$@
+
diff --git a/testsuite/tests/ghc-regress/th/T1835.hs b/testsuite/tests/th/T1835.hs
index 296bf907ab..296bf907ab 100644
--- a/testsuite/tests/ghc-regress/th/T1835.hs
+++ b/testsuite/tests/th/T1835.hs
diff --git a/testsuite/tests/ghc-regress/th/T1835.stdout b/testsuite/tests/th/T1835.stdout
index dcb42a2b19..dcb42a2b19 100644
--- a/testsuite/tests/ghc-regress/th/T1835.stdout
+++ b/testsuite/tests/th/T1835.stdout
diff --git a/testsuite/tests/ghc-regress/th/T2386.hs b/testsuite/tests/th/T2386.hs
index b7a03469cf..b7a03469cf 100644
--- a/testsuite/tests/ghc-regress/th/T2386.hs
+++ b/testsuite/tests/th/T2386.hs
diff --git a/testsuite/tests/ghc-regress/th/T2386_Lib.hs b/testsuite/tests/th/T2386_Lib.hs
index 4322cc9584..4322cc9584 100644
--- a/testsuite/tests/ghc-regress/th/T2386_Lib.hs
+++ b/testsuite/tests/th/T2386_Lib.hs
diff --git a/testsuite/tests/ghc-regress/th/T2597a.hs b/testsuite/tests/th/T2597a.hs
index 3d8c319b47..3d8c319b47 100644
--- a/testsuite/tests/ghc-regress/th/T2597a.hs
+++ b/testsuite/tests/th/T2597a.hs
diff --git a/testsuite/tests/ghc-regress/th/T2597a_Lib.hs b/testsuite/tests/th/T2597a_Lib.hs
index 0e8f794dc6..0e8f794dc6 100644
--- a/testsuite/tests/ghc-regress/th/T2597a_Lib.hs
+++ b/testsuite/tests/th/T2597a_Lib.hs
diff --git a/testsuite/tests/ghc-regress/th/T2597b.hs b/testsuite/tests/th/T2597b.hs
index 2fde008388..2fde008388 100644
--- a/testsuite/tests/ghc-regress/th/T2597b.hs
+++ b/testsuite/tests/th/T2597b.hs
diff --git a/testsuite/tests/ghc-regress/th/T2597b.stderr b/testsuite/tests/th/T2597b.stderr
index 8881b81044..8881b81044 100644
--- a/testsuite/tests/ghc-regress/th/T2597b.stderr
+++ b/testsuite/tests/th/T2597b.stderr
diff --git a/testsuite/tests/ghc-regress/th/T2597b_Lib.hs b/testsuite/tests/th/T2597b_Lib.hs
index 1f70c3923a..1f70c3923a 100644
--- a/testsuite/tests/ghc-regress/th/T2597b_Lib.hs
+++ b/testsuite/tests/th/T2597b_Lib.hs
diff --git a/testsuite/tests/ghc-regress/th/T2632.hs b/testsuite/tests/th/T2632.hs
index 31429e28d9..31429e28d9 100644
--- a/testsuite/tests/ghc-regress/th/T2632.hs
+++ b/testsuite/tests/th/T2632.hs
diff --git a/testsuite/tests/ghc-regress/th/T2674.hs b/testsuite/tests/th/T2674.hs
index 3413193343..3413193343 100644
--- a/testsuite/tests/ghc-regress/th/T2674.hs
+++ b/testsuite/tests/th/T2674.hs
diff --git a/testsuite/tests/ghc-regress/th/T2674.stderr b/testsuite/tests/th/T2674.stderr
index a69781dfe4..a69781dfe4 100644
--- a/testsuite/tests/ghc-regress/th/T2674.stderr
+++ b/testsuite/tests/th/T2674.stderr
diff --git a/testsuite/tests/ghc-regress/th/T2685.hs b/testsuite/tests/th/T2685.hs
index c4bc0aa335..c4bc0aa335 100644
--- a/testsuite/tests/ghc-regress/th/T2685.hs
+++ b/testsuite/tests/th/T2685.hs
diff --git a/testsuite/tests/ghc-regress/th/T2685a.hs b/testsuite/tests/th/T2685a.hs
index a92c9720ef..a92c9720ef 100644
--- a/testsuite/tests/ghc-regress/th/T2685a.hs
+++ b/testsuite/tests/th/T2685a.hs
diff --git a/testsuite/tests/ghc-regress/th/T2700.hs b/testsuite/tests/th/T2700.hs
index 68a6e6247a..68a6e6247a 100644
--- a/testsuite/tests/ghc-regress/th/T2700.hs
+++ b/testsuite/tests/th/T2700.hs
diff --git a/testsuite/tests/ghc-regress/th/T2700.stderr b/testsuite/tests/th/T2700.stderr
index 004521c197..004521c197 100644
--- a/testsuite/tests/ghc-regress/th/T2700.stderr
+++ b/testsuite/tests/th/T2700.stderr
diff --git a/testsuite/tests/ghc-regress/th/T2700.stderr-ghc-7.0 b/testsuite/tests/th/T2700.stderr-ghc-7.0
index 6637147112..6637147112 100644
--- a/testsuite/tests/ghc-regress/th/T2700.stderr-ghc-7.0
+++ b/testsuite/tests/th/T2700.stderr-ghc-7.0
diff --git a/testsuite/tests/ghc-regress/th/T2713.hs b/testsuite/tests/th/T2713.hs
index 77eb704b1c..77eb704b1c 100644
--- a/testsuite/tests/ghc-regress/th/T2713.hs
+++ b/testsuite/tests/th/T2713.hs
diff --git a/testsuite/tests/ghc-regress/th/T2713.stderr b/testsuite/tests/th/T2713.stderr
index a2528885ee..a2528885ee 100644
--- a/testsuite/tests/ghc-regress/th/T2713.stderr
+++ b/testsuite/tests/th/T2713.stderr
diff --git a/testsuite/tests/ghc-regress/th/T2817.hs b/testsuite/tests/th/T2817.hs
index 6bdee60994..6bdee60994 100644
--- a/testsuite/tests/ghc-regress/th/T2817.hs
+++ b/testsuite/tests/th/T2817.hs
diff --git a/testsuite/tests/ghc-regress/th/T2931.hs b/testsuite/tests/th/T2931.hs
index f7b9afe0a7..f7b9afe0a7 100644
--- a/testsuite/tests/ghc-regress/th/T2931.hs
+++ b/testsuite/tests/th/T2931.hs
diff --git a/testsuite/tests/ghc-regress/th/T3100.hs b/testsuite/tests/th/T3100.hs
index edb943933a..edb943933a 100644
--- a/testsuite/tests/ghc-regress/th/T3100.hs
+++ b/testsuite/tests/th/T3100.hs
diff --git a/testsuite/tests/ghc-regress/th/T3177.hs b/testsuite/tests/th/T3177.hs
index c46a1f4c46..c46a1f4c46 100644
--- a/testsuite/tests/ghc-regress/th/T3177.hs
+++ b/testsuite/tests/th/T3177.hs
diff --git a/testsuite/tests/ghc-regress/th/T3177a.hs b/testsuite/tests/th/T3177a.hs
index 8746901753..8746901753 100644
--- a/testsuite/tests/ghc-regress/th/T3177a.hs
+++ b/testsuite/tests/th/T3177a.hs
diff --git a/testsuite/tests/ghc-regress/th/T3177a.stderr b/testsuite/tests/th/T3177a.stderr
index 00b0c0d92c..00b0c0d92c 100644
--- a/testsuite/tests/ghc-regress/th/T3177a.stderr
+++ b/testsuite/tests/th/T3177a.stderr
diff --git a/testsuite/tests/ghc-regress/th/T3319.hs b/testsuite/tests/th/T3319.hs
index afe7f01c10..afe7f01c10 100644
--- a/testsuite/tests/ghc-regress/th/T3319.hs
+++ b/testsuite/tests/th/T3319.hs
diff --git a/testsuite/tests/ghc-regress/th/T3319.stderr b/testsuite/tests/th/T3319.stderr
index 7947ce0ef1..7947ce0ef1 100644
--- a/testsuite/tests/ghc-regress/th/T3319.stderr
+++ b/testsuite/tests/th/T3319.stderr
diff --git a/testsuite/tests/ghc-regress/th/T3395.hs b/testsuite/tests/th/T3395.hs
index ff3ee4384a..ff3ee4384a 100644
--- a/testsuite/tests/ghc-regress/th/T3395.hs
+++ b/testsuite/tests/th/T3395.hs
diff --git a/testsuite/tests/ghc-regress/th/T3395.stderr b/testsuite/tests/th/T3395.stderr
index f85f7cc1da..f85f7cc1da 100644
--- a/testsuite/tests/ghc-regress/th/T3395.stderr
+++ b/testsuite/tests/th/T3395.stderr
diff --git a/testsuite/tests/ghc-regress/th/T3467.hs b/testsuite/tests/th/T3467.hs
index b439470f31..b439470f31 100644
--- a/testsuite/tests/ghc-regress/th/T3467.hs
+++ b/testsuite/tests/th/T3467.hs
diff --git a/testsuite/tests/ghc-regress/th/T3572.hs b/testsuite/tests/th/T3572.hs
index 4717fd2735..4717fd2735 100644
--- a/testsuite/tests/ghc-regress/th/T3572.hs
+++ b/testsuite/tests/th/T3572.hs
diff --git a/testsuite/tests/ghc-regress/th/T3572.stdout b/testsuite/tests/th/T3572.stdout
index 8dd47a4c5a..8dd47a4c5a 100644
--- a/testsuite/tests/ghc-regress/th/T3572.stdout
+++ b/testsuite/tests/th/T3572.stdout
diff --git a/testsuite/tests/ghc-regress/th/T3600.hs b/testsuite/tests/th/T3600.hs
index 84b0eefea1..84b0eefea1 100644
--- a/testsuite/tests/ghc-regress/th/T3600.hs
+++ b/testsuite/tests/th/T3600.hs
diff --git a/testsuite/tests/ghc-regress/th/T3600.stderr b/testsuite/tests/th/T3600.stderr
index 8ab357db1a..8ab357db1a 100644
--- a/testsuite/tests/ghc-regress/th/T3600.stderr
+++ b/testsuite/tests/th/T3600.stderr
diff --git a/testsuite/tests/ghc-regress/th/T3600a.hs b/testsuite/tests/th/T3600a.hs
index d328d8e6a7..d328d8e6a7 100644
--- a/testsuite/tests/ghc-regress/th/T3600a.hs
+++ b/testsuite/tests/th/T3600a.hs
diff --git a/testsuite/tests/ghc-regress/th/T3845.hs b/testsuite/tests/th/T3845.hs
index 29dc51fbda..29dc51fbda 100644
--- a/testsuite/tests/ghc-regress/th/T3845.hs
+++ b/testsuite/tests/th/T3845.hs
diff --git a/testsuite/tests/ghc-regress/th/T3899.hs b/testsuite/tests/th/T3899.hs
index 1b56643d59..1b56643d59 100644
--- a/testsuite/tests/ghc-regress/th/T3899.hs
+++ b/testsuite/tests/th/T3899.hs
diff --git a/testsuite/tests/ghc-regress/th/T3899.stderr b/testsuite/tests/th/T3899.stderr
index 2b4a76a4e5..2b4a76a4e5 100644
--- a/testsuite/tests/ghc-regress/th/T3899.stderr
+++ b/testsuite/tests/th/T3899.stderr
diff --git a/testsuite/tests/ghc-regress/th/T3899a.hs b/testsuite/tests/th/T3899a.hs
index 2ac985136f..2ac985136f 100644
--- a/testsuite/tests/ghc-regress/th/T3899a.hs
+++ b/testsuite/tests/th/T3899a.hs
diff --git a/testsuite/tests/ghc-regress/th/T3920.hs b/testsuite/tests/th/T3920.hs
index 8a8ac0b7d3..8a8ac0b7d3 100644
--- a/testsuite/tests/ghc-regress/th/T3920.hs
+++ b/testsuite/tests/th/T3920.hs
diff --git a/testsuite/tests/ghc-regress/th/T3920.stdout b/testsuite/tests/th/T3920.stdout
index 224efdfda9..224efdfda9 100644
--- a/testsuite/tests/ghc-regress/th/T3920.stdout
+++ b/testsuite/tests/th/T3920.stdout
diff --git a/testsuite/tests/ghc-regress/th/T4056.hs b/testsuite/tests/th/T4056.hs
index 211d2b51f4..211d2b51f4 100644
--- a/testsuite/tests/ghc-regress/th/T4056.hs
+++ b/testsuite/tests/th/T4056.hs
diff --git a/testsuite/tests/ghc-regress/th/T4169.hs b/testsuite/tests/th/T4169.hs
index 1fa3ad7cb7..1fa3ad7cb7 100644
--- a/testsuite/tests/ghc-regress/th/T4169.hs
+++ b/testsuite/tests/th/T4169.hs
diff --git a/testsuite/tests/ghc-regress/th/T4188.hs b/testsuite/tests/th/T4188.hs
index 73fd925302..73fd925302 100644
--- a/testsuite/tests/ghc-regress/th/T4188.hs
+++ b/testsuite/tests/th/T4188.hs
diff --git a/testsuite/tests/ghc-regress/th/T4188.stderr b/testsuite/tests/th/T4188.stderr
index 469a2d3840..469a2d3840 100644
--- a/testsuite/tests/ghc-regress/th/T4188.stderr
+++ b/testsuite/tests/th/T4188.stderr
diff --git a/testsuite/tests/ghc-regress/th/T4233.hs b/testsuite/tests/th/T4233.hs
index 87712d064d..87712d064d 100644
--- a/testsuite/tests/ghc-regress/th/T4233.hs
+++ b/testsuite/tests/th/T4233.hs
diff --git a/testsuite/tests/ghc-regress/th/T4255.hs b/testsuite/tests/th/T4255.hs
index 8509f0ece9..8509f0ece9 100644
--- a/testsuite/tests/ghc-regress/th/T4255.hs
+++ b/testsuite/tests/th/T4255.hs
diff --git a/testsuite/tests/ghc-regress/th/T4255.stderr b/testsuite/tests/th/T4255.stderr
index e2c4f2f055..e2c4f2f055 100644
--- a/testsuite/tests/ghc-regress/th/T4255.stderr
+++ b/testsuite/tests/th/T4255.stderr
diff --git a/testsuite/tests/ghc-regress/th/T4436.hs b/testsuite/tests/th/T4436.hs
index 2d39120eba..2d39120eba 100644
--- a/testsuite/tests/ghc-regress/th/T4436.hs
+++ b/testsuite/tests/th/T4436.hs
diff --git a/testsuite/tests/ghc-regress/th/T4436.stderr b/testsuite/tests/th/T4436.stderr
index d66582ec1e..d66582ec1e 100644
--- a/testsuite/tests/ghc-regress/th/T4436.stderr
+++ b/testsuite/tests/th/T4436.stderr
diff --git a/testsuite/tests/ghc-regress/th/T4949.hs b/testsuite/tests/th/T4949.hs
index a1cb8b4d99..a1cb8b4d99 100644
--- a/testsuite/tests/ghc-regress/th/T4949.hs
+++ b/testsuite/tests/th/T4949.hs
diff --git a/testsuite/tests/ghc-regress/th/T5037.hs b/testsuite/tests/th/T5037.hs
index 06f42ab88c..06f42ab88c 100644
--- a/testsuite/tests/ghc-regress/th/T5037.hs
+++ b/testsuite/tests/th/T5037.hs
diff --git a/testsuite/tests/ghc-regress/th/T5037.stderr b/testsuite/tests/th/T5037.stderr
index 987d7fd852..987d7fd852 100644
--- a/testsuite/tests/ghc-regress/th/T5037.stderr
+++ b/testsuite/tests/th/T5037.stderr
diff --git a/testsuite/tests/ghc-regress/th/T5126.hs b/testsuite/tests/th/T5126.hs
index 668f82ae0b..668f82ae0b 100644
--- a/testsuite/tests/ghc-regress/th/T5126.hs
+++ b/testsuite/tests/th/T5126.hs
diff --git a/testsuite/tests/ghc-regress/th/T5217.hs b/testsuite/tests/th/T5217.hs
index 9dd1f1cb3f..9dd1f1cb3f 100644
--- a/testsuite/tests/ghc-regress/th/T5217.hs
+++ b/testsuite/tests/th/T5217.hs
diff --git a/testsuite/tests/ghc-regress/th/T5217.stderr b/testsuite/tests/th/T5217.stderr
index 891bb7f94a..891bb7f94a 100644
--- a/testsuite/tests/ghc-regress/th/T5217.stderr
+++ b/testsuite/tests/th/T5217.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_1tuple.hs b/testsuite/tests/th/TH_1tuple.hs
index 3674a5a76c..3674a5a76c 100644
--- a/testsuite/tests/ghc-regress/th/TH_1tuple.hs
+++ b/testsuite/tests/th/TH_1tuple.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_1tuple.stderr b/testsuite/tests/th/TH_1tuple.stderr
index cb8889e4ca..cb8889e4ca 100644
--- a/testsuite/tests/ghc-regress/th/TH_1tuple.stderr
+++ b/testsuite/tests/th/TH_1tuple.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_NestedSplices.hs b/testsuite/tests/th/TH_NestedSplices.hs
index e16e6da8ff..e16e6da8ff 100644
--- a/testsuite/tests/ghc-regress/th/TH_NestedSplices.hs
+++ b/testsuite/tests/th/TH_NestedSplices.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_NestedSplices_Lib.hs b/testsuite/tests/th/TH_NestedSplices_Lib.hs
index 91d6173b91..91d6173b91 100644
--- a/testsuite/tests/ghc-regress/th/TH_NestedSplices_Lib.hs
+++ b/testsuite/tests/th/TH_NestedSplices_Lib.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_bracket1.hs b/testsuite/tests/th/TH_bracket1.hs
index 393ca47fbd..393ca47fbd 100644
--- a/testsuite/tests/ghc-regress/th/TH_bracket1.hs
+++ b/testsuite/tests/th/TH_bracket1.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_bracket2.hs b/testsuite/tests/th/TH_bracket2.hs
index 2b06b9eecb..2b06b9eecb 100644
--- a/testsuite/tests/ghc-regress/th/TH_bracket2.hs
+++ b/testsuite/tests/th/TH_bracket2.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_bracket3.hs b/testsuite/tests/th/TH_bracket3.hs
index c746d61cd3..c746d61cd3 100644
--- a/testsuite/tests/ghc-regress/th/TH_bracket3.hs
+++ b/testsuite/tests/th/TH_bracket3.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_class1.hs b/testsuite/tests/th/TH_class1.hs
index 334a7d2301..334a7d2301 100644
--- a/testsuite/tests/ghc-regress/th/TH_class1.hs
+++ b/testsuite/tests/th/TH_class1.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_dataD1.hs b/testsuite/tests/th/TH_dataD1.hs
index 60d8e018ad..60d8e018ad 100644
--- a/testsuite/tests/ghc-regress/th/TH_dataD1.hs
+++ b/testsuite/tests/th/TH_dataD1.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_dataD1.stderr b/testsuite/tests/th/TH_dataD1.stderr
index ddabee742a..ddabee742a 100644
--- a/testsuite/tests/ghc-regress/th/TH_dataD1.stderr
+++ b/testsuite/tests/th/TH_dataD1.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_dupdecl.hs b/testsuite/tests/th/TH_dupdecl.hs
index 80f1da4068..80f1da4068 100644
--- a/testsuite/tests/ghc-regress/th/TH_dupdecl.hs
+++ b/testsuite/tests/th/TH_dupdecl.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_dupdecl.stderr b/testsuite/tests/th/TH_dupdecl.stderr
index a8628a3de7..a8628a3de7 100644
--- a/testsuite/tests/ghc-regress/th/TH_dupdecl.stderr
+++ b/testsuite/tests/th/TH_dupdecl.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_emptycase.hs b/testsuite/tests/th/TH_emptycase.hs
index d68ca9a8ee..d68ca9a8ee 100644
--- a/testsuite/tests/ghc-regress/th/TH_emptycase.hs
+++ b/testsuite/tests/th/TH_emptycase.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_emptycase.stderr b/testsuite/tests/th/TH_emptycase.stderr
index 2de068769b..2de068769b 100644
--- a/testsuite/tests/ghc-regress/th/TH_emptycase.stderr
+++ b/testsuite/tests/th/TH_emptycase.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_exn1.hs b/testsuite/tests/th/TH_exn1.hs
index b401ca40d5..b401ca40d5 100644
--- a/testsuite/tests/ghc-regress/th/TH_exn1.hs
+++ b/testsuite/tests/th/TH_exn1.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_exn1.stderr b/testsuite/tests/th/TH_exn1.stderr
index f544485245..f544485245 100644
--- a/testsuite/tests/ghc-regress/th/TH_exn1.stderr
+++ b/testsuite/tests/th/TH_exn1.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_exn2.hs b/testsuite/tests/th/TH_exn2.hs
index ce742d906e..ce742d906e 100644
--- a/testsuite/tests/ghc-regress/th/TH_exn2.hs
+++ b/testsuite/tests/th/TH_exn2.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_exn2.stderr b/testsuite/tests/th/TH_exn2.stderr
index 79ec99171a..79ec99171a 100644
--- a/testsuite/tests/ghc-regress/th/TH_exn2.stderr
+++ b/testsuite/tests/th/TH_exn2.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_fail.hs b/testsuite/tests/th/TH_fail.hs
index 174939c5cb..174939c5cb 100644
--- a/testsuite/tests/ghc-regress/th/TH_fail.hs
+++ b/testsuite/tests/th/TH_fail.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_fail.stderr b/testsuite/tests/th/TH_fail.stderr
index b73acbbb22..b73acbbb22 100644
--- a/testsuite/tests/ghc-regress/th/TH_fail.stderr
+++ b/testsuite/tests/th/TH_fail.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_foreignInterruptible.hs b/testsuite/tests/th/TH_foreignInterruptible.hs
index d025c355a3..d025c355a3 100644
--- a/testsuite/tests/ghc-regress/th/TH_foreignInterruptible.hs
+++ b/testsuite/tests/th/TH_foreignInterruptible.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_foreignInterruptible.stderr b/testsuite/tests/th/TH_foreignInterruptible.stderr
index b9aab05755..b9aab05755 100644
--- a/testsuite/tests/ghc-regress/th/TH_foreignInterruptible.stderr
+++ b/testsuite/tests/th/TH_foreignInterruptible.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_genEx.hs b/testsuite/tests/th/TH_genEx.hs
index fdc47960ad..fdc47960ad 100644
--- a/testsuite/tests/ghc-regress/th/TH_genEx.hs
+++ b/testsuite/tests/th/TH_genEx.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_genEx.stderr b/testsuite/tests/th/TH_genEx.stderr
index 88eeca7d5c..88eeca7d5c 100644
--- a/testsuite/tests/ghc-regress/th/TH_genEx.stderr
+++ b/testsuite/tests/th/TH_genEx.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_genExLib.hs b/testsuite/tests/th/TH_genExLib.hs
index 02784ac87b..02784ac87b 100644
--- a/testsuite/tests/ghc-regress/th/TH_genExLib.hs
+++ b/testsuite/tests/th/TH_genExLib.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_ghci1.script b/testsuite/tests/th/TH_ghci1.script
index bcc752b9f4..bcc752b9f4 100644
--- a/testsuite/tests/ghc-regress/th/TH_ghci1.script
+++ b/testsuite/tests/th/TH_ghci1.script
diff --git a/testsuite/tests/ghc-regress/th/TH_ghci1.stdout b/testsuite/tests/th/TH_ghci1.stdout
index 6613b56886..6613b56886 100644
--- a/testsuite/tests/ghc-regress/th/TH_ghci1.stdout
+++ b/testsuite/tests/th/TH_ghci1.stdout
diff --git a/testsuite/tests/ghc-regress/th/TH_import_loop/Main.hs b/testsuite/tests/th/TH_import_loop/Main.hs
index 4cd66a0173..4cd66a0173 100644
--- a/testsuite/tests/ghc-regress/th/TH_import_loop/Main.hs
+++ b/testsuite/tests/th/TH_import_loop/Main.hs
diff --git a/testsuite/tests/th/TH_import_loop/Makefile b/testsuite/tests/th/TH_import_loop/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/th/TH_import_loop/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/th/TH_import_loop/ModuleA.hs b/testsuite/tests/th/TH_import_loop/ModuleA.hs
index 799f177dfe..799f177dfe 100644
--- a/testsuite/tests/ghc-regress/th/TH_import_loop/ModuleA.hs
+++ b/testsuite/tests/th/TH_import_loop/ModuleA.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_import_loop/ModuleA.hs-boot b/testsuite/tests/th/TH_import_loop/ModuleA.hs-boot
index a5976fdcc6..a5976fdcc6 100644
--- a/testsuite/tests/ghc-regress/th/TH_import_loop/ModuleA.hs-boot
+++ b/testsuite/tests/th/TH_import_loop/ModuleA.hs-boot
diff --git a/testsuite/tests/ghc-regress/th/TH_import_loop/ModuleB.hs b/testsuite/tests/th/TH_import_loop/ModuleB.hs
index 9aaffb613f..9aaffb613f 100644
--- a/testsuite/tests/ghc-regress/th/TH_import_loop/ModuleB.hs
+++ b/testsuite/tests/th/TH_import_loop/ModuleB.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_import_loop/ModuleC.hs b/testsuite/tests/th/TH_import_loop/ModuleC.hs
index 3047a8f0d4..3047a8f0d4 100644
--- a/testsuite/tests/ghc-regress/th/TH_import_loop/ModuleC.hs
+++ b/testsuite/tests/th/TH_import_loop/ModuleC.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_import_loop/TH_import_loop.T b/testsuite/tests/th/TH_import_loop/TH_import_loop.T
index ebb8a427a7..ebb8a427a7 100644
--- a/testsuite/tests/ghc-regress/th/TH_import_loop/TH_import_loop.T
+++ b/testsuite/tests/th/TH_import_loop/TH_import_loop.T
diff --git a/testsuite/tests/ghc-regress/th/TH_mkName.hs b/testsuite/tests/th/TH_mkName.hs
index 44cddc89aa..44cddc89aa 100644
--- a/testsuite/tests/ghc-regress/th/TH_mkName.hs
+++ b/testsuite/tests/th/TH_mkName.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_ppr1.hs b/testsuite/tests/th/TH_ppr1.hs
index 763d7682e0..763d7682e0 100644
--- a/testsuite/tests/ghc-regress/th/TH_ppr1.hs
+++ b/testsuite/tests/th/TH_ppr1.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_ppr1.stdout b/testsuite/tests/th/TH_ppr1.stdout
index 291d0bf748..291d0bf748 100644
--- a/testsuite/tests/ghc-regress/th/TH_ppr1.stdout
+++ b/testsuite/tests/th/TH_ppr1.stdout
diff --git a/testsuite/tests/ghc-regress/th/TH_pragma.hs b/testsuite/tests/th/TH_pragma.hs
index a78b5483fe..a78b5483fe 100644
--- a/testsuite/tests/ghc-regress/th/TH_pragma.hs
+++ b/testsuite/tests/th/TH_pragma.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_pragma.stderr b/testsuite/tests/th/TH_pragma.stderr
index 15feece963..15feece963 100644
--- a/testsuite/tests/ghc-regress/th/TH_pragma.stderr
+++ b/testsuite/tests/th/TH_pragma.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_raiseErr1.hs b/testsuite/tests/th/TH_raiseErr1.hs
index 97396f16c5..97396f16c5 100644
--- a/testsuite/tests/ghc-regress/th/TH_raiseErr1.hs
+++ b/testsuite/tests/th/TH_raiseErr1.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_recompile/Main.hs b/testsuite/tests/th/TH_recompile/Main.hs
index c4ce4a680f..c4ce4a680f 100644
--- a/testsuite/tests/ghc-regress/th/TH_recompile/Main.hs
+++ b/testsuite/tests/th/TH_recompile/Main.hs
diff --git a/testsuite/tests/th/TH_recompile/Makefile b/testsuite/tests/th/TH_recompile/Makefile
new file mode 100644
index 0000000000..87fab6348a
--- /dev/null
+++ b/testsuite/tests/th/TH_recompile/Makefile
@@ -0,0 +1,22 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+# Test for trac #481. GHC should notice that the code that generates
+# the splice has changed, and thus re-run it.
+
+clean:
+	rm -f *.o
+	rm -f hi
+	rm -f test test2
+	rm -f Sub.hs
+
+TH_recompile:
+	$(MAKE) clean
+	cp Sub1.hs Sub.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -XTemplateHaskell Main.hs -o test
+	cp Sub2.hs Sub.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make -XTemplateHaskell Main.hs -o test2
+	./test
+	./test2
+
diff --git a/testsuite/tests/ghc-regress/th/TH_recompile/Sub1.hs b/testsuite/tests/th/TH_recompile/Sub1.hs
index f52a654e44..f52a654e44 100644
--- a/testsuite/tests/ghc-regress/th/TH_recompile/Sub1.hs
+++ b/testsuite/tests/th/TH_recompile/Sub1.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_recompile/Sub2.hs b/testsuite/tests/th/TH_recompile/Sub2.hs
index 3698ec5064..3698ec5064 100644
--- a/testsuite/tests/ghc-regress/th/TH_recompile/Sub2.hs
+++ b/testsuite/tests/th/TH_recompile/Sub2.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_recompile/TH_recompile.stdout b/testsuite/tests/th/TH_recompile/TH_recompile.stdout
index 1191247b6d..1191247b6d 100644
--- a/testsuite/tests/ghc-regress/th/TH_recompile/TH_recompile.stdout
+++ b/testsuite/tests/th/TH_recompile/TH_recompile.stdout
diff --git a/testsuite/tests/ghc-regress/th/TH_recompile/all.T b/testsuite/tests/th/TH_recompile/all.T
index ecdba11c05..ecdba11c05 100644
--- a/testsuite/tests/ghc-regress/th/TH_recompile/all.T
+++ b/testsuite/tests/th/TH_recompile/all.T
diff --git a/testsuite/tests/ghc-regress/th/TH_recover.hs b/testsuite/tests/th/TH_recover.hs
index 50527da85c..50527da85c 100644
--- a/testsuite/tests/ghc-regress/th/TH_recover.hs
+++ b/testsuite/tests/th/TH_recover.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_recover.stdout b/testsuite/tests/th/TH_recover.stdout
index d00491fd7e..d00491fd7e 100644
--- a/testsuite/tests/ghc-regress/th/TH_recover.stdout
+++ b/testsuite/tests/th/TH_recover.stdout
diff --git a/testsuite/tests/ghc-regress/th/TH_reifyDecl1.hs b/testsuite/tests/th/TH_reifyDecl1.hs
index dfd05187ba..dfd05187ba 100644
--- a/testsuite/tests/ghc-regress/th/TH_reifyDecl1.hs
+++ b/testsuite/tests/th/TH_reifyDecl1.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_reifyDecl1.stderr b/testsuite/tests/th/TH_reifyDecl1.stderr
index cf4b92d33b..cf4b92d33b 100644
--- a/testsuite/tests/ghc-regress/th/TH_reifyDecl1.stderr
+++ b/testsuite/tests/th/TH_reifyDecl1.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_reifyDecl2.hs b/testsuite/tests/th/TH_reifyDecl2.hs
index 44c14e0247..44c14e0247 100644
--- a/testsuite/tests/ghc-regress/th/TH_reifyDecl2.hs
+++ b/testsuite/tests/th/TH_reifyDecl2.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_reifyDecl2.stderr b/testsuite/tests/th/TH_reifyDecl2.stderr
index 1beab4d9c3..1beab4d9c3 100644
--- a/testsuite/tests/ghc-regress/th/TH_reifyDecl2.stderr
+++ b/testsuite/tests/th/TH_reifyDecl2.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_reifyMkName.hs b/testsuite/tests/th/TH_reifyMkName.hs
index c5d5ebeea9..c5d5ebeea9 100644
--- a/testsuite/tests/ghc-regress/th/TH_reifyMkName.hs
+++ b/testsuite/tests/th/TH_reifyMkName.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_reifyMkName.stderr b/testsuite/tests/th/TH_reifyMkName.stderr
index 0537f1ddcf..0537f1ddcf 100644
--- a/testsuite/tests/ghc-regress/th/TH_reifyMkName.stderr
+++ b/testsuite/tests/th/TH_reifyMkName.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_reifyType1.hs b/testsuite/tests/th/TH_reifyType1.hs
index d8b45db271..d8b45db271 100644
--- a/testsuite/tests/ghc-regress/th/TH_reifyType1.hs
+++ b/testsuite/tests/th/TH_reifyType1.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_reifyType2.hs b/testsuite/tests/th/TH_reifyType2.hs
index 85615b5382..85615b5382 100644
--- a/testsuite/tests/ghc-regress/th/TH_reifyType2.hs
+++ b/testsuite/tests/th/TH_reifyType2.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_repE1.hs b/testsuite/tests/th/TH_repE1.hs
index 1938a9bdc3..1938a9bdc3 100644
--- a/testsuite/tests/ghc-regress/th/TH_repE1.hs
+++ b/testsuite/tests/th/TH_repE1.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_repE2.hs b/testsuite/tests/th/TH_repE2.hs
index bc27bfeefd..bc27bfeefd 100644
--- a/testsuite/tests/ghc-regress/th/TH_repE2.hs
+++ b/testsuite/tests/th/TH_repE2.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_repE2.stdout b/testsuite/tests/th/TH_repE2.stdout
index fe25631577..fe25631577 100644
--- a/testsuite/tests/ghc-regress/th/TH_repE2.stdout
+++ b/testsuite/tests/th/TH_repE2.stdout
diff --git a/testsuite/tests/ghc-regress/th/TH_repE3.hs b/testsuite/tests/th/TH_repE3.hs
index 5f0453c1a7..5f0453c1a7 100644
--- a/testsuite/tests/ghc-regress/th/TH_repE3.hs
+++ b/testsuite/tests/th/TH_repE3.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_repGuard.hs b/testsuite/tests/th/TH_repGuard.hs
index b2ab4af6d6..b2ab4af6d6 100644
--- a/testsuite/tests/ghc-regress/th/TH_repGuard.hs
+++ b/testsuite/tests/th/TH_repGuard.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_repGuard.stderr b/testsuite/tests/th/TH_repGuard.stderr
index 896793a113..896793a113 100644
--- a/testsuite/tests/ghc-regress/th/TH_repGuard.stderr
+++ b/testsuite/tests/th/TH_repGuard.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_repGuardOutput.hs b/testsuite/tests/th/TH_repGuardOutput.hs
index 8335bf3231..8335bf3231 100644
--- a/testsuite/tests/ghc-regress/th/TH_repGuardOutput.hs
+++ b/testsuite/tests/th/TH_repGuardOutput.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_repGuardOutput.stdout b/testsuite/tests/th/TH_repGuardOutput.stdout
index 2cf95803c4..2cf95803c4 100644
--- a/testsuite/tests/ghc-regress/th/TH_repGuardOutput.stdout
+++ b/testsuite/tests/th/TH_repGuardOutput.stdout
diff --git a/testsuite/tests/ghc-regress/th/TH_repPatSig.hs b/testsuite/tests/th/TH_repPatSig.hs
index 3f504ff372..3f504ff372 100644
--- a/testsuite/tests/ghc-regress/th/TH_repPatSig.hs
+++ b/testsuite/tests/th/TH_repPatSig.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_repPatSig.stderr b/testsuite/tests/th/TH_repPatSig.stderr
index 7269068d7d..7269068d7d 100644
--- a/testsuite/tests/ghc-regress/th/TH_repPatSig.stderr
+++ b/testsuite/tests/th/TH_repPatSig.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_repPrim.hs b/testsuite/tests/th/TH_repPrim.hs
index 2be35b1424..2be35b1424 100644
--- a/testsuite/tests/ghc-regress/th/TH_repPrim.hs
+++ b/testsuite/tests/th/TH_repPrim.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_repPrim.stderr b/testsuite/tests/th/TH_repPrim.stderr
index 64df06518c..64df06518c 100644
--- a/testsuite/tests/ghc-regress/th/TH_repPrim.stderr
+++ b/testsuite/tests/th/TH_repPrim.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_repPrim2.hs b/testsuite/tests/th/TH_repPrim2.hs
index 994390a767..994390a767 100644
--- a/testsuite/tests/ghc-regress/th/TH_repPrim2.hs
+++ b/testsuite/tests/th/TH_repPrim2.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_repPrim2.stderr b/testsuite/tests/th/TH_repPrim2.stderr
index e2a9458d45..e2a9458d45 100644
--- a/testsuite/tests/ghc-regress/th/TH_repPrim2.stderr
+++ b/testsuite/tests/th/TH_repPrim2.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_repPrimOutput.hs b/testsuite/tests/th/TH_repPrimOutput.hs
index 721b15dd2c..721b15dd2c 100644
--- a/testsuite/tests/ghc-regress/th/TH_repPrimOutput.hs
+++ b/testsuite/tests/th/TH_repPrimOutput.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_repPrimOutput.stdout b/testsuite/tests/th/TH_repPrimOutput.stdout
index 0dcc51aeb6..0dcc51aeb6 100644
--- a/testsuite/tests/ghc-regress/th/TH_repPrimOutput.stdout
+++ b/testsuite/tests/th/TH_repPrimOutput.stdout
diff --git a/testsuite/tests/ghc-regress/th/TH_repPrimOutput2.hs b/testsuite/tests/th/TH_repPrimOutput2.hs
index a7282064db..a7282064db 100644
--- a/testsuite/tests/ghc-regress/th/TH_repPrimOutput2.hs
+++ b/testsuite/tests/th/TH_repPrimOutput2.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_repPrimOutput2.stdout b/testsuite/tests/th/TH_repPrimOutput2.stdout
index 0dcc51aeb6..0dcc51aeb6 100644
--- a/testsuite/tests/ghc-regress/th/TH_repPrimOutput2.stdout
+++ b/testsuite/tests/th/TH_repPrimOutput2.stdout
diff --git a/testsuite/tests/ghc-regress/th/TH_repUnboxedTuples.hs b/testsuite/tests/th/TH_repUnboxedTuples.hs
index 30b6a5e2a8..30b6a5e2a8 100644
--- a/testsuite/tests/ghc-regress/th/TH_repUnboxedTuples.hs
+++ b/testsuite/tests/th/TH_repUnboxedTuples.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_repUnboxedTuples.stderr b/testsuite/tests/th/TH_repUnboxedTuples.stderr
index d5bfa68bec..d5bfa68bec 100644
--- a/testsuite/tests/ghc-regress/th/TH_repUnboxedTuples.stderr
+++ b/testsuite/tests/th/TH_repUnboxedTuples.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_runIO.hs b/testsuite/tests/th/TH_runIO.hs
index 7a1f4c3d70..7a1f4c3d70 100644
--- a/testsuite/tests/ghc-regress/th/TH_runIO.hs
+++ b/testsuite/tests/th/TH_runIO.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_runIO.stderr b/testsuite/tests/th/TH_runIO.stderr
index f7a536a95a..f7a536a95a 100644
--- a/testsuite/tests/ghc-regress/th/TH_runIO.stderr
+++ b/testsuite/tests/th/TH_runIO.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_scope.hs b/testsuite/tests/th/TH_scope.hs
index 7674a5d1c0..7674a5d1c0 100644
--- a/testsuite/tests/ghc-regress/th/TH_scope.hs
+++ b/testsuite/tests/th/TH_scope.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_scopedTvs.hs b/testsuite/tests/th/TH_scopedTvs.hs
index 015911fde8..015911fde8 100644
--- a/testsuite/tests/ghc-regress/th/TH_scopedTvs.hs
+++ b/testsuite/tests/th/TH_scopedTvs.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_scopedTvs.stderr b/testsuite/tests/th/TH_scopedTvs.stderr
index f8263fc28f..f8263fc28f 100644
--- a/testsuite/tests/ghc-regress/th/TH_scopedTvs.stderr
+++ b/testsuite/tests/th/TH_scopedTvs.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_sections.hs b/testsuite/tests/th/TH_sections.hs
index 26d7db41ef..26d7db41ef 100644
--- a/testsuite/tests/ghc-regress/th/TH_sections.hs
+++ b/testsuite/tests/th/TH_sections.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceD1.hs b/testsuite/tests/th/TH_spliceD1.hs
index f641874672..f641874672 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceD1.hs
+++ b/testsuite/tests/th/TH_spliceD1.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceD1.stderr b/testsuite/tests/th/TH_spliceD1.stderr
index d54ef19b88..d54ef19b88 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceD1.stderr
+++ b/testsuite/tests/th/TH_spliceD1.stderr
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceD1_Lib.hs b/testsuite/tests/th/TH_spliceD1_Lib.hs
index 47ffa4e4e6..47ffa4e4e6 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceD1_Lib.hs
+++ b/testsuite/tests/th/TH_spliceD1_Lib.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceD2.hs b/testsuite/tests/th/TH_spliceD2.hs
index f42672eda3..f42672eda3 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceD2.hs
+++ b/testsuite/tests/th/TH_spliceD2.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceD2_Lib.hs b/testsuite/tests/th/TH_spliceD2_Lib.hs
index 5a8799f4d0..5a8799f4d0 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceD2_Lib.hs
+++ b/testsuite/tests/th/TH_spliceD2_Lib.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceDecl1.hs b/testsuite/tests/th/TH_spliceDecl1.hs
index 618218d3eb..618218d3eb 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceDecl1.hs
+++ b/testsuite/tests/th/TH_spliceDecl1.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceDecl2.hs b/testsuite/tests/th/TH_spliceDecl2.hs
index e7f92d2c11..e7f92d2c11 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceDecl2.hs
+++ b/testsuite/tests/th/TH_spliceDecl2.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceDecl3.hs b/testsuite/tests/th/TH_spliceDecl3.hs
index 28ea4b6d64..28ea4b6d64 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceDecl3.hs
+++ b/testsuite/tests/th/TH_spliceDecl3.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceDecl3_Lib.hs b/testsuite/tests/th/TH_spliceDecl3_Lib.hs
index 1b8d44e781..1b8d44e781 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceDecl3_Lib.hs
+++ b/testsuite/tests/th/TH_spliceDecl3_Lib.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceDecl4.hs b/testsuite/tests/th/TH_spliceDecl4.hs
index 795ed2ae00..795ed2ae00 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceDecl4.hs
+++ b/testsuite/tests/th/TH_spliceDecl4.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceDecl4_Lib.hs b/testsuite/tests/th/TH_spliceDecl4_Lib.hs
index 104cba33c6..104cba33c6 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceDecl4_Lib.hs
+++ b/testsuite/tests/th/TH_spliceDecl4_Lib.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceE1.hs b/testsuite/tests/th/TH_spliceE1.hs
index bb12cbf277..bb12cbf277 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceE1.hs
+++ b/testsuite/tests/th/TH_spliceE1.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceE1.stdout b/testsuite/tests/th/TH_spliceE1.stdout
index 3580093b9d..3580093b9d 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceE1.stdout
+++ b/testsuite/tests/th/TH_spliceE1.stdout
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceE3.hs b/testsuite/tests/th/TH_spliceE3.hs
index c72ab79b50..c72ab79b50 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceE3.hs
+++ b/testsuite/tests/th/TH_spliceE3.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceE4.hs b/testsuite/tests/th/TH_spliceE4.hs
index 99ee7a7648..99ee7a7648 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceE4.hs
+++ b/testsuite/tests/th/TH_spliceE4.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceE4.stdout b/testsuite/tests/th/TH_spliceE4.stdout
index 4b849dbdb3..4b849dbdb3 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceE4.stdout
+++ b/testsuite/tests/th/TH_spliceE4.stdout
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceE5.hs b/testsuite/tests/th/TH_spliceE5.hs
index a8b25f0490..a8b25f0490 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceE5.hs
+++ b/testsuite/tests/th/TH_spliceE5.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceE5.stdout b/testsuite/tests/th/TH_spliceE5.stdout
index 323fae03f4..323fae03f4 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceE5.stdout
+++ b/testsuite/tests/th/TH_spliceE5.stdout
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceE5_Lib.hs b/testsuite/tests/th/TH_spliceE5_Lib.hs
index 20a9300df4..20a9300df4 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceE5_Lib.hs
+++ b/testsuite/tests/th/TH_spliceE5_Lib.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceE5_prof.hs b/testsuite/tests/th/TH_spliceE5_prof.hs
index 8c799193e5..8c799193e5 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceE5_prof.hs
+++ b/testsuite/tests/th/TH_spliceE5_prof.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceE5_prof.stdout b/testsuite/tests/th/TH_spliceE5_prof.stdout
index 323fae03f4..323fae03f4 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceE5_prof.stdout
+++ b/testsuite/tests/th/TH_spliceE5_prof.stdout
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceE5_prof_Lib.hs b/testsuite/tests/th/TH_spliceE5_prof_Lib.hs
index 1d1417e7ac..1d1417e7ac 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceE5_prof_Lib.hs
+++ b/testsuite/tests/th/TH_spliceE5_prof_Lib.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceE6.hs b/testsuite/tests/th/TH_spliceE6.hs
index 0ba1ba5fc4..0ba1ba5fc4 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceE6.hs
+++ b/testsuite/tests/th/TH_spliceE6.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceExpr1.hs b/testsuite/tests/th/TH_spliceExpr1.hs
index 1a22f6f667..1a22f6f667 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceExpr1.hs
+++ b/testsuite/tests/th/TH_spliceExpr1.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceGuard.hs b/testsuite/tests/th/TH_spliceGuard.hs
index 4c220e85b5..4c220e85b5 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceGuard.hs
+++ b/testsuite/tests/th/TH_spliceGuard.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceInst.hs b/testsuite/tests/th/TH_spliceInst.hs
index fd0918ce78..fd0918ce78 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceInst.hs
+++ b/testsuite/tests/th/TH_spliceInst.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceViewPat/A.hs b/testsuite/tests/th/TH_spliceViewPat/A.hs
index 0147d2eca2..0147d2eca2 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceViewPat/A.hs
+++ b/testsuite/tests/th/TH_spliceViewPat/A.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceViewPat/Main.hs b/testsuite/tests/th/TH_spliceViewPat/Main.hs
index 675ae99bf9..675ae99bf9 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceViewPat/Main.hs
+++ b/testsuite/tests/th/TH_spliceViewPat/Main.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceViewPat/TH_spliceViewPat.stdout b/testsuite/tests/th/TH_spliceViewPat/TH_spliceViewPat.stdout
index 4792e70f33..4792e70f33 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceViewPat/TH_spliceViewPat.stdout
+++ b/testsuite/tests/th/TH_spliceViewPat/TH_spliceViewPat.stdout
diff --git a/testsuite/tests/ghc-regress/th/TH_spliceViewPat/test.T b/testsuite/tests/th/TH_spliceViewPat/test.T
index fa50658a6b..fa50658a6b 100644
--- a/testsuite/tests/ghc-regress/th/TH_spliceViewPat/test.T
+++ b/testsuite/tests/th/TH_spliceViewPat/test.T
diff --git a/testsuite/tests/ghc-regress/th/TH_tf1.hs b/testsuite/tests/th/TH_tf1.hs
index 2b5d3f8887..2b5d3f8887 100644
--- a/testsuite/tests/ghc-regress/th/TH_tf1.hs
+++ b/testsuite/tests/th/TH_tf1.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_tf2.hs b/testsuite/tests/th/TH_tf2.hs
index 94be291324..94be291324 100644
--- a/testsuite/tests/ghc-regress/th/TH_tf2.hs
+++ b/testsuite/tests/th/TH_tf2.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_tf3.hs b/testsuite/tests/th/TH_tf3.hs
index 08e089fdf1..08e089fdf1 100644
--- a/testsuite/tests/ghc-regress/th/TH_tf3.hs
+++ b/testsuite/tests/th/TH_tf3.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_tuple1.hs b/testsuite/tests/th/TH_tuple1.hs
index c3469e4a97..c3469e4a97 100644
--- a/testsuite/tests/ghc-regress/th/TH_tuple1.hs
+++ b/testsuite/tests/th/TH_tuple1.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_unboxedSingleton.hs b/testsuite/tests/th/TH_unboxedSingleton.hs
index d932285870..d932285870 100644
--- a/testsuite/tests/ghc-regress/th/TH_unboxedSingleton.hs
+++ b/testsuite/tests/th/TH_unboxedSingleton.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_viewPatPrint.hs b/testsuite/tests/th/TH_viewPatPrint.hs
index f0ef779691..f0ef779691 100644
--- a/testsuite/tests/ghc-regress/th/TH_viewPatPrint.hs
+++ b/testsuite/tests/th/TH_viewPatPrint.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_viewPatPrint.stdout b/testsuite/tests/th/TH_viewPatPrint.stdout
index f520b23008..f520b23008 100644
--- a/testsuite/tests/ghc-regress/th/TH_viewPatPrint.stdout
+++ b/testsuite/tests/th/TH_viewPatPrint.stdout
diff --git a/testsuite/tests/ghc-regress/th/TH_where.hs b/testsuite/tests/th/TH_where.hs
index 94d8db76d4..94d8db76d4 100644
--- a/testsuite/tests/ghc-regress/th/TH_where.hs
+++ b/testsuite/tests/th/TH_where.hs
diff --git a/testsuite/tests/ghc-regress/th/TH_where.stdout b/testsuite/tests/th/TH_where.stdout
index 14c7c1a864..14c7c1a864 100644
--- a/testsuite/tests/ghc-regress/th/TH_where.stdout
+++ b/testsuite/tests/th/TH_where.stdout
diff --git a/testsuite/tests/ghc-regress/th/all.T b/testsuite/tests/th/all.T
index 7ca7f09223..7ca7f09223 100644
--- a/testsuite/tests/ghc-regress/th/all.T
+++ b/testsuite/tests/th/all.T
diff --git a/testsuite/tests/typecheck/Makefile b/testsuite/tests/typecheck/Makefile
new file mode 100644
index 0000000000..9a36a1c5fe
--- /dev/null
+++ b/testsuite/tests/typecheck/Makefile
@@ -0,0 +1,3 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/typecheck/bug1465/B1.hs b/testsuite/tests/typecheck/bug1465/B1.hs
index 146f5b0529..146f5b0529 100644
--- a/testsuite/tests/ghc-regress/typecheck/bug1465/B1.hs
+++ b/testsuite/tests/typecheck/bug1465/B1.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/bug1465/B2.hs b/testsuite/tests/typecheck/bug1465/B2.hs
index 669f9cbd2c..669f9cbd2c 100644
--- a/testsuite/tests/ghc-regress/typecheck/bug1465/B2.hs
+++ b/testsuite/tests/typecheck/bug1465/B2.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/bug1465/C.hs b/testsuite/tests/typecheck/bug1465/C.hs
index 6275ecdaaf..6275ecdaaf 100644
--- a/testsuite/tests/ghc-regress/typecheck/bug1465/C.hs
+++ b/testsuite/tests/typecheck/bug1465/C.hs
diff --git a/testsuite/tests/typecheck/bug1465/Makefile b/testsuite/tests/typecheck/bug1465/Makefile
new file mode 100644
index 0000000000..965b21e99a
--- /dev/null
+++ b/testsuite/tests/typecheck/bug1465/Makefile
@@ -0,0 +1,33 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+LOCAL_PKGCONF=local.package.conf
+
+PKG=bug1465
+
+clean:
+	rm -f v1/setup v1/Setup.o v1/Setup.hi
+	rm -f v2/setup v2/Setup.o v2/Setup.hi
+	rm -rf v1/dist v2/dist
+	rm -f *.o *.hi
+	rm -f $(LOCAL_PKGCONF)
+
+bug1465:
+	$(MAKE) clean
+	$(MAKE) prep
+	'$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(LOCAL_PKGCONF) -c C.hs || exit 0
+	$(MAKE) clean
+
+prep:
+	echo "[]" >$(LOCAL_PKGCONF)
+	$(MAKE) prep.v1
+	$(MAKE) prep.v2
+	'$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(LOCAL_PKGCONF) -c -package $(PKG)-1.0 B1.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -package-conf $(LOCAL_PKGCONF) -c -package $(PKG)-2.0 B2.hs
+
+prep.%:
+	cd $* && '$(TEST_HC)' -v0 --make -o setup Setup.hs
+	cd $* && ./setup configure -v0 --with-compiler='$(TEST_HC)' --with-ghc-pkg='$(GHC_PKG)' --package-db ../$(LOCAL_PKGCONF)
+	cd $* && ./setup build -v0
+	cd $* && ./setup register -v0 --inplace
diff --git a/testsuite/tests/ghc-regress/typecheck/bug1465/all.T b/testsuite/tests/typecheck/bug1465/all.T
index 3847d684d8..3847d684d8 100644
--- a/testsuite/tests/ghc-regress/typecheck/bug1465/all.T
+++ b/testsuite/tests/typecheck/bug1465/all.T
diff --git a/testsuite/tests/ghc-regress/typecheck/bug1465/bug1465.stderr b/testsuite/tests/typecheck/bug1465/bug1465.stderr
index 47a4d0c616..47a4d0c616 100644
--- a/testsuite/tests/ghc-regress/typecheck/bug1465/bug1465.stderr
+++ b/testsuite/tests/typecheck/bug1465/bug1465.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/bug1465/v1/A.hs b/testsuite/tests/typecheck/bug1465/v1/A.hs
index 6656b4bdfc..6656b4bdfc 100644
--- a/testsuite/tests/ghc-regress/typecheck/bug1465/v1/A.hs
+++ b/testsuite/tests/typecheck/bug1465/v1/A.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/bug1465/v1/Setup.hs b/testsuite/tests/typecheck/bug1465/v1/Setup.hs
index 6fa548caf7..6fa548caf7 100644
--- a/testsuite/tests/ghc-regress/typecheck/bug1465/v1/Setup.hs
+++ b/testsuite/tests/typecheck/bug1465/v1/Setup.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/bug1465/v1/bug1465.cabal b/testsuite/tests/typecheck/bug1465/v1/bug1465.cabal
index 542e7a67d0..542e7a67d0 100644
--- a/testsuite/tests/ghc-regress/typecheck/bug1465/v1/bug1465.cabal
+++ b/testsuite/tests/typecheck/bug1465/v1/bug1465.cabal
diff --git a/testsuite/tests/ghc-regress/typecheck/bug1465/v2/A.hs b/testsuite/tests/typecheck/bug1465/v2/A.hs
index 6656b4bdfc..6656b4bdfc 100644
--- a/testsuite/tests/ghc-regress/typecheck/bug1465/v2/A.hs
+++ b/testsuite/tests/typecheck/bug1465/v2/A.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/bug1465/v2/Setup.hs b/testsuite/tests/typecheck/bug1465/v2/Setup.hs
index 6fa548caf7..6fa548caf7 100644
--- a/testsuite/tests/ghc-regress/typecheck/bug1465/v2/Setup.hs
+++ b/testsuite/tests/typecheck/bug1465/v2/Setup.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/bug1465/v2/bug1465.cabal b/testsuite/tests/typecheck/bug1465/v2/bug1465.cabal
index a9ccededfe..a9ccededfe 100644
--- a/testsuite/tests/ghc-regress/typecheck/bug1465/v2/bug1465.cabal
+++ b/testsuite/tests/typecheck/bug1465/v2/bug1465.cabal
diff --git a/testsuite/tests/ghc-regress/typecheck/prog001/A.hs b/testsuite/tests/typecheck/prog001/A.hs
index 4cef40ee75..4cef40ee75 100644
--- a/testsuite/tests/ghc-regress/typecheck/prog001/A.hs
+++ b/testsuite/tests/typecheck/prog001/A.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/prog001/B.hs b/testsuite/tests/typecheck/prog001/B.hs
index 322a04cde7..322a04cde7 100644
--- a/testsuite/tests/ghc-regress/typecheck/prog001/B.hs
+++ b/testsuite/tests/typecheck/prog001/B.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/prog001/C.hs b/testsuite/tests/typecheck/prog001/C.hs
index 6c33aaa175..6c33aaa175 100644
--- a/testsuite/tests/ghc-regress/typecheck/prog001/C.hs
+++ b/testsuite/tests/typecheck/prog001/C.hs
diff --git a/testsuite/tests/typecheck/prog001/Makefile b/testsuite/tests/typecheck/prog001/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/typecheck/prog001/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/typecheck/prog001/test.T b/testsuite/tests/typecheck/prog001/test.T
index 09bb3f0f30..09bb3f0f30 100644
--- a/testsuite/tests/ghc-regress/typecheck/prog001/test.T
+++ b/testsuite/tests/typecheck/prog001/test.T
diff --git a/testsuite/tests/ghc-regress/typecheck/prog001/typecheck.prog001.stderr-ghc b/testsuite/tests/typecheck/prog001/typecheck.prog001.stderr-ghc
index ea4c0e88f6..ea4c0e88f6 100644
--- a/testsuite/tests/ghc-regress/typecheck/prog001/typecheck.prog001.stderr-ghc
+++ b/testsuite/tests/typecheck/prog001/typecheck.prog001.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/typecheck/prog002/A.hs b/testsuite/tests/typecheck/prog002/A.hs
index e44f619bf8..e44f619bf8 100644
--- a/testsuite/tests/ghc-regress/typecheck/prog002/A.hs
+++ b/testsuite/tests/typecheck/prog002/A.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/prog002/B.hs b/testsuite/tests/typecheck/prog002/B.hs
index 9ce85b4b7f..9ce85b4b7f 100644
--- a/testsuite/tests/ghc-regress/typecheck/prog002/B.hs
+++ b/testsuite/tests/typecheck/prog002/B.hs
diff --git a/testsuite/tests/typecheck/prog002/Makefile b/testsuite/tests/typecheck/prog002/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/typecheck/prog002/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/typecheck/prog002/test.T b/testsuite/tests/typecheck/prog002/test.T
index 24625bad04..24625bad04 100644
--- a/testsuite/tests/ghc-regress/typecheck/prog002/test.T
+++ b/testsuite/tests/typecheck/prog002/test.T
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/FD1.hs b/testsuite/tests/typecheck/should_compile/FD1.hs
index 0c8942ad95..0c8942ad95 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/FD1.hs
+++ b/testsuite/tests/typecheck/should_compile/FD1.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/FD1.stderr b/testsuite/tests/typecheck/should_compile/FD1.stderr
index 6f98877b84..6f98877b84 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/FD1.stderr
+++ b/testsuite/tests/typecheck/should_compile/FD1.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/FD2.hs b/testsuite/tests/typecheck/should_compile/FD2.hs
index b4623a8743..b4623a8743 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/FD2.hs
+++ b/testsuite/tests/typecheck/should_compile/FD2.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/FD2.stderr b/testsuite/tests/typecheck/should_compile/FD2.stderr
index 618c361f49..618c361f49 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/FD2.stderr
+++ b/testsuite/tests/typecheck/should_compile/FD2.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/FD3.hs b/testsuite/tests/typecheck/should_compile/FD3.hs
index 333c0c31dd..333c0c31dd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/FD3.hs
+++ b/testsuite/tests/typecheck/should_compile/FD3.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/FD3.stderr b/testsuite/tests/typecheck/should_compile/FD3.stderr
index 5e8a4ee164..5e8a4ee164 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/FD3.stderr
+++ b/testsuite/tests/typecheck/should_compile/FD3.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/FD4.hs b/testsuite/tests/typecheck/should_compile/FD4.hs
index 5d5869ca01..5d5869ca01 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/FD4.hs
+++ b/testsuite/tests/typecheck/should_compile/FD4.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/GivenOverlapping.hs b/testsuite/tests/typecheck/should_compile/GivenOverlapping.hs
index 35f4b07962..35f4b07962 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/GivenOverlapping.hs
+++ b/testsuite/tests/typecheck/should_compile/GivenOverlapping.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/GivenTypeSynonym.hs b/testsuite/tests/typecheck/should_compile/GivenTypeSynonym.hs
index 918eb788b3..918eb788b3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/GivenTypeSynonym.hs
+++ b/testsuite/tests/typecheck/should_compile/GivenTypeSynonym.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/HasKey.hs b/testsuite/tests/typecheck/should_compile/HasKey.hs
index 8da7ee7205..8da7ee7205 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/HasKey.hs
+++ b/testsuite/tests/typecheck/should_compile/HasKey.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay1.hs b/testsuite/tests/typecheck/should_compile/LoopOfTheDay1.hs
index e3b656a66e..e3b656a66e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay1.hs
+++ b/testsuite/tests/typecheck/should_compile/LoopOfTheDay1.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay2.hs b/testsuite/tests/typecheck/should_compile/LoopOfTheDay2.hs
index 0996e7c2f2..0996e7c2f2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay2.hs
+++ b/testsuite/tests/typecheck/should_compile/LoopOfTheDay2.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay3.hs b/testsuite/tests/typecheck/should_compile/LoopOfTheDay3.hs
index dce1601a70..dce1601a70 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/LoopOfTheDay3.hs
+++ b/testsuite/tests/typecheck/should_compile/LoopOfTheDay3.hs
diff --git a/testsuite/tests/typecheck/should_compile/Makefile b/testsuite/tests/typecheck/should_compile/Makefile
new file mode 100644
index 0000000000..75691da79c
--- /dev/null
+++ b/testsuite/tests/typecheck/should_compile/Makefile
@@ -0,0 +1,26 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
+
+tc170:
+	$(RM) Tc170_Aux.hi Tc170_Aux.o tc170.hi tc170.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c Tc170_Aux.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c tc170.hs
+
+tc173:
+	$(RM) Tc173a.o Tc173a.hi Tc173b.o Tc173b.hi
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -XFlexibleInstances -XTypeSynonymInstances -XUndecidableInstances -XOverlappingInstances Tc173a.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -XUndecidableInstances -XOverlappingInstances Tc173b.hs
+
+T2412:
+	$(RM) -f T2412.hi-boot T2412.o-boot T2412A.hi T2412A.o T2412.hi T2412.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T2412.hs-boot
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T2412A.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T2412.hs
+
+tc245:
+	$(RM) -f Tc245_A.hi Tc245_A.o tc245.hi tc245.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make tc245
+	$(RM) -f tc245.hi tc245.o
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make tc245
+
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/PolyRec.hs b/testsuite/tests/typecheck/should_compile/PolyRec.hs
index ddb911553a..ddb911553a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/PolyRec.hs
+++ b/testsuite/tests/typecheck/should_compile/PolyRec.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/SilentParametersOverlapping.hs b/testsuite/tests/typecheck/should_compile/SilentParametersOverlapping.hs
index 8169c3f64a..8169c3f64a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/SilentParametersOverlapping.hs
+++ b/testsuite/tests/typecheck/should_compile/SilentParametersOverlapping.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T1123.hs b/testsuite/tests/typecheck/should_compile/T1123.hs
index a9a7d965e3..a9a7d965e3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T1123.hs
+++ b/testsuite/tests/typecheck/should_compile/T1123.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T1470.hs b/testsuite/tests/typecheck/should_compile/T1470.hs
index 8419a94627..8419a94627 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T1470.hs
+++ b/testsuite/tests/typecheck/should_compile/T1470.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T1495.hs b/testsuite/tests/typecheck/should_compile/T1495.hs
index 0de4e456de..0de4e456de 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T1495.hs
+++ b/testsuite/tests/typecheck/should_compile/T1495.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T1634.hs b/testsuite/tests/typecheck/should_compile/T1634.hs
index b4c6f2b561..b4c6f2b561 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T1634.hs
+++ b/testsuite/tests/typecheck/should_compile/T1634.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2045.hs b/testsuite/tests/typecheck/should_compile/T2045.hs
index 78b924a6ea..78b924a6ea 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2045.hs
+++ b/testsuite/tests/typecheck/should_compile/T2045.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2412.hs b/testsuite/tests/typecheck/should_compile/T2412.hs
index 509546aa5f..509546aa5f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2412.hs
+++ b/testsuite/tests/typecheck/should_compile/T2412.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2412.hs-boot b/testsuite/tests/typecheck/should_compile/T2412.hs-boot
index 3467929adc..3467929adc 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2412.hs-boot
+++ b/testsuite/tests/typecheck/should_compile/T2412.hs-boot
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2412A.hs b/testsuite/tests/typecheck/should_compile/T2412A.hs
index a3e1c579e5..a3e1c579e5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2412A.hs
+++ b/testsuite/tests/typecheck/should_compile/T2412A.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2433.hs b/testsuite/tests/typecheck/should_compile/T2433.hs
index 345c961029..345c961029 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2433.hs
+++ b/testsuite/tests/typecheck/should_compile/T2433.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2433_Help.hs b/testsuite/tests/typecheck/should_compile/T2433_Help.hs
index 7760242d4b..7760242d4b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2433_Help.hs
+++ b/testsuite/tests/typecheck/should_compile/T2433_Help.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2478.hs b/testsuite/tests/typecheck/should_compile/T2478.hs
index eec589b444..eec589b444 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2478.hs
+++ b/testsuite/tests/typecheck/should_compile/T2478.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2478.stderr b/testsuite/tests/typecheck/should_compile/T2478.stderr
index f03324cd15..f03324cd15 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2478.stderr
+++ b/testsuite/tests/typecheck/should_compile/T2478.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2494-2.hs b/testsuite/tests/typecheck/should_compile/T2494-2.hs
index 7e3bfc146b..7e3bfc146b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2494-2.hs
+++ b/testsuite/tests/typecheck/should_compile/T2494-2.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2494.hs b/testsuite/tests/typecheck/should_compile/T2494.hs
index 55d80a23eb..55d80a23eb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2494.hs
+++ b/testsuite/tests/typecheck/should_compile/T2494.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2494.stderr b/testsuite/tests/typecheck/should_compile/T2494.stderr
index b522833af2..b522833af2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2494.stderr
+++ b/testsuite/tests/typecheck/should_compile/T2494.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2497.hs b/testsuite/tests/typecheck/should_compile/T2497.hs
index 0e6ab4e9f7..0e6ab4e9f7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2497.hs
+++ b/testsuite/tests/typecheck/should_compile/T2497.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2497.stderr b/testsuite/tests/typecheck/should_compile/T2497.stderr
index 81b8fbcbb1..81b8fbcbb1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2497.stderr
+++ b/testsuite/tests/typecheck/should_compile/T2497.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2572.hs b/testsuite/tests/typecheck/should_compile/T2572.hs
index 189055914a..189055914a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2572.hs
+++ b/testsuite/tests/typecheck/should_compile/T2572.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2683.hs b/testsuite/tests/typecheck/should_compile/T2683.hs
index 3e8e9e5892..3e8e9e5892 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2683.hs
+++ b/testsuite/tests/typecheck/should_compile/T2683.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2735.hs b/testsuite/tests/typecheck/should_compile/T2735.hs
index 81deb7dda4..81deb7dda4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2735.hs
+++ b/testsuite/tests/typecheck/should_compile/T2735.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2799.hs b/testsuite/tests/typecheck/should_compile/T2799.hs
index 38beabdd48..38beabdd48 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2799.hs
+++ b/testsuite/tests/typecheck/should_compile/T2799.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2846.hs b/testsuite/tests/typecheck/should_compile/T2846.hs
index 43ad7510fc..43ad7510fc 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2846.hs
+++ b/testsuite/tests/typecheck/should_compile/T2846.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T2846.stderr b/testsuite/tests/typecheck/should_compile/T2846.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T2846.stderr
+++ b/testsuite/tests/typecheck/should_compile/T2846.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T3018.hs b/testsuite/tests/typecheck/should_compile/T3018.hs
index 9ef5b56e60..9ef5b56e60 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T3018.hs
+++ b/testsuite/tests/typecheck/should_compile/T3018.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T3219.hs b/testsuite/tests/typecheck/should_compile/T3219.hs
index 5c23c1727d..5c23c1727d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T3219.hs
+++ b/testsuite/tests/typecheck/should_compile/T3219.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T3342.hs b/testsuite/tests/typecheck/should_compile/T3342.hs
index 7881aadb4e..7881aadb4e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T3342.hs
+++ b/testsuite/tests/typecheck/should_compile/T3342.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T3346.hs b/testsuite/tests/typecheck/should_compile/T3346.hs
index bba57a06f9..bba57a06f9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T3346.hs
+++ b/testsuite/tests/typecheck/should_compile/T3346.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T3391.hs b/testsuite/tests/typecheck/should_compile/T3391.hs
index eb569366b5..eb569366b5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T3391.hs
+++ b/testsuite/tests/typecheck/should_compile/T3391.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T3409.hs b/testsuite/tests/typecheck/should_compile/T3409.hs
index b584fe1f1f..b584fe1f1f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T3409.hs
+++ b/testsuite/tests/typecheck/should_compile/T3409.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T3692.hs b/testsuite/tests/typecheck/should_compile/T3692.hs
index b10e184d94..b10e184d94 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T3692.hs
+++ b/testsuite/tests/typecheck/should_compile/T3692.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T3696.hs b/testsuite/tests/typecheck/should_compile/T3696.hs
index af39ee85b7..af39ee85b7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T3696.hs
+++ b/testsuite/tests/typecheck/should_compile/T3696.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T3696.stderr b/testsuite/tests/typecheck/should_compile/T3696.stderr
index 1784e53511..1784e53511 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T3696.stderr
+++ b/testsuite/tests/typecheck/should_compile/T3696.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T3955.hs b/testsuite/tests/typecheck/should_compile/T3955.hs
index 921753b80a..921753b80a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T3955.hs
+++ b/testsuite/tests/typecheck/should_compile/T3955.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T4284.hs b/testsuite/tests/typecheck/should_compile/T4284.hs
index 2d5164a487..2d5164a487 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T4284.hs
+++ b/testsuite/tests/typecheck/should_compile/T4284.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T4355.hs b/testsuite/tests/typecheck/should_compile/T4355.hs
index 8eff366cdc..8eff366cdc 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T4355.hs
+++ b/testsuite/tests/typecheck/should_compile/T4355.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T4355.stderr b/testsuite/tests/typecheck/should_compile/T4355.stderr
index af072e6867..af072e6867 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T4355.stderr
+++ b/testsuite/tests/typecheck/should_compile/T4355.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T4361.hs b/testsuite/tests/typecheck/should_compile/T4361.hs
index 19727c2e53..19727c2e53 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T4361.hs
+++ b/testsuite/tests/typecheck/should_compile/T4361.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T4401.hs b/testsuite/tests/typecheck/should_compile/T4401.hs
index 81fcf71a96..81fcf71a96 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T4401.hs
+++ b/testsuite/tests/typecheck/should_compile/T4401.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T4404.hs b/testsuite/tests/typecheck/should_compile/T4404.hs
index 894066542a..894066542a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T4404.hs
+++ b/testsuite/tests/typecheck/should_compile/T4404.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T4418.hs b/testsuite/tests/typecheck/should_compile/T4418.hs
index 9b90fd61a6..9b90fd61a6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T4418.hs
+++ b/testsuite/tests/typecheck/should_compile/T4418.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T4444.hs b/testsuite/tests/typecheck/should_compile/T4444.hs
index 5f07d5d71d..5f07d5d71d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T4444.hs
+++ b/testsuite/tests/typecheck/should_compile/T4444.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T4498.hs b/testsuite/tests/typecheck/should_compile/T4498.hs
index fb8c120601..fb8c120601 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T4498.hs
+++ b/testsuite/tests/typecheck/should_compile/T4498.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T4524.hs b/testsuite/tests/typecheck/should_compile/T4524.hs
index c59ad08b0a..c59ad08b0a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T4524.hs
+++ b/testsuite/tests/typecheck/should_compile/T4524.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T4912.hs b/testsuite/tests/typecheck/should_compile/T4912.hs
index 539ba078ee..539ba078ee 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T4912.hs
+++ b/testsuite/tests/typecheck/should_compile/T4912.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T4912.stderr b/testsuite/tests/typecheck/should_compile/T4912.stderr
index c944dc1260..c944dc1260 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T4912.stderr
+++ b/testsuite/tests/typecheck/should_compile/T4912.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T4912a.hs b/testsuite/tests/typecheck/should_compile/T4912a.hs
index 4cc1548c05..4cc1548c05 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T4912a.hs
+++ b/testsuite/tests/typecheck/should_compile/T4912a.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T4917.hs b/testsuite/tests/typecheck/should_compile/T4917.hs
index f6d51d4c27..f6d51d4c27 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T4917.hs
+++ b/testsuite/tests/typecheck/should_compile/T4917.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T4952.hs b/testsuite/tests/typecheck/should_compile/T4952.hs
index b0d2fba794..b0d2fba794 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T4952.hs
+++ b/testsuite/tests/typecheck/should_compile/T4952.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T4969.hs b/testsuite/tests/typecheck/should_compile/T4969.hs
index 084420e660..084420e660 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T4969.hs
+++ b/testsuite/tests/typecheck/should_compile/T4969.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T5051.hs b/testsuite/tests/typecheck/should_compile/T5051.hs
index e98c074c4b..e98c074c4b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T5051.hs
+++ b/testsuite/tests/typecheck/should_compile/T5051.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T5120.hs b/testsuite/tests/typecheck/should_compile/T5120.hs
index 6fe95c4516..6fe95c4516 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T5120.hs
+++ b/testsuite/tests/typecheck/should_compile/T5120.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/T700.hs b/testsuite/tests/typecheck/should_compile/T700.hs
index 9024033c29..9024033c29 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/T700.hs
+++ b/testsuite/tests/typecheck/should_compile/T700.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/Tc170_Aux.hs b/testsuite/tests/typecheck/should_compile/Tc170_Aux.hs
index c7cd186f13..c7cd186f13 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/Tc170_Aux.hs
+++ b/testsuite/tests/typecheck/should_compile/Tc170_Aux.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/Tc173a.hs b/testsuite/tests/typecheck/should_compile/Tc173a.hs
index c8a589d2b3..c8a589d2b3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/Tc173a.hs
+++ b/testsuite/tests/typecheck/should_compile/Tc173a.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/Tc173b.hs b/testsuite/tests/typecheck/should_compile/Tc173b.hs
index c98c57acd8..c98c57acd8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/Tc173b.hs
+++ b/testsuite/tests/typecheck/should_compile/Tc173b.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/Tc239_Help.hs b/testsuite/tests/typecheck/should_compile/Tc239_Help.hs
index c72acdfb11..c72acdfb11 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/Tc239_Help.hs
+++ b/testsuite/tests/typecheck/should_compile/Tc239_Help.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/Tc245_A.hs b/testsuite/tests/typecheck/should_compile/Tc245_A.hs
index 6b03118723..6b03118723 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/Tc245_A.hs
+++ b/testsuite/tests/typecheck/should_compile/Tc245_A.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index b8440458c4..b8440458c4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/faxen.hs b/testsuite/tests/typecheck/should_compile/faxen.hs
index c7310529c6..c7310529c6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/faxen.hs
+++ b/testsuite/tests/typecheck/should_compile/faxen.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/mc18.hs b/testsuite/tests/typecheck/should_compile/mc18.hs
index 82ee05e6f7..82ee05e6f7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/mc18.hs
+++ b/testsuite/tests/typecheck/should_compile/mc18.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/syn-perf.hs b/testsuite/tests/typecheck/should_compile/syn-perf.hs
index c7e2a4a0eb..c7e2a4a0eb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/syn-perf.hs
+++ b/testsuite/tests/typecheck/should_compile/syn-perf.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/syn-perf2.hs b/testsuite/tests/typecheck/should_compile/syn-perf2.hs
index 517fdb8a21..517fdb8a21 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/syn-perf2.hs
+++ b/testsuite/tests/typecheck/should_compile/syn-perf2.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc001.hs b/testsuite/tests/typecheck/should_compile/tc001.hs
index c3b0a785e2..c3b0a785e2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc001.hs
+++ b/testsuite/tests/typecheck/should_compile/tc001.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc002.hs b/testsuite/tests/typecheck/should_compile/tc002.hs
index 85f1a91e1f..85f1a91e1f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc002.hs
+++ b/testsuite/tests/typecheck/should_compile/tc002.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc003.hs b/testsuite/tests/typecheck/should_compile/tc003.hs
index 70459c3443..70459c3443 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc003.hs
+++ b/testsuite/tests/typecheck/should_compile/tc003.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc004.hs b/testsuite/tests/typecheck/should_compile/tc004.hs
index a0627302d4..a0627302d4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc004.hs
+++ b/testsuite/tests/typecheck/should_compile/tc004.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc005.hs b/testsuite/tests/typecheck/should_compile/tc005.hs
index 9d39da8912..9d39da8912 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc005.hs
+++ b/testsuite/tests/typecheck/should_compile/tc005.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc006.hs b/testsuite/tests/typecheck/should_compile/tc006.hs
index 2a22688d19..2a22688d19 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc006.hs
+++ b/testsuite/tests/typecheck/should_compile/tc006.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc007.hs b/testsuite/tests/typecheck/should_compile/tc007.hs
index c65458514b..c65458514b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc007.hs
+++ b/testsuite/tests/typecheck/should_compile/tc007.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc008.hs b/testsuite/tests/typecheck/should_compile/tc008.hs
index 236b575573..236b575573 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc008.hs
+++ b/testsuite/tests/typecheck/should_compile/tc008.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc009.hs b/testsuite/tests/typecheck/should_compile/tc009.hs
index b682a94c0d..b682a94c0d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc009.hs
+++ b/testsuite/tests/typecheck/should_compile/tc009.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc010.hs b/testsuite/tests/typecheck/should_compile/tc010.hs
index 8ec9afd3d0..8ec9afd3d0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc010.hs
+++ b/testsuite/tests/typecheck/should_compile/tc010.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc011.hs b/testsuite/tests/typecheck/should_compile/tc011.hs
index 24c5b3b91b..24c5b3b91b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc011.hs
+++ b/testsuite/tests/typecheck/should_compile/tc011.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc012.hs b/testsuite/tests/typecheck/should_compile/tc012.hs
index 6f5e954220..6f5e954220 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc012.hs
+++ b/testsuite/tests/typecheck/should_compile/tc012.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc013.hs b/testsuite/tests/typecheck/should_compile/tc013.hs
index f6a08b5e7b..f6a08b5e7b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc013.hs
+++ b/testsuite/tests/typecheck/should_compile/tc013.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc014.hs b/testsuite/tests/typecheck/should_compile/tc014.hs
index 97ce375583..97ce375583 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc014.hs
+++ b/testsuite/tests/typecheck/should_compile/tc014.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc015.hs b/testsuite/tests/typecheck/should_compile/tc015.hs
index 41c902bfc6..41c902bfc6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc015.hs
+++ b/testsuite/tests/typecheck/should_compile/tc015.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc016.hs b/testsuite/tests/typecheck/should_compile/tc016.hs
index 5f3c7e5721..5f3c7e5721 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc016.hs
+++ b/testsuite/tests/typecheck/should_compile/tc016.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc017.hs b/testsuite/tests/typecheck/should_compile/tc017.hs
index ec51aeb8d0..ec51aeb8d0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc017.hs
+++ b/testsuite/tests/typecheck/should_compile/tc017.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc018.hs b/testsuite/tests/typecheck/should_compile/tc018.hs
index 7fb398c6e6..7fb398c6e6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc018.hs
+++ b/testsuite/tests/typecheck/should_compile/tc018.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc019.hs b/testsuite/tests/typecheck/should_compile/tc019.hs
index 3cfe5ea626..3cfe5ea626 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc019.hs
+++ b/testsuite/tests/typecheck/should_compile/tc019.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc020.hs b/testsuite/tests/typecheck/should_compile/tc020.hs
index a0ef679c8f..a0ef679c8f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc020.hs
+++ b/testsuite/tests/typecheck/should_compile/tc020.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc021.hs b/testsuite/tests/typecheck/should_compile/tc021.hs
index 418fa38e29..418fa38e29 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc021.hs
+++ b/testsuite/tests/typecheck/should_compile/tc021.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc022.hs b/testsuite/tests/typecheck/should_compile/tc022.hs
index 1a04d7e7a2..1a04d7e7a2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc022.hs
+++ b/testsuite/tests/typecheck/should_compile/tc022.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc023.hs b/testsuite/tests/typecheck/should_compile/tc023.hs
index b996719bb9..b996719bb9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc023.hs
+++ b/testsuite/tests/typecheck/should_compile/tc023.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc024.hs b/testsuite/tests/typecheck/should_compile/tc024.hs
index e28d1acf96..e28d1acf96 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc024.hs
+++ b/testsuite/tests/typecheck/should_compile/tc024.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc025.hs b/testsuite/tests/typecheck/should_compile/tc025.hs
index e9adf9acb5..e9adf9acb5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc025.hs
+++ b/testsuite/tests/typecheck/should_compile/tc025.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc026.hs b/testsuite/tests/typecheck/should_compile/tc026.hs
index 3e718a5053..3e718a5053 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc026.hs
+++ b/testsuite/tests/typecheck/should_compile/tc026.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc027.hs b/testsuite/tests/typecheck/should_compile/tc027.hs
index 6edc01b619..6edc01b619 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc027.hs
+++ b/testsuite/tests/typecheck/should_compile/tc027.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc028.hs b/testsuite/tests/typecheck/should_compile/tc028.hs
index 49a0835ade..49a0835ade 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc028.hs
+++ b/testsuite/tests/typecheck/should_compile/tc028.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc029.hs b/testsuite/tests/typecheck/should_compile/tc029.hs
index c44b78f79f..c44b78f79f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc029.hs
+++ b/testsuite/tests/typecheck/should_compile/tc029.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc030.hs b/testsuite/tests/typecheck/should_compile/tc030.hs
index 004bc226d1..004bc226d1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc030.hs
+++ b/testsuite/tests/typecheck/should_compile/tc030.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc031.hs b/testsuite/tests/typecheck/should_compile/tc031.hs
index c55bf11f54..c55bf11f54 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc031.hs
+++ b/testsuite/tests/typecheck/should_compile/tc031.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc032.hs b/testsuite/tests/typecheck/should_compile/tc032.hs
index 9c43bbb010..9c43bbb010 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc032.hs
+++ b/testsuite/tests/typecheck/should_compile/tc032.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc033.hs b/testsuite/tests/typecheck/should_compile/tc033.hs
index 7111d75a4e..7111d75a4e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc033.hs
+++ b/testsuite/tests/typecheck/should_compile/tc033.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc034.hs b/testsuite/tests/typecheck/should_compile/tc034.hs
index 0e7c4a66ed..0e7c4a66ed 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc034.hs
+++ b/testsuite/tests/typecheck/should_compile/tc034.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc035.hs b/testsuite/tests/typecheck/should_compile/tc035.hs
index b8dd554373..b8dd554373 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc035.hs
+++ b/testsuite/tests/typecheck/should_compile/tc035.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc036.hs b/testsuite/tests/typecheck/should_compile/tc036.hs
index 05b87846ac..05b87846ac 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc036.hs
+++ b/testsuite/tests/typecheck/should_compile/tc036.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc037.hs b/testsuite/tests/typecheck/should_compile/tc037.hs
index 8621b278d3..8621b278d3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc037.hs
+++ b/testsuite/tests/typecheck/should_compile/tc037.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc038.hs b/testsuite/tests/typecheck/should_compile/tc038.hs
index d404ee6913..d404ee6913 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc038.hs
+++ b/testsuite/tests/typecheck/should_compile/tc038.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc039.hs b/testsuite/tests/typecheck/should_compile/tc039.hs
index 05b87846ac..05b87846ac 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc039.hs
+++ b/testsuite/tests/typecheck/should_compile/tc039.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc040.hs b/testsuite/tests/typecheck/should_compile/tc040.hs
index 4897a2b9b3..4897a2b9b3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc040.hs
+++ b/testsuite/tests/typecheck/should_compile/tc040.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc041.hs b/testsuite/tests/typecheck/should_compile/tc041.hs
index b42374f5e2..b42374f5e2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc041.hs
+++ b/testsuite/tests/typecheck/should_compile/tc041.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc042.hs b/testsuite/tests/typecheck/should_compile/tc042.hs
index 58a120c13b..58a120c13b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc042.hs
+++ b/testsuite/tests/typecheck/should_compile/tc042.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc043.hs b/testsuite/tests/typecheck/should_compile/tc043.hs
index 2a2e5f050c..2a2e5f050c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc043.hs
+++ b/testsuite/tests/typecheck/should_compile/tc043.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc044.hs b/testsuite/tests/typecheck/should_compile/tc044.hs
index 84c91d19fd..84c91d19fd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc044.hs
+++ b/testsuite/tests/typecheck/should_compile/tc044.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc045.hs b/testsuite/tests/typecheck/should_compile/tc045.hs
index 4ff3766673..4ff3766673 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc045.hs
+++ b/testsuite/tests/typecheck/should_compile/tc045.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc046.hs b/testsuite/tests/typecheck/should_compile/tc046.hs
index c1ae30c96c..c1ae30c96c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc046.hs
+++ b/testsuite/tests/typecheck/should_compile/tc046.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc047.hs b/testsuite/tests/typecheck/should_compile/tc047.hs
index b8c197d185..b8c197d185 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc047.hs
+++ b/testsuite/tests/typecheck/should_compile/tc047.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc048.hs b/testsuite/tests/typecheck/should_compile/tc048.hs
index eea6f10e79..eea6f10e79 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc048.hs
+++ b/testsuite/tests/typecheck/should_compile/tc048.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc049.hs b/testsuite/tests/typecheck/should_compile/tc049.hs
index 20be6b768b..20be6b768b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc049.hs
+++ b/testsuite/tests/typecheck/should_compile/tc049.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc050.hs b/testsuite/tests/typecheck/should_compile/tc050.hs
index ef03b282d9..ef03b282d9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc050.hs
+++ b/testsuite/tests/typecheck/should_compile/tc050.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc051.hs b/testsuite/tests/typecheck/should_compile/tc051.hs
index 7f14282fb8..7f14282fb8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc051.hs
+++ b/testsuite/tests/typecheck/should_compile/tc051.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc052.hs b/testsuite/tests/typecheck/should_compile/tc052.hs
index 108ef12046..108ef12046 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc052.hs
+++ b/testsuite/tests/typecheck/should_compile/tc052.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc053.hs b/testsuite/tests/typecheck/should_compile/tc053.hs
index 865211d917..865211d917 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc053.hs
+++ b/testsuite/tests/typecheck/should_compile/tc053.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc054.hs b/testsuite/tests/typecheck/should_compile/tc054.hs
index df9deb08aa..df9deb08aa 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc054.hs
+++ b/testsuite/tests/typecheck/should_compile/tc054.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc055.hs b/testsuite/tests/typecheck/should_compile/tc055.hs
index cdbb8f4b4d..cdbb8f4b4d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc055.hs
+++ b/testsuite/tests/typecheck/should_compile/tc055.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc056.hs b/testsuite/tests/typecheck/should_compile/tc056.hs
index 64d7138571..64d7138571 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc056.hs
+++ b/testsuite/tests/typecheck/should_compile/tc056.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc056.stderr b/testsuite/tests/typecheck/should_compile/tc056.stderr
index c49396721c..c49396721c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc056.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc056.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc057.hs b/testsuite/tests/typecheck/should_compile/tc057.hs
index cc561b95b8..cc561b95b8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc057.hs
+++ b/testsuite/tests/typecheck/should_compile/tc057.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc058.hs b/testsuite/tests/typecheck/should_compile/tc058.hs
index 7df1f3bc6d..7df1f3bc6d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc058.hs
+++ b/testsuite/tests/typecheck/should_compile/tc058.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc059.hs b/testsuite/tests/typecheck/should_compile/tc059.hs
index f0faac8155..f0faac8155 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc059.hs
+++ b/testsuite/tests/typecheck/should_compile/tc059.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc060.hs b/testsuite/tests/typecheck/should_compile/tc060.hs
index 6ae0ca9228..6ae0ca9228 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc060.hs
+++ b/testsuite/tests/typecheck/should_compile/tc060.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc061.hs b/testsuite/tests/typecheck/should_compile/tc061.hs
index 25a8b65f35..25a8b65f35 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc061.hs
+++ b/testsuite/tests/typecheck/should_compile/tc061.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc062.hs b/testsuite/tests/typecheck/should_compile/tc062.hs
index fde6c4b1da..fde6c4b1da 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc062.hs
+++ b/testsuite/tests/typecheck/should_compile/tc062.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc063.hs b/testsuite/tests/typecheck/should_compile/tc063.hs
index 36affbfdce..36affbfdce 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc063.hs
+++ b/testsuite/tests/typecheck/should_compile/tc063.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc064.hs b/testsuite/tests/typecheck/should_compile/tc064.hs
index 18aecb091d..18aecb091d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc064.hs
+++ b/testsuite/tests/typecheck/should_compile/tc064.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc065.hs b/testsuite/tests/typecheck/should_compile/tc065.hs
index 1d47cf35c4..1d47cf35c4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc065.hs
+++ b/testsuite/tests/typecheck/should_compile/tc065.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc066.hs b/testsuite/tests/typecheck/should_compile/tc066.hs
index 7c929516bc..7c929516bc 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc066.hs
+++ b/testsuite/tests/typecheck/should_compile/tc066.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc067.hs b/testsuite/tests/typecheck/should_compile/tc067.hs
index 853caf308f..853caf308f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc067.hs
+++ b/testsuite/tests/typecheck/should_compile/tc067.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc068.hs b/testsuite/tests/typecheck/should_compile/tc068.hs
index f455d41b6e..f455d41b6e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc068.hs
+++ b/testsuite/tests/typecheck/should_compile/tc068.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc069.hs b/testsuite/tests/typecheck/should_compile/tc069.hs
index 539b3046da..539b3046da 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc069.hs
+++ b/testsuite/tests/typecheck/should_compile/tc069.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc070.hs b/testsuite/tests/typecheck/should_compile/tc070.hs
index 831195f9f6..831195f9f6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc070.hs
+++ b/testsuite/tests/typecheck/should_compile/tc070.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc073.hs b/testsuite/tests/typecheck/should_compile/tc073.hs
index 44e4129f6a..44e4129f6a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc073.hs
+++ b/testsuite/tests/typecheck/should_compile/tc073.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc074.hs b/testsuite/tests/typecheck/should_compile/tc074.hs
index f455d41b6e..f455d41b6e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc074.hs
+++ b/testsuite/tests/typecheck/should_compile/tc074.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc076.hs b/testsuite/tests/typecheck/should_compile/tc076.hs
index 493e967efa..493e967efa 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc076.hs
+++ b/testsuite/tests/typecheck/should_compile/tc076.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc077.hs b/testsuite/tests/typecheck/should_compile/tc077.hs
index c4f6c4e986..c4f6c4e986 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc077.hs
+++ b/testsuite/tests/typecheck/should_compile/tc077.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc078.hs b/testsuite/tests/typecheck/should_compile/tc078.hs
index de5e748d20..de5e748d20 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc078.hs
+++ b/testsuite/tests/typecheck/should_compile/tc078.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc079.hs b/testsuite/tests/typecheck/should_compile/tc079.hs
index db07ad1325..db07ad1325 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc079.hs
+++ b/testsuite/tests/typecheck/should_compile/tc079.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc080.hs b/testsuite/tests/typecheck/should_compile/tc080.hs
index 636c5b0313..636c5b0313 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc080.hs
+++ b/testsuite/tests/typecheck/should_compile/tc080.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc081.hs b/testsuite/tests/typecheck/should_compile/tc081.hs
index 03be25659e..03be25659e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc081.hs
+++ b/testsuite/tests/typecheck/should_compile/tc081.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc082.hs b/testsuite/tests/typecheck/should_compile/tc082.hs
index 8ef70afd01..8ef70afd01 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc082.hs
+++ b/testsuite/tests/typecheck/should_compile/tc082.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc084.hs b/testsuite/tests/typecheck/should_compile/tc084.hs
index 597a296f90..597a296f90 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc084.hs
+++ b/testsuite/tests/typecheck/should_compile/tc084.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc085.hs b/testsuite/tests/typecheck/should_compile/tc085.hs
index 6074250a45..6074250a45 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc085.hs
+++ b/testsuite/tests/typecheck/should_compile/tc085.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc086.hs b/testsuite/tests/typecheck/should_compile/tc086.hs
index 2db3b7094c..2db3b7094c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc086.hs
+++ b/testsuite/tests/typecheck/should_compile/tc086.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc087.hs b/testsuite/tests/typecheck/should_compile/tc087.hs
index 88317bad35..88317bad35 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc087.hs
+++ b/testsuite/tests/typecheck/should_compile/tc087.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc088.hs b/testsuite/tests/typecheck/should_compile/tc088.hs
index 05faeae482..05faeae482 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc088.hs
+++ b/testsuite/tests/typecheck/should_compile/tc088.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc089.hs b/testsuite/tests/typecheck/should_compile/tc089.hs
index b2516df0ad..b2516df0ad 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc089.hs
+++ b/testsuite/tests/typecheck/should_compile/tc089.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc090.hs b/testsuite/tests/typecheck/should_compile/tc090.hs
index f568c390a5..f568c390a5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc090.hs
+++ b/testsuite/tests/typecheck/should_compile/tc090.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc091.hs b/testsuite/tests/typecheck/should_compile/tc091.hs
index 628b571c61..628b571c61 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc091.hs
+++ b/testsuite/tests/typecheck/should_compile/tc091.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc092.hs b/testsuite/tests/typecheck/should_compile/tc092.hs
index 2f129026a7..2f129026a7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc092.hs
+++ b/testsuite/tests/typecheck/should_compile/tc092.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc093.hs b/testsuite/tests/typecheck/should_compile/tc093.hs
index c834428b20..c834428b20 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc093.hs
+++ b/testsuite/tests/typecheck/should_compile/tc093.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc094.hs b/testsuite/tests/typecheck/should_compile/tc094.hs
index 334c34cf18..334c34cf18 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc094.hs
+++ b/testsuite/tests/typecheck/should_compile/tc094.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc095.hs b/testsuite/tests/typecheck/should_compile/tc095.hs
index 5e0a34d912..5e0a34d912 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc095.hs
+++ b/testsuite/tests/typecheck/should_compile/tc095.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc096.hs b/testsuite/tests/typecheck/should_compile/tc096.hs
index 165c5bd636..165c5bd636 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc096.hs
+++ b/testsuite/tests/typecheck/should_compile/tc096.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc097.hs b/testsuite/tests/typecheck/should_compile/tc097.hs
index a65d529dd3..a65d529dd3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc097.hs
+++ b/testsuite/tests/typecheck/should_compile/tc097.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc098.hs b/testsuite/tests/typecheck/should_compile/tc098.hs
index f870caa0e7..f870caa0e7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc098.hs
+++ b/testsuite/tests/typecheck/should_compile/tc098.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc099.hs b/testsuite/tests/typecheck/should_compile/tc099.hs
index 367789a4c7..367789a4c7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc099.hs
+++ b/testsuite/tests/typecheck/should_compile/tc099.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc100.hs b/testsuite/tests/typecheck/should_compile/tc100.hs
index 06f34750e1..06f34750e1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc100.hs
+++ b/testsuite/tests/typecheck/should_compile/tc100.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc101.hs b/testsuite/tests/typecheck/should_compile/tc101.hs
index 7ae95d53f5..7ae95d53f5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc101.hs
+++ b/testsuite/tests/typecheck/should_compile/tc101.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc102.hs b/testsuite/tests/typecheck/should_compile/tc102.hs
index c71b2d0ec0..c71b2d0ec0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc102.hs
+++ b/testsuite/tests/typecheck/should_compile/tc102.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc104.hs b/testsuite/tests/typecheck/should_compile/tc104.hs
index 25f354c42a..25f354c42a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc104.hs
+++ b/testsuite/tests/typecheck/should_compile/tc104.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc105.hs b/testsuite/tests/typecheck/should_compile/tc105.hs
index 6f35fff7fb..6f35fff7fb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc105.hs
+++ b/testsuite/tests/typecheck/should_compile/tc105.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc106.hs b/testsuite/tests/typecheck/should_compile/tc106.hs
index 565bbad9b4..565bbad9b4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc106.hs
+++ b/testsuite/tests/typecheck/should_compile/tc106.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc107.hs b/testsuite/tests/typecheck/should_compile/tc107.hs
index 75211bc584..75211bc584 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc107.hs
+++ b/testsuite/tests/typecheck/should_compile/tc107.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc108.hs b/testsuite/tests/typecheck/should_compile/tc108.hs
index 71f5f5c07f..71f5f5c07f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc108.hs
+++ b/testsuite/tests/typecheck/should_compile/tc108.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc109.hs b/testsuite/tests/typecheck/should_compile/tc109.hs
index 0d9fdc051c..0d9fdc051c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc109.hs
+++ b/testsuite/tests/typecheck/should_compile/tc109.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc111.hs b/testsuite/tests/typecheck/should_compile/tc111.hs
index 26eb942970..26eb942970 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc111.hs
+++ b/testsuite/tests/typecheck/should_compile/tc111.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc112.hs b/testsuite/tests/typecheck/should_compile/tc112.hs
index d588d0e698..d588d0e698 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc112.hs
+++ b/testsuite/tests/typecheck/should_compile/tc112.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc113.hs b/testsuite/tests/typecheck/should_compile/tc113.hs
index 38e79743e4..38e79743e4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc113.hs
+++ b/testsuite/tests/typecheck/should_compile/tc113.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc114.hs b/testsuite/tests/typecheck/should_compile/tc114.hs
index e8c339bdf6..e8c339bdf6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc114.hs
+++ b/testsuite/tests/typecheck/should_compile/tc114.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc115.hs b/testsuite/tests/typecheck/should_compile/tc115.hs
index 139b3a5323..139b3a5323 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc115.hs
+++ b/testsuite/tests/typecheck/should_compile/tc115.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc115.stderr-ghc b/testsuite/tests/typecheck/should_compile/tc115.stderr-ghc
index b4b8dd81b1..b4b8dd81b1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc115.stderr-ghc
+++ b/testsuite/tests/typecheck/should_compile/tc115.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc116.hs b/testsuite/tests/typecheck/should_compile/tc116.hs
index eb93410bed..eb93410bed 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc116.hs
+++ b/testsuite/tests/typecheck/should_compile/tc116.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc116.stderr-ghc b/testsuite/tests/typecheck/should_compile/tc116.stderr-ghc
index 7aa90036d0..7aa90036d0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc116.stderr-ghc
+++ b/testsuite/tests/typecheck/should_compile/tc116.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc117.hs b/testsuite/tests/typecheck/should_compile/tc117.hs
index d27c2b0076..d27c2b0076 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc117.hs
+++ b/testsuite/tests/typecheck/should_compile/tc117.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc118.hs b/testsuite/tests/typecheck/should_compile/tc118.hs
index 5828a1287c..5828a1287c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc118.hs
+++ b/testsuite/tests/typecheck/should_compile/tc118.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc119.hs b/testsuite/tests/typecheck/should_compile/tc119.hs
index e29cb6a72f..e29cb6a72f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc119.hs
+++ b/testsuite/tests/typecheck/should_compile/tc119.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc120.hs b/testsuite/tests/typecheck/should_compile/tc120.hs
index 11c64d868d..11c64d868d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc120.hs
+++ b/testsuite/tests/typecheck/should_compile/tc120.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc121.hs b/testsuite/tests/typecheck/should_compile/tc121.hs
index 9f25183e7a..9f25183e7a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc121.hs
+++ b/testsuite/tests/typecheck/should_compile/tc121.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc122.hs b/testsuite/tests/typecheck/should_compile/tc122.hs
index 71315f20c8..71315f20c8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc122.hs
+++ b/testsuite/tests/typecheck/should_compile/tc122.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc123.hs b/testsuite/tests/typecheck/should_compile/tc123.hs
index fb49c91a4b..fb49c91a4b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc123.hs
+++ b/testsuite/tests/typecheck/should_compile/tc123.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc124.hs b/testsuite/tests/typecheck/should_compile/tc124.hs
index cd2362be4f..cd2362be4f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc124.hs
+++ b/testsuite/tests/typecheck/should_compile/tc124.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc125.hs b/testsuite/tests/typecheck/should_compile/tc125.hs
index 8d820ba209..8d820ba209 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc125.hs
+++ b/testsuite/tests/typecheck/should_compile/tc125.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc125.stderr-ghc b/testsuite/tests/typecheck/should_compile/tc125.stderr-ghc
index 628c5e59db..628c5e59db 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc125.stderr-ghc
+++ b/testsuite/tests/typecheck/should_compile/tc125.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc126.hs b/testsuite/tests/typecheck/should_compile/tc126.hs
index 2680ea6290..2680ea6290 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc126.hs
+++ b/testsuite/tests/typecheck/should_compile/tc126.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc126.stderr-ghc b/testsuite/tests/typecheck/should_compile/tc126.stderr-ghc
index a414a0e35a..a414a0e35a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc126.stderr-ghc
+++ b/testsuite/tests/typecheck/should_compile/tc126.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc127.hs b/testsuite/tests/typecheck/should_compile/tc127.hs
index 58ccca7a5e..58ccca7a5e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc127.hs
+++ b/testsuite/tests/typecheck/should_compile/tc127.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc128.hs b/testsuite/tests/typecheck/should_compile/tc128.hs
index 139e8e5a14..139e8e5a14 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc128.hs
+++ b/testsuite/tests/typecheck/should_compile/tc128.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc129.hs b/testsuite/tests/typecheck/should_compile/tc129.hs
index 56163ffe31..56163ffe31 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc129.hs
+++ b/testsuite/tests/typecheck/should_compile/tc129.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc130.hs b/testsuite/tests/typecheck/should_compile/tc130.hs
index da91273ff0..da91273ff0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc130.hs
+++ b/testsuite/tests/typecheck/should_compile/tc130.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc131.hs b/testsuite/tests/typecheck/should_compile/tc131.hs
index 14813edb4e..14813edb4e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc131.hs
+++ b/testsuite/tests/typecheck/should_compile/tc131.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc132.hs b/testsuite/tests/typecheck/should_compile/tc132.hs
index f32e6dc6bc..f32e6dc6bc 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc132.hs
+++ b/testsuite/tests/typecheck/should_compile/tc132.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc133.hs b/testsuite/tests/typecheck/should_compile/tc133.hs
index 8b378a4f00..8b378a4f00 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc133.hs
+++ b/testsuite/tests/typecheck/should_compile/tc133.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc134.hs b/testsuite/tests/typecheck/should_compile/tc134.hs
index 84eb75c82f..84eb75c82f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc134.hs
+++ b/testsuite/tests/typecheck/should_compile/tc134.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc134.stderr b/testsuite/tests/typecheck/should_compile/tc134.stderr
index 1bf70204eb..1bf70204eb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc134.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc134.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc135.hs b/testsuite/tests/typecheck/should_compile/tc135.hs
index 6ede73f573..6ede73f573 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc135.hs
+++ b/testsuite/tests/typecheck/should_compile/tc135.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc136.hs b/testsuite/tests/typecheck/should_compile/tc136.hs
index 044f0a75f7..044f0a75f7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc136.hs
+++ b/testsuite/tests/typecheck/should_compile/tc136.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc137.hs b/testsuite/tests/typecheck/should_compile/tc137.hs
index dce781d39b..dce781d39b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc137.hs
+++ b/testsuite/tests/typecheck/should_compile/tc137.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc140.hs b/testsuite/tests/typecheck/should_compile/tc140.hs
index 6536e3d47d..6536e3d47d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc140.hs
+++ b/testsuite/tests/typecheck/should_compile/tc140.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc141.hs b/testsuite/tests/typecheck/should_compile/tc141.hs
index c5f675000d..c5f675000d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc141.hs
+++ b/testsuite/tests/typecheck/should_compile/tc141.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc141.stderr b/testsuite/tests/typecheck/should_compile/tc141.stderr
index 2fdf1fa99c..2fdf1fa99c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc141.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc141.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc142.hs b/testsuite/tests/typecheck/should_compile/tc142.hs
index 8621710038..8621710038 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc142.hs
+++ b/testsuite/tests/typecheck/should_compile/tc142.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc143.hs b/testsuite/tests/typecheck/should_compile/tc143.hs
index 316f47aade..316f47aade 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc143.hs
+++ b/testsuite/tests/typecheck/should_compile/tc143.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc144.hs b/testsuite/tests/typecheck/should_compile/tc144.hs
index 29185c8bc4..29185c8bc4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc144.hs
+++ b/testsuite/tests/typecheck/should_compile/tc144.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc145.hs b/testsuite/tests/typecheck/should_compile/tc145.hs
index a11c5b93e5..a11c5b93e5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc145.hs
+++ b/testsuite/tests/typecheck/should_compile/tc145.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc146.hs b/testsuite/tests/typecheck/should_compile/tc146.hs
index 4f44e908cf..4f44e908cf 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc146.hs
+++ b/testsuite/tests/typecheck/should_compile/tc146.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc147.hs b/testsuite/tests/typecheck/should_compile/tc147.hs
index 1125fe7051..1125fe7051 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc147.hs
+++ b/testsuite/tests/typecheck/should_compile/tc147.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc148.hs b/testsuite/tests/typecheck/should_compile/tc148.hs
index c66f723550..c66f723550 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc148.hs
+++ b/testsuite/tests/typecheck/should_compile/tc148.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc149.hs b/testsuite/tests/typecheck/should_compile/tc149.hs
index 5813604bc3..5813604bc3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc149.hs
+++ b/testsuite/tests/typecheck/should_compile/tc149.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc150.hs b/testsuite/tests/typecheck/should_compile/tc150.hs
index 2e3b9187f0..2e3b9187f0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc150.hs
+++ b/testsuite/tests/typecheck/should_compile/tc150.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc151.hs b/testsuite/tests/typecheck/should_compile/tc151.hs
index b28900de75..b28900de75 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc151.hs
+++ b/testsuite/tests/typecheck/should_compile/tc151.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc152.hs b/testsuite/tests/typecheck/should_compile/tc152.hs
index 43f107365d..43f107365d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc152.hs
+++ b/testsuite/tests/typecheck/should_compile/tc152.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc153.hs b/testsuite/tests/typecheck/should_compile/tc153.hs
index 14ded3531a..14ded3531a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc153.hs
+++ b/testsuite/tests/typecheck/should_compile/tc153.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc154.hs b/testsuite/tests/typecheck/should_compile/tc154.hs
index d83e7a34c8..d83e7a34c8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc154.hs
+++ b/testsuite/tests/typecheck/should_compile/tc154.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc155.hs b/testsuite/tests/typecheck/should_compile/tc155.hs
index 598afc94da..598afc94da 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc155.hs
+++ b/testsuite/tests/typecheck/should_compile/tc155.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc156.hs b/testsuite/tests/typecheck/should_compile/tc156.hs
index aad75019a9..aad75019a9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc156.hs
+++ b/testsuite/tests/typecheck/should_compile/tc156.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc157.hs b/testsuite/tests/typecheck/should_compile/tc157.hs
index 5e4b711393..5e4b711393 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc157.hs
+++ b/testsuite/tests/typecheck/should_compile/tc157.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc158.hs b/testsuite/tests/typecheck/should_compile/tc158.hs
index 4414fc9c21..4414fc9c21 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc158.hs
+++ b/testsuite/tests/typecheck/should_compile/tc158.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc159.hs b/testsuite/tests/typecheck/should_compile/tc159.hs
index dbdfdc7f55..dbdfdc7f55 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc159.hs
+++ b/testsuite/tests/typecheck/should_compile/tc159.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc159.stdout b/testsuite/tests/typecheck/should_compile/tc159.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc159.stdout
+++ b/testsuite/tests/typecheck/should_compile/tc159.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc160.hs b/testsuite/tests/typecheck/should_compile/tc160.hs
index bf88fc3159..bf88fc3159 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc160.hs
+++ b/testsuite/tests/typecheck/should_compile/tc160.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc161.hs b/testsuite/tests/typecheck/should_compile/tc161.hs
index 44f41a57b4..44f41a57b4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc161.hs
+++ b/testsuite/tests/typecheck/should_compile/tc161.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc161.stderr-ghc b/testsuite/tests/typecheck/should_compile/tc161.stderr-ghc
index 81c636e698..81c636e698 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc161.stderr-ghc
+++ b/testsuite/tests/typecheck/should_compile/tc161.stderr-ghc
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc162.hs b/testsuite/tests/typecheck/should_compile/tc162.hs
index 91a3272a92..91a3272a92 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc162.hs
+++ b/testsuite/tests/typecheck/should_compile/tc162.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc162.stderr b/testsuite/tests/typecheck/should_compile/tc162.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc162.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc162.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc163.hs b/testsuite/tests/typecheck/should_compile/tc163.hs
index 21d8a72949..21d8a72949 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc163.hs
+++ b/testsuite/tests/typecheck/should_compile/tc163.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc164.hs b/testsuite/tests/typecheck/should_compile/tc164.hs
index ed6fa429aa..ed6fa429aa 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc164.hs
+++ b/testsuite/tests/typecheck/should_compile/tc164.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc165.hs b/testsuite/tests/typecheck/should_compile/tc165.hs
index ea2fa08ec1..ea2fa08ec1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc165.hs
+++ b/testsuite/tests/typecheck/should_compile/tc165.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc166.hs b/testsuite/tests/typecheck/should_compile/tc166.hs
index 2e69c3ad56..2e69c3ad56 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc166.hs
+++ b/testsuite/tests/typecheck/should_compile/tc166.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc167.hs b/testsuite/tests/typecheck/should_compile/tc167.hs
index 7a9f410d64..7a9f410d64 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc167.hs
+++ b/testsuite/tests/typecheck/should_compile/tc167.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc168.hs b/testsuite/tests/typecheck/should_compile/tc168.hs
index 10b7fb9fb8..10b7fb9fb8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc168.hs
+++ b/testsuite/tests/typecheck/should_compile/tc168.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc168.stderr b/testsuite/tests/typecheck/should_compile/tc168.stderr
index 3241e13415..3241e13415 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc168.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc168.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc169.hs b/testsuite/tests/typecheck/should_compile/tc169.hs
index 7cb9e001f5..7cb9e001f5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc169.hs
+++ b/testsuite/tests/typecheck/should_compile/tc169.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc170.hs b/testsuite/tests/typecheck/should_compile/tc170.hs
index 9e649b307b..9e649b307b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc170.hs
+++ b/testsuite/tests/typecheck/should_compile/tc170.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc171.hs b/testsuite/tests/typecheck/should_compile/tc171.hs
index a77b6f7fc5..a77b6f7fc5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc171.hs
+++ b/testsuite/tests/typecheck/should_compile/tc171.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc172.hs b/testsuite/tests/typecheck/should_compile/tc172.hs
index f744fe43d5..f744fe43d5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc172.hs
+++ b/testsuite/tests/typecheck/should_compile/tc172.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc174.hs b/testsuite/tests/typecheck/should_compile/tc174.hs
index 49f8d6aab5..49f8d6aab5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc174.hs
+++ b/testsuite/tests/typecheck/should_compile/tc174.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc175.hs b/testsuite/tests/typecheck/should_compile/tc175.hs
index 1631864d5c..1631864d5c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc175.hs
+++ b/testsuite/tests/typecheck/should_compile/tc175.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc176.hs b/testsuite/tests/typecheck/should_compile/tc176.hs
index d05ccdbe29..d05ccdbe29 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc176.hs
+++ b/testsuite/tests/typecheck/should_compile/tc176.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc177.hs b/testsuite/tests/typecheck/should_compile/tc177.hs
index 613528fef3..613528fef3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc177.hs
+++ b/testsuite/tests/typecheck/should_compile/tc177.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc178.hs b/testsuite/tests/typecheck/should_compile/tc178.hs
index 2a181208d4..2a181208d4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc178.hs
+++ b/testsuite/tests/typecheck/should_compile/tc178.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc179.hs b/testsuite/tests/typecheck/should_compile/tc179.hs
index 110950587d..110950587d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc179.hs
+++ b/testsuite/tests/typecheck/should_compile/tc179.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc180.hs b/testsuite/tests/typecheck/should_compile/tc180.hs
index 1a404ad5de..1a404ad5de 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc180.hs
+++ b/testsuite/tests/typecheck/should_compile/tc180.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc181.hs b/testsuite/tests/typecheck/should_compile/tc181.hs
index 6ccf6b90de..6ccf6b90de 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc181.hs
+++ b/testsuite/tests/typecheck/should_compile/tc181.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc182.hs b/testsuite/tests/typecheck/should_compile/tc182.hs
index f6e9164f47..f6e9164f47 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc182.hs
+++ b/testsuite/tests/typecheck/should_compile/tc182.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc182.stderr b/testsuite/tests/typecheck/should_compile/tc182.stderr
index bd8397708b..bd8397708b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc182.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc182.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc183.hs b/testsuite/tests/typecheck/should_compile/tc183.hs
index 5015af3c91..5015af3c91 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc183.hs
+++ b/testsuite/tests/typecheck/should_compile/tc183.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc184.hs b/testsuite/tests/typecheck/should_compile/tc184.hs
index 2ab4b42cdd..2ab4b42cdd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc184.hs
+++ b/testsuite/tests/typecheck/should_compile/tc184.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc185.hs b/testsuite/tests/typecheck/should_compile/tc185.hs
index e06550f63b..e06550f63b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc185.hs
+++ b/testsuite/tests/typecheck/should_compile/tc185.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc186.hs b/testsuite/tests/typecheck/should_compile/tc186.hs
index 79bd42e861..79bd42e861 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc186.hs
+++ b/testsuite/tests/typecheck/should_compile/tc186.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc187.hs b/testsuite/tests/typecheck/should_compile/tc187.hs
index 15946f8a50..15946f8a50 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc187.hs
+++ b/testsuite/tests/typecheck/should_compile/tc187.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc188.hs b/testsuite/tests/typecheck/should_compile/tc188.hs
index eaf3690ef1..eaf3690ef1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc188.hs
+++ b/testsuite/tests/typecheck/should_compile/tc188.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc189.hs b/testsuite/tests/typecheck/should_compile/tc189.hs
index 3f9a2879b0..3f9a2879b0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc189.hs
+++ b/testsuite/tests/typecheck/should_compile/tc189.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc190.hs b/testsuite/tests/typecheck/should_compile/tc190.hs
index 97413c7177..97413c7177 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc190.hs
+++ b/testsuite/tests/typecheck/should_compile/tc190.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc191.hs b/testsuite/tests/typecheck/should_compile/tc191.hs
index cf77c0505a..cf77c0505a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc191.hs
+++ b/testsuite/tests/typecheck/should_compile/tc191.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc192.hs b/testsuite/tests/typecheck/should_compile/tc192.hs
index 3337954ade..3337954ade 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc192.hs
+++ b/testsuite/tests/typecheck/should_compile/tc192.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc193.hs b/testsuite/tests/typecheck/should_compile/tc193.hs
index 54d970ebeb..54d970ebeb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc193.hs
+++ b/testsuite/tests/typecheck/should_compile/tc193.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc194.hs b/testsuite/tests/typecheck/should_compile/tc194.hs
index 07b0ed4f02..07b0ed4f02 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc194.hs
+++ b/testsuite/tests/typecheck/should_compile/tc194.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc195.hs b/testsuite/tests/typecheck/should_compile/tc195.hs
index 8eacf024ca..8eacf024ca 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc195.hs
+++ b/testsuite/tests/typecheck/should_compile/tc195.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc196.hs b/testsuite/tests/typecheck/should_compile/tc196.hs
index c34d5e7e9c..c34d5e7e9c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc196.hs
+++ b/testsuite/tests/typecheck/should_compile/tc196.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc197.hs b/testsuite/tests/typecheck/should_compile/tc197.hs
index 40b9aeca7e..40b9aeca7e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc197.hs
+++ b/testsuite/tests/typecheck/should_compile/tc197.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc198.hs b/testsuite/tests/typecheck/should_compile/tc198.hs
index e931ac5cb8..e931ac5cb8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc198.hs
+++ b/testsuite/tests/typecheck/should_compile/tc198.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc199.hs b/testsuite/tests/typecheck/should_compile/tc199.hs
index d530cfd6d0..d530cfd6d0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc199.hs
+++ b/testsuite/tests/typecheck/should_compile/tc199.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc200.hs b/testsuite/tests/typecheck/should_compile/tc200.hs
index bb6a00e1ae..bb6a00e1ae 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc200.hs
+++ b/testsuite/tests/typecheck/should_compile/tc200.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc201.hs b/testsuite/tests/typecheck/should_compile/tc201.hs
index c60aa85406..c60aa85406 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc201.hs
+++ b/testsuite/tests/typecheck/should_compile/tc201.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc202.hs b/testsuite/tests/typecheck/should_compile/tc202.hs
index 7280606388..7280606388 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc202.hs
+++ b/testsuite/tests/typecheck/should_compile/tc202.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc203.hs b/testsuite/tests/typecheck/should_compile/tc203.hs
index 2579896458..2579896458 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc203.hs
+++ b/testsuite/tests/typecheck/should_compile/tc203.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc204.hs b/testsuite/tests/typecheck/should_compile/tc204.hs
index d95fe86480..d95fe86480 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc204.hs
+++ b/testsuite/tests/typecheck/should_compile/tc204.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc205.hs b/testsuite/tests/typecheck/should_compile/tc205.hs
index 621061a3de..621061a3de 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc205.hs
+++ b/testsuite/tests/typecheck/should_compile/tc205.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc206.hs b/testsuite/tests/typecheck/should_compile/tc206.hs
index c54618950a..c54618950a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc206.hs
+++ b/testsuite/tests/typecheck/should_compile/tc206.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc207.hs b/testsuite/tests/typecheck/should_compile/tc207.hs
index a5b952176b..a5b952176b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc207.hs
+++ b/testsuite/tests/typecheck/should_compile/tc207.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc208.hs b/testsuite/tests/typecheck/should_compile/tc208.hs
index 0bfb1d4e81..0bfb1d4e81 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc208.hs
+++ b/testsuite/tests/typecheck/should_compile/tc208.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc209.hs b/testsuite/tests/typecheck/should_compile/tc209.hs
index b2073a5993..b2073a5993 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc209.hs
+++ b/testsuite/tests/typecheck/should_compile/tc209.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc210.hs b/testsuite/tests/typecheck/should_compile/tc210.hs
index a2cc717122..a2cc717122 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc210.hs
+++ b/testsuite/tests/typecheck/should_compile/tc210.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc211.hs b/testsuite/tests/typecheck/should_compile/tc211.hs
index 5bd5c34821..5bd5c34821 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc211.hs
+++ b/testsuite/tests/typecheck/should_compile/tc211.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc211.stderr b/testsuite/tests/typecheck/should_compile/tc211.stderr
index 30d986c456..30d986c456 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc211.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc211.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc212.hs b/testsuite/tests/typecheck/should_compile/tc212.hs
index ad408fbdaf..ad408fbdaf 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc212.hs
+++ b/testsuite/tests/typecheck/should_compile/tc212.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc213.hs b/testsuite/tests/typecheck/should_compile/tc213.hs
index e9e3069e7b..e9e3069e7b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc213.hs
+++ b/testsuite/tests/typecheck/should_compile/tc213.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc214.hs b/testsuite/tests/typecheck/should_compile/tc214.hs
index e631854a1e..e631854a1e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc214.hs
+++ b/testsuite/tests/typecheck/should_compile/tc214.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc215.hs b/testsuite/tests/typecheck/should_compile/tc215.hs
index bb128b7f0c..bb128b7f0c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc215.hs
+++ b/testsuite/tests/typecheck/should_compile/tc215.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc216.hs b/testsuite/tests/typecheck/should_compile/tc216.hs
index 4a23f3df7f..4a23f3df7f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc216.hs
+++ b/testsuite/tests/typecheck/should_compile/tc216.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc216.stderr b/testsuite/tests/typecheck/should_compile/tc216.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc216.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc216.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc217.hs b/testsuite/tests/typecheck/should_compile/tc217.hs
index c42c1eb33b..c42c1eb33b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc217.hs
+++ b/testsuite/tests/typecheck/should_compile/tc217.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc218.hs b/testsuite/tests/typecheck/should_compile/tc218.hs
index ea77525dfc..ea77525dfc 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc218.hs
+++ b/testsuite/tests/typecheck/should_compile/tc218.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc219.hs b/testsuite/tests/typecheck/should_compile/tc219.hs
index 638f1b6e1e..638f1b6e1e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc219.hs
+++ b/testsuite/tests/typecheck/should_compile/tc219.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc220.hs b/testsuite/tests/typecheck/should_compile/tc220.hs
index f9f5443bc0..f9f5443bc0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc220.hs
+++ b/testsuite/tests/typecheck/should_compile/tc220.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc221.hs b/testsuite/tests/typecheck/should_compile/tc221.hs
index 903b2bc3ac..903b2bc3ac 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc221.hs
+++ b/testsuite/tests/typecheck/should_compile/tc221.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc222.hs b/testsuite/tests/typecheck/should_compile/tc222.hs
index 4c418ca232..4c418ca232 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc222.hs
+++ b/testsuite/tests/typecheck/should_compile/tc222.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc223.hs b/testsuite/tests/typecheck/should_compile/tc223.hs
index bf04ba3910..bf04ba3910 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc223.hs
+++ b/testsuite/tests/typecheck/should_compile/tc223.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc224.hs b/testsuite/tests/typecheck/should_compile/tc224.hs
index 34df398e2b..34df398e2b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc224.hs
+++ b/testsuite/tests/typecheck/should_compile/tc224.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc225.hs b/testsuite/tests/typecheck/should_compile/tc225.hs
index 7c4875668b..7c4875668b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc225.hs
+++ b/testsuite/tests/typecheck/should_compile/tc225.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc226.hs b/testsuite/tests/typecheck/should_compile/tc226.hs
index 1e5e28ac5b..1e5e28ac5b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc226.hs
+++ b/testsuite/tests/typecheck/should_compile/tc226.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc227.hs b/testsuite/tests/typecheck/should_compile/tc227.hs
index 5a4736eccc..5a4736eccc 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc227.hs
+++ b/testsuite/tests/typecheck/should_compile/tc227.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc228.hs b/testsuite/tests/typecheck/should_compile/tc228.hs
index a3d1c2f464..a3d1c2f464 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc228.hs
+++ b/testsuite/tests/typecheck/should_compile/tc228.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc229.hs b/testsuite/tests/typecheck/should_compile/tc229.hs
index bf48342ee9..bf48342ee9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc229.hs
+++ b/testsuite/tests/typecheck/should_compile/tc229.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc230.hs b/testsuite/tests/typecheck/should_compile/tc230.hs
index 11877d487f..11877d487f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc230.hs
+++ b/testsuite/tests/typecheck/should_compile/tc230.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc231.hs b/testsuite/tests/typecheck/should_compile/tc231.hs
index 304748994b..304748994b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc231.hs
+++ b/testsuite/tests/typecheck/should_compile/tc231.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc231.stderr b/testsuite/tests/typecheck/should_compile/tc231.stderr
index 0d4ea6d0c3..0d4ea6d0c3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc231.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc231.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc232.hs b/testsuite/tests/typecheck/should_compile/tc232.hs
index c9f23d45d5..c9f23d45d5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc232.hs
+++ b/testsuite/tests/typecheck/should_compile/tc232.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc233.hs b/testsuite/tests/typecheck/should_compile/tc233.hs
index 6421ae7a82..6421ae7a82 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc233.hs
+++ b/testsuite/tests/typecheck/should_compile/tc233.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc234.hs b/testsuite/tests/typecheck/should_compile/tc234.hs
index 0ed46becfe..0ed46becfe 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc234.hs
+++ b/testsuite/tests/typecheck/should_compile/tc234.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc235.hs b/testsuite/tests/typecheck/should_compile/tc235.hs
index feeca6a998..feeca6a998 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc235.hs
+++ b/testsuite/tests/typecheck/should_compile/tc235.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc236.hs b/testsuite/tests/typecheck/should_compile/tc236.hs
index c555cec38a..c555cec38a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc236.hs
+++ b/testsuite/tests/typecheck/should_compile/tc236.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc237.hs b/testsuite/tests/typecheck/should_compile/tc237.hs
index 0eacf2e854..0eacf2e854 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc237.hs
+++ b/testsuite/tests/typecheck/should_compile/tc237.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc238.hs b/testsuite/tests/typecheck/should_compile/tc238.hs
index 92cbf23986..92cbf23986 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc238.hs
+++ b/testsuite/tests/typecheck/should_compile/tc238.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc239.hs b/testsuite/tests/typecheck/should_compile/tc239.hs
index 81c39b790a..81c39b790a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc239.hs
+++ b/testsuite/tests/typecheck/should_compile/tc239.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc240.hs b/testsuite/tests/typecheck/should_compile/tc240.hs
index 4d43092a44..4d43092a44 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc240.hs
+++ b/testsuite/tests/typecheck/should_compile/tc240.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc241.hs b/testsuite/tests/typecheck/should_compile/tc241.hs
index 8dca34314a..8dca34314a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc241.hs
+++ b/testsuite/tests/typecheck/should_compile/tc241.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc242.hs b/testsuite/tests/typecheck/should_compile/tc242.hs
index eda338bc8a..eda338bc8a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc242.hs
+++ b/testsuite/tests/typecheck/should_compile/tc242.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc243.hs b/testsuite/tests/typecheck/should_compile/tc243.hs
index 10bf4d1b52..10bf4d1b52 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc243.hs
+++ b/testsuite/tests/typecheck/should_compile/tc243.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc243.stderr b/testsuite/tests/typecheck/should_compile/tc243.stderr
index 10fcab9a71..10fcab9a71 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc243.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc243.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc244.hs b/testsuite/tests/typecheck/should_compile/tc244.hs
index 4c5468809a..4c5468809a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc244.hs
+++ b/testsuite/tests/typecheck/should_compile/tc244.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc245.hs b/testsuite/tests/typecheck/should_compile/tc245.hs
index abe45d9537..abe45d9537 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc245.hs
+++ b/testsuite/tests/typecheck/should_compile/tc245.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc245.stdout b/testsuite/tests/typecheck/should_compile/tc245.stdout
index 00beb40f5f..00beb40f5f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc245.stdout
+++ b/testsuite/tests/typecheck/should_compile/tc245.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc246.hs b/testsuite/tests/typecheck/should_compile/tc246.hs
index 2b9429b36b..2b9429b36b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc246.hs
+++ b/testsuite/tests/typecheck/should_compile/tc246.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc247.hs b/testsuite/tests/typecheck/should_compile/tc247.hs
index 55c23f92bd..55c23f92bd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc247.hs
+++ b/testsuite/tests/typecheck/should_compile/tc247.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc248.hs b/testsuite/tests/typecheck/should_compile/tc248.hs
index 1fde336bb0..1fde336bb0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc248.hs
+++ b/testsuite/tests/typecheck/should_compile/tc248.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/tc249.hs b/testsuite/tests/typecheck/should_compile/tc249.hs
index c16c11e118..c16c11e118 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/tc249.hs
+++ b/testsuite/tests/typecheck/should_compile/tc249.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_compile/twins.hs b/testsuite/tests/typecheck/should_compile/twins.hs
index 6e46f860db..6e46f860db 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_compile/twins.hs
+++ b/testsuite/tests/typecheck/should_compile/twins.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/FailDueToGivenOverlapping.hs b/testsuite/tests/typecheck/should_fail/FailDueToGivenOverlapping.hs
index 505eddcad1..505eddcad1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/FailDueToGivenOverlapping.hs
+++ b/testsuite/tests/typecheck/should_fail/FailDueToGivenOverlapping.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/FailDueToGivenOverlapping.stderr b/testsuite/tests/typecheck/should_fail/FailDueToGivenOverlapping.stderr
index 10db900878..10db900878 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/FailDueToGivenOverlapping.stderr
+++ b/testsuite/tests/typecheck/should_fail/FailDueToGivenOverlapping.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/FrozenErrorTests.hs b/testsuite/tests/typecheck/should_fail/FrozenErrorTests.hs
index bea5495518..bea5495518 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/FrozenErrorTests.hs
+++ b/testsuite/tests/typecheck/should_fail/FrozenErrorTests.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/FrozenErrorTests.stderr b/testsuite/tests/typecheck/should_fail/FrozenErrorTests.stderr
index de552764d1..de552764d1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/FrozenErrorTests.stderr
+++ b/testsuite/tests/typecheck/should_fail/FrozenErrorTests.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/IPFail.hs b/testsuite/tests/typecheck/should_fail/IPFail.hs
index 1c897eb8cb..1c897eb8cb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/IPFail.hs
+++ b/testsuite/tests/typecheck/should_fail/IPFail.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/IPFail.stderr b/testsuite/tests/typecheck/should_fail/IPFail.stderr
index 7d0d8980af..7d0d8980af 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/IPFail.stderr
+++ b/testsuite/tests/typecheck/should_fail/IPFail.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/LongWayOverlapping.hs b/testsuite/tests/typecheck/should_fail/LongWayOverlapping.hs
index 4a79e69ed6..4a79e69ed6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/LongWayOverlapping.hs
+++ b/testsuite/tests/typecheck/should_fail/LongWayOverlapping.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/LongWayOverlapping.stderr b/testsuite/tests/typecheck/should_fail/LongWayOverlapping.stderr
index 7cc45560c9..7cc45560c9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/LongWayOverlapping.stderr
+++ b/testsuite/tests/typecheck/should_fail/LongWayOverlapping.stderr
diff --git a/testsuite/tests/typecheck/should_fail/Makefile b/testsuite/tests/typecheck/should_fail/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/typecheck/should_fail/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/SCLoop.hs b/testsuite/tests/typecheck/should_fail/SCLoop.hs
index f3f6a20bc4..f3f6a20bc4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/SCLoop.hs
+++ b/testsuite/tests/typecheck/should_fail/SCLoop.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/SCLoop.stderr b/testsuite/tests/typecheck/should_fail/SCLoop.stderr
index 277b84a7b9..277b84a7b9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/SCLoop.stderr
+++ b/testsuite/tests/typecheck/should_fail/SCLoop.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T1595.hs b/testsuite/tests/typecheck/should_fail/T1595.hs
index fae0192c1e..fae0192c1e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T1595.hs
+++ b/testsuite/tests/typecheck/should_fail/T1595.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T1595.stderr b/testsuite/tests/typecheck/should_fail/T1595.stderr
index d3f665c15a..d3f665c15a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T1595.stderr
+++ b/testsuite/tests/typecheck/should_fail/T1595.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T1633.hs b/testsuite/tests/typecheck/should_fail/T1633.hs
index 3fff8f2540..3fff8f2540 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T1633.hs
+++ b/testsuite/tests/typecheck/should_fail/T1633.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T1633.stderr b/testsuite/tests/typecheck/should_fail/T1633.stderr
index 8b3e8fd8a2..8b3e8fd8a2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T1633.stderr
+++ b/testsuite/tests/typecheck/should_fail/T1633.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T1899.hs b/testsuite/tests/typecheck/should_fail/T1899.hs
index a49b647be7..a49b647be7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T1899.hs
+++ b/testsuite/tests/typecheck/should_fail/T1899.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T1899.stderr b/testsuite/tests/typecheck/should_fail/T1899.stderr
index 4769b2d96c..4769b2d96c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T1899.stderr
+++ b/testsuite/tests/typecheck/should_fail/T1899.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2126.hs b/testsuite/tests/typecheck/should_fail/T2126.hs
index 4ef3037512..4ef3037512 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2126.hs
+++ b/testsuite/tests/typecheck/should_fail/T2126.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2126.stderr b/testsuite/tests/typecheck/should_fail/T2126.stderr
index 2facb189a9..2facb189a9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2126.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2126.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2307.hs b/testsuite/tests/typecheck/should_fail/T2307.hs
index 321c2d5641..321c2d5641 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2307.hs
+++ b/testsuite/tests/typecheck/should_fail/T2307.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2307.stderr b/testsuite/tests/typecheck/should_fail/T2307.stderr
index 0ca572dbd1..0ca572dbd1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2307.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2307.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2414.hs b/testsuite/tests/typecheck/should_fail/T2414.hs
index fba628db27..fba628db27 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2414.hs
+++ b/testsuite/tests/typecheck/should_fail/T2414.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2414.stderr b/testsuite/tests/typecheck/should_fail/T2414.stderr
index 030bf6e52a..030bf6e52a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2414.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2414.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2538.hs b/testsuite/tests/typecheck/should_fail/T2538.hs
index 11d9c479b5..11d9c479b5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2538.hs
+++ b/testsuite/tests/typecheck/should_fail/T2538.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2538.stderr b/testsuite/tests/typecheck/should_fail/T2538.stderr
index e4e9a7551a..e4e9a7551a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2538.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2538.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2688.hs b/testsuite/tests/typecheck/should_fail/T2688.hs
index 6897e07b76..6897e07b76 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2688.hs
+++ b/testsuite/tests/typecheck/should_fail/T2688.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2688.stderr b/testsuite/tests/typecheck/should_fail/T2688.stderr
index de91620078..de91620078 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2688.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2688.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2714.hs b/testsuite/tests/typecheck/should_fail/T2714.hs
index 80f838c37c..80f838c37c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2714.hs
+++ b/testsuite/tests/typecheck/should_fail/T2714.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2714.stderr b/testsuite/tests/typecheck/should_fail/T2714.stderr
index da355fc738..da355fc738 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2714.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2714.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2806.hs b/testsuite/tests/typecheck/should_fail/T2806.hs
index a130d49528..a130d49528 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2806.hs
+++ b/testsuite/tests/typecheck/should_fail/T2806.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2806.stderr b/testsuite/tests/typecheck/should_fail/T2806.stderr
index ebbffb29eb..ebbffb29eb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2806.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2806.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2846b.hs b/testsuite/tests/typecheck/should_fail/T2846b.hs
index 87468df87e..87468df87e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2846b.hs
+++ b/testsuite/tests/typecheck/should_fail/T2846b.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2846b.stderr b/testsuite/tests/typecheck/should_fail/T2846b.stderr
index 79527c15b7..79527c15b7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2846b.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2846b.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2994.hs b/testsuite/tests/typecheck/should_fail/T2994.hs
index cd09745aba..cd09745aba 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2994.hs
+++ b/testsuite/tests/typecheck/should_fail/T2994.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T2994.stderr b/testsuite/tests/typecheck/should_fail/T2994.stderr
index 7eab543ad4..7eab543ad4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T2994.stderr
+++ b/testsuite/tests/typecheck/should_fail/T2994.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3102.hs b/testsuite/tests/typecheck/should_fail/T3102.hs
index dd5abb25e1..dd5abb25e1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3102.hs
+++ b/testsuite/tests/typecheck/should_fail/T3102.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3102.stderr b/testsuite/tests/typecheck/should_fail/T3102.stderr
index cf3483870d..cf3483870d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3102.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3102.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3155.hs b/testsuite/tests/typecheck/should_fail/T3155.hs
index 3a4c0d2f77..3a4c0d2f77 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3155.hs
+++ b/testsuite/tests/typecheck/should_fail/T3155.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3155.stderr b/testsuite/tests/typecheck/should_fail/T3155.stderr
index d26bb6dd08..d26bb6dd08 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3155.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3155.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3176.hs b/testsuite/tests/typecheck/should_fail/T3176.hs
index 0235ad712f..0235ad712f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3176.hs
+++ b/testsuite/tests/typecheck/should_fail/T3176.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3176.stderr b/testsuite/tests/typecheck/should_fail/T3176.stderr
index 393880367d..393880367d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3176.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3176.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3323.hs b/testsuite/tests/typecheck/should_fail/T3323.hs
index 22ed520806..22ed520806 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3323.hs
+++ b/testsuite/tests/typecheck/should_fail/T3323.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3323.stderr b/testsuite/tests/typecheck/should_fail/T3323.stderr
index d7c4c26681..d7c4c26681 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3323.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3323.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3406.hs b/testsuite/tests/typecheck/should_fail/T3406.hs
index 3337f3b135..3337f3b135 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3406.hs
+++ b/testsuite/tests/typecheck/should_fail/T3406.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3406.stderr b/testsuite/tests/typecheck/should_fail/T3406.stderr
index ceba706f87..ceba706f87 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3406.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3406.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3468.hs b/testsuite/tests/typecheck/should_fail/T3468.hs
index ac9aef557a..ac9aef557a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3468.hs
+++ b/testsuite/tests/typecheck/should_fail/T3468.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3468.hs-boot b/testsuite/tests/typecheck/should_fail/T3468.hs-boot
index 5c7704fab5..5c7704fab5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3468.hs-boot
+++ b/testsuite/tests/typecheck/should_fail/T3468.hs-boot
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3468.stderr b/testsuite/tests/typecheck/should_fail/T3468.stderr
index 020d10457a..020d10457a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3468.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3468.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3540.hs b/testsuite/tests/typecheck/should_fail/T3540.hs
index 364193ceb5..364193ceb5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3540.hs
+++ b/testsuite/tests/typecheck/should_fail/T3540.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3540.stderr b/testsuite/tests/typecheck/should_fail/T3540.stderr
index 8708dffa5d..8708dffa5d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3540.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3540.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3613.hs b/testsuite/tests/typecheck/should_fail/T3613.hs
index 9969d63707..9969d63707 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3613.hs
+++ b/testsuite/tests/typecheck/should_fail/T3613.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3613.stderr b/testsuite/tests/typecheck/should_fail/T3613.stderr
index feb46416df..feb46416df 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3613.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3613.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3950.hs b/testsuite/tests/typecheck/should_fail/T3950.hs
index 127a82b04b..127a82b04b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3950.hs
+++ b/testsuite/tests/typecheck/should_fail/T3950.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3950.stderr b/testsuite/tests/typecheck/should_fail/T3950.stderr
index 1c326ad43e..1c326ad43e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3950.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3950.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3966.hs b/testsuite/tests/typecheck/should_fail/T3966.hs
index 7b1184c710..7b1184c710 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3966.hs
+++ b/testsuite/tests/typecheck/should_fail/T3966.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T3966.stderr b/testsuite/tests/typecheck/should_fail/T3966.stderr
index b24087ff8b..b24087ff8b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T3966.stderr
+++ b/testsuite/tests/typecheck/should_fail/T3966.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T4875.hs b/testsuite/tests/typecheck/should_fail/T4875.hs
index 832bb1c8f5..832bb1c8f5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T4875.hs
+++ b/testsuite/tests/typecheck/should_fail/T4875.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T4875.stderr b/testsuite/tests/typecheck/should_fail/T4875.stderr
index 24c570e73b..24c570e73b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T4875.stderr
+++ b/testsuite/tests/typecheck/should_fail/T4875.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T5084.hs b/testsuite/tests/typecheck/should_fail/T5084.hs
index 0ae39fd71c..0ae39fd71c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T5084.hs
+++ b/testsuite/tests/typecheck/should_fail/T5084.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T5084.stderr b/testsuite/tests/typecheck/should_fail/T5084.stderr
index eba9426342..eba9426342 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T5084.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5084.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T5236.hs b/testsuite/tests/typecheck/should_fail/T5236.hs
index 07b31c3218..07b31c3218 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T5236.hs
+++ b/testsuite/tests/typecheck/should_fail/T5236.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T5236.stderr b/testsuite/tests/typecheck/should_fail/T5236.stderr
index 8ec3544f6a..8ec3544f6a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T5236.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5236.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T5246.hs b/testsuite/tests/typecheck/should_fail/T5246.hs
index c7b41c0492..c7b41c0492 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T5246.hs
+++ b/testsuite/tests/typecheck/should_fail/T5246.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T5246.stderr b/testsuite/tests/typecheck/should_fail/T5246.stderr
index 3886cdef07..3886cdef07 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T5246.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5246.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T5300.hs b/testsuite/tests/typecheck/should_fail/T5300.hs
index d052d84659..d052d84659 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T5300.hs
+++ b/testsuite/tests/typecheck/should_fail/T5300.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/T5300.stderr b/testsuite/tests/typecheck/should_fail/T5300.stderr
index bc3bc066b5..bc3bc066b5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/T5300.stderr
+++ b/testsuite/tests/typecheck/should_fail/T5300.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/Tcfail186_Help.hs b/testsuite/tests/typecheck/should_fail/Tcfail186_Help.hs
index bdf67f4747..bdf67f4747 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/Tcfail186_Help.hs
+++ b/testsuite/tests/typecheck/should_fail/Tcfail186_Help.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/all.T b/testsuite/tests/typecheck/should_fail/all.T
index 5ea05ef478..5ea05ef478 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/all.T
+++ b/testsuite/tests/typecheck/should_fail/all.T
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/fd-loop.hs b/testsuite/tests/typecheck/should_fail/fd-loop.hs
index 8b9a22926e..8b9a22926e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/fd-loop.hs
+++ b/testsuite/tests/typecheck/should_fail/fd-loop.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/fd-loop.stderr b/testsuite/tests/typecheck/should_fail/fd-loop.stderr
index 9f93b6d9bc..9f93b6d9bc 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/fd-loop.stderr
+++ b/testsuite/tests/typecheck/should_fail/fd-loop.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/mc19.hs b/testsuite/tests/typecheck/should_fail/mc19.hs
index f5cc693b9a..f5cc693b9a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/mc19.hs
+++ b/testsuite/tests/typecheck/should_fail/mc19.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/mc19.stderr b/testsuite/tests/typecheck/should_fail/mc19.stderr
index c7bca0afd4..c7bca0afd4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/mc19.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc19.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/mc20.hs b/testsuite/tests/typecheck/should_fail/mc20.hs
index 4dd0fe2fe5..4dd0fe2fe5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/mc20.hs
+++ b/testsuite/tests/typecheck/should_fail/mc20.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/mc20.stderr b/testsuite/tests/typecheck/should_fail/mc20.stderr
index 1214b6ac17..1214b6ac17 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/mc20.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc20.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/mc21.hs b/testsuite/tests/typecheck/should_fail/mc21.hs
index 601403a6bd..601403a6bd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/mc21.hs
+++ b/testsuite/tests/typecheck/should_fail/mc21.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/mc21.stderr b/testsuite/tests/typecheck/should_fail/mc21.stderr
index 95c077cb25..95c077cb25 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/mc21.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc21.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/mc22.hs b/testsuite/tests/typecheck/should_fail/mc22.hs
index dd8d44e6b7..dd8d44e6b7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/mc22.hs
+++ b/testsuite/tests/typecheck/should_fail/mc22.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/mc22.stderr b/testsuite/tests/typecheck/should_fail/mc22.stderr
index 96294ae693..96294ae693 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/mc22.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc22.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/mc23.hs b/testsuite/tests/typecheck/should_fail/mc23.hs
index ab6f3468a4..ab6f3468a4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/mc23.hs
+++ b/testsuite/tests/typecheck/should_fail/mc23.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/mc23.stderr b/testsuite/tests/typecheck/should_fail/mc23.stderr
index ec632f8bdb..ec632f8bdb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/mc23.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc23.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/mc24.hs b/testsuite/tests/typecheck/should_fail/mc24.hs
index 9186721229..9186721229 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/mc24.hs
+++ b/testsuite/tests/typecheck/should_fail/mc24.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/mc24.stderr b/testsuite/tests/typecheck/should_fail/mc24.stderr
index bee1592659..bee1592659 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/mc24.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc24.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/mc25.hs b/testsuite/tests/typecheck/should_fail/mc25.hs
index ecbcfde798..ecbcfde798 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/mc25.hs
+++ b/testsuite/tests/typecheck/should_fail/mc25.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/mc25.stderr b/testsuite/tests/typecheck/should_fail/mc25.stderr
index 7016fad147..7016fad147 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/mc25.stderr
+++ b/testsuite/tests/typecheck/should_fail/mc25.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail001.hs b/testsuite/tests/typecheck/should_fail/tcfail001.hs
index 4e3e13072f..4e3e13072f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail001.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail001.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail001.stderr b/testsuite/tests/typecheck/should_fail/tcfail001.stderr
index 5fadcf6271..5fadcf6271 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail001.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail001.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail001.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail001.stderr-hugs
index 7b82227ee6..7b82227ee6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail001.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail001.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail002.hs b/testsuite/tests/typecheck/should_fail/tcfail002.hs
index b1fdd165b4..b1fdd165b4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail002.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail002.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail002.stderr b/testsuite/tests/typecheck/should_fail/tcfail002.stderr
index 12a77d0cc8..12a77d0cc8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail002.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail002.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail002.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail002.stderr-hugs
index 52a41cd2e3..52a41cd2e3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail002.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail002.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail003.hs b/testsuite/tests/typecheck/should_fail/tcfail003.hs
index 8458014c1b..8458014c1b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail003.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail003.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail003.stderr b/testsuite/tests/typecheck/should_fail/tcfail003.stderr
index 62fb6a9812..62fb6a9812 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail003.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail003.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail003.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail003.stderr-hugs
index 3655bd61a7..3655bd61a7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail003.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail003.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail004.hs b/testsuite/tests/typecheck/should_fail/tcfail004.hs
index 513680bd12..513680bd12 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail004.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail004.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail004.stderr b/testsuite/tests/typecheck/should_fail/tcfail004.stderr
index 5f0408880c..5f0408880c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail004.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail004.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail004.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail004.stderr-hugs
index 90f8a8105e..90f8a8105e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail004.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail004.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail005.hs b/testsuite/tests/typecheck/should_fail/tcfail005.hs
index ca211e1216..ca211e1216 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail005.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail005.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail005.stderr b/testsuite/tests/typecheck/should_fail/tcfail005.stderr
index 8a158f5c8d..8a158f5c8d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail005.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail005.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail005.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail005.stderr-hugs
index e52ab03426..e52ab03426 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail005.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail005.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail006.hs b/testsuite/tests/typecheck/should_fail/tcfail006.hs
index 37fd1f9c35..37fd1f9c35 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail006.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail006.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail006.stderr b/testsuite/tests/typecheck/should_fail/tcfail006.stderr
index b2a3f5b04a..b2a3f5b04a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail006.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail006.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail006.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail006.stderr-hugs
index 617112e3f2..617112e3f2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail006.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail006.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail007.hs b/testsuite/tests/typecheck/should_fail/tcfail007.hs
index ee24983aff..ee24983aff 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail007.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail007.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail007.stderr b/testsuite/tests/typecheck/should_fail/tcfail007.stderr
index 3545f8644f..3545f8644f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail007.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail007.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail007.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail007.stderr-hugs
index cd78c91def..cd78c91def 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail007.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail007.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail008.hs b/testsuite/tests/typecheck/should_fail/tcfail008.hs
index dbc9d0c911..dbc9d0c911 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail008.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail008.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail008.stderr b/testsuite/tests/typecheck/should_fail/tcfail008.stderr
index 2d31ee6034..2d31ee6034 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail008.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail008.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail008.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail008.stderr-hugs
index 820654317f..820654317f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail008.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail008.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail009.hs b/testsuite/tests/typecheck/should_fail/tcfail009.hs
index e8afa0fbf7..e8afa0fbf7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail009.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail009.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail009.stderr b/testsuite/tests/typecheck/should_fail/tcfail009.stderr
index 8226c1fbdc..8226c1fbdc 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail009.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail009.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail009.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail009.stderr-hugs
index 9b02c99702..9b02c99702 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail009.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail009.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail010.hs b/testsuite/tests/typecheck/should_fail/tcfail010.hs
index 8b793355da..8b793355da 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail010.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail010.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail010.stderr b/testsuite/tests/typecheck/should_fail/tcfail010.stderr
index 34a52ed1d2..34a52ed1d2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail010.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail010.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail010.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail010.stderr-hugs
index 3cc7f66919..3cc7f66919 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail010.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail010.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail011.hs b/testsuite/tests/typecheck/should_fail/tcfail011.hs
index 89f5c4bcd1..89f5c4bcd1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail011.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail011.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail011.stderr b/testsuite/tests/typecheck/should_fail/tcfail011.stderr
index f41e3a67ce..f41e3a67ce 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail011.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail011.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail011.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail011.stderr-hugs
index d4605dd854..d4605dd854 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail011.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail011.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail012.hs b/testsuite/tests/typecheck/should_fail/tcfail012.hs
index 67e5fa0256..67e5fa0256 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail012.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail012.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail012.stderr b/testsuite/tests/typecheck/should_fail/tcfail012.stderr
index 7fe9b18d47..7fe9b18d47 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail012.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail012.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail012.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail012.stderr-hugs
index 87c9b53fd0..87c9b53fd0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail012.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail012.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail013.hs b/testsuite/tests/typecheck/should_fail/tcfail013.hs
index c9ccc52a64..c9ccc52a64 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail013.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail013.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail013.stderr b/testsuite/tests/typecheck/should_fail/tcfail013.stderr
index 439a663c5c..439a663c5c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail013.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail013.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail013.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail013.stderr-hugs
index ed08baca77..ed08baca77 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail013.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail013.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail014.hs b/testsuite/tests/typecheck/should_fail/tcfail014.hs
index 7d9169936d..7d9169936d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail014.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail014.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail014.stderr b/testsuite/tests/typecheck/should_fail/tcfail014.stderr
index d46bf92db3..d46bf92db3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail014.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail014.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail014.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail014.stderr-hugs
index 773b9ec586..773b9ec586 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail014.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail014.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail015.hs b/testsuite/tests/typecheck/should_fail/tcfail015.hs
index ae929e3973..ae929e3973 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail015.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail015.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail015.stderr b/testsuite/tests/typecheck/should_fail/tcfail015.stderr
index 52dc7956cd..52dc7956cd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail015.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail015.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail015.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail015.stderr-hugs
index 6884840cdb..6884840cdb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail015.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail015.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail016.hs b/testsuite/tests/typecheck/should_fail/tcfail016.hs
index 2dfd4a50e0..2dfd4a50e0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail016.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail016.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail016.stderr b/testsuite/tests/typecheck/should_fail/tcfail016.stderr
index 6420918b37..6420918b37 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail016.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail016.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail016.stderr-ghc-7.0 b/testsuite/tests/typecheck/should_fail/tcfail016.stderr-ghc-7.0
index 8d2b960eef..8d2b960eef 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail016.stderr-ghc-7.0
+++ b/testsuite/tests/typecheck/should_fail/tcfail016.stderr-ghc-7.0
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail016.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail016.stderr-hugs
index cfde47e2fb..cfde47e2fb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail016.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail016.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail017.hs b/testsuite/tests/typecheck/should_fail/tcfail017.hs
index db3215dc19..db3215dc19 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail017.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail017.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail017.stderr b/testsuite/tests/typecheck/should_fail/tcfail017.stderr
index 4f09814afa..4f09814afa 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail017.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail017.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail017.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail017.stderr-hugs
index a52b3c9715..a52b3c9715 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail017.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail017.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail018.hs b/testsuite/tests/typecheck/should_fail/tcfail018.hs
index 9d811dcda2..9d811dcda2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail018.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail018.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail018.stderr b/testsuite/tests/typecheck/should_fail/tcfail018.stderr
index 67ee509537..67ee509537 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail018.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail018.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail018.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail018.stderr-hugs
index 4df764f201..4df764f201 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail018.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail018.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail019.hs b/testsuite/tests/typecheck/should_fail/tcfail019.hs
index af46532f44..af46532f44 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail019.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail019.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail019.stderr b/testsuite/tests/typecheck/should_fail/tcfail019.stderr
index 0f24d012f6..0f24d012f6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail019.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail019.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail019.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail019.stderr-hugs
index 879bea35de..879bea35de 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail019.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail019.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail020.hs b/testsuite/tests/typecheck/should_fail/tcfail020.hs
index 0d3dc2594a..0d3dc2594a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail020.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail020.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail020.stderr b/testsuite/tests/typecheck/should_fail/tcfail020.stderr
index 3e0df9e42b..3e0df9e42b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail020.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail020.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail020.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail020.stderr-hugs
index 08d4e497b1..08d4e497b1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail020.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail020.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail021.hs b/testsuite/tests/typecheck/should_fail/tcfail021.hs
index af11b56df9..af11b56df9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail021.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail021.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail021.stderr b/testsuite/tests/typecheck/should_fail/tcfail021.stderr
index 5a4e8055bc..5a4e8055bc 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail021.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail021.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail021.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail021.stderr-hugs
index 948d2e7d6d..948d2e7d6d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail021.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail021.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail023.hs b/testsuite/tests/typecheck/should_fail/tcfail023.hs
index 74bcaf3a4b..74bcaf3a4b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail023.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail023.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail023.stderr b/testsuite/tests/typecheck/should_fail/tcfail023.stderr
index 96cdb4ebc0..96cdb4ebc0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail023.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail023.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail023.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail023.stderr-hugs
index 84b92be57c..84b92be57c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail023.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail023.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail025.stderr b/testsuite/tests/typecheck/should_fail/tcfail025.stderr
index 6a0f830cc4..6a0f830cc4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail025.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail025.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail026.stderr b/testsuite/tests/typecheck/should_fail/tcfail026.stderr
index 23e90f7ae4..23e90f7ae4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail026.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail026.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail027.hs b/testsuite/tests/typecheck/should_fail/tcfail027.hs
index e01f6961bd..e01f6961bd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail027.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail027.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail027.stderr b/testsuite/tests/typecheck/should_fail/tcfail027.stderr
index d51c253617..d51c253617 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail027.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail027.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail027.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail027.stderr-hugs
index fd1b771772..fd1b771772 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail027.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail027.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail028.hs b/testsuite/tests/typecheck/should_fail/tcfail028.hs
index 5f9b32c07f..5f9b32c07f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail028.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail028.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail028.stderr b/testsuite/tests/typecheck/should_fail/tcfail028.stderr
index 7ad9ecbb23..7ad9ecbb23 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail028.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail028.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail028.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail028.stderr-hugs
index a64425da98..a64425da98 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail028.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail028.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail029.hs b/testsuite/tests/typecheck/should_fail/tcfail029.hs
index 14dd2d7e6b..14dd2d7e6b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail029.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail029.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail029.stderr b/testsuite/tests/typecheck/should_fail/tcfail029.stderr
index cf83c561b9..cf83c561b9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail029.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail029.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail029.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail029.stderr-hugs
index e9a48fd076..e9a48fd076 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail029.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail029.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail030.hs b/testsuite/tests/typecheck/should_fail/tcfail030.hs
index 163c727518..163c727518 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail030.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail030.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail030.stderr b/testsuite/tests/typecheck/should_fail/tcfail030.stderr
index cb9d80959d..cb9d80959d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail030.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail030.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail031.hs b/testsuite/tests/typecheck/should_fail/tcfail031.hs
index 6b9a0de12b..6b9a0de12b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail031.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail031.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail031.stderr b/testsuite/tests/typecheck/should_fail/tcfail031.stderr
index f7fc14bb1f..f7fc14bb1f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail031.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail031.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail031.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail031.stderr-hugs
index a955d833cb..a955d833cb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail031.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail031.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail032.hs b/testsuite/tests/typecheck/should_fail/tcfail032.hs
index 5950064655..5950064655 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail032.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail032.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail032.stderr b/testsuite/tests/typecheck/should_fail/tcfail032.stderr
index 8cb4c1b99a..8cb4c1b99a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail032.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail032.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail032.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail032.stderr-hugs
index 39879dc120..39879dc120 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail032.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail032.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail033.hs b/testsuite/tests/typecheck/should_fail/tcfail033.hs
index fdc0aff8ed..fdc0aff8ed 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail033.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail033.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail033.stderr b/testsuite/tests/typecheck/should_fail/tcfail033.stderr
index 826ad4626d..826ad4626d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail033.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail033.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail033.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail033.stderr-hugs
index aed2ee660e..aed2ee660e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail033.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail033.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail034.hs b/testsuite/tests/typecheck/should_fail/tcfail034.hs
index 0bbb75fab8..0bbb75fab8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail034.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail034.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail034.stderr b/testsuite/tests/typecheck/should_fail/tcfail034.stderr
index db8e148eb9..db8e148eb9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail034.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail034.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail035.hs b/testsuite/tests/typecheck/should_fail/tcfail035.hs
index 8de67867dd..8de67867dd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail035.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail035.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail035.stderr b/testsuite/tests/typecheck/should_fail/tcfail035.stderr
index ed9efb53b0..ed9efb53b0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail035.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail035.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail035.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail035.stderr-hugs
index 4d459748ac..4d459748ac 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail035.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail035.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail036.hs b/testsuite/tests/typecheck/should_fail/tcfail036.hs
index ade1720ccc..ade1720ccc 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail036.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail036.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail036.stderr b/testsuite/tests/typecheck/should_fail/tcfail036.stderr
index 9ce51d2dd0..9ce51d2dd0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail036.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail036.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail036.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail036.stderr-hugs
index 7c418cc655..7c418cc655 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail036.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail036.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail037.hs b/testsuite/tests/typecheck/should_fail/tcfail037.hs
index d2110c755a..d2110c755a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail037.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail037.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail037.stderr b/testsuite/tests/typecheck/should_fail/tcfail037.stderr
index a6a2a5e412..a6a2a5e412 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail037.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail037.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail037.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail037.stderr-hugs
index cfd3f42a89..cfd3f42a89 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail037.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail037.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail038.hs b/testsuite/tests/typecheck/should_fail/tcfail038.hs
index 1770bde61c..1770bde61c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail038.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail038.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail038.stderr b/testsuite/tests/typecheck/should_fail/tcfail038.stderr
index 70e13f3c72..70e13f3c72 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail038.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail038.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail038.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail038.stderr-hugs
index 7e2f61b981..7e2f61b981 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail038.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail038.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail040.hs b/testsuite/tests/typecheck/should_fail/tcfail040.hs
index 8ac06b363c..8ac06b363c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail040.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail040.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail040.stderr b/testsuite/tests/typecheck/should_fail/tcfail040.stderr
index 8d30ec57a2..8d30ec57a2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail040.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail040.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail040.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail040.stderr-hugs
index 2a12f6a15b..2a12f6a15b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail040.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail040.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail042.hs b/testsuite/tests/typecheck/should_fail/tcfail042.hs
index 5fdf6c61b6..5fdf6c61b6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail042.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail042.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail042.stderr b/testsuite/tests/typecheck/should_fail/tcfail042.stderr
index ba2b83fd96..ba2b83fd96 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail042.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail042.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail042.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail042.stderr-hugs
index 87c290d829..87c290d829 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail042.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail042.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail043.hs b/testsuite/tests/typecheck/should_fail/tcfail043.hs
index 184a4e23bf..184a4e23bf 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail043.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail043.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail043.stderr b/testsuite/tests/typecheck/should_fail/tcfail043.stderr
index 7cd3faf53e..7cd3faf53e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail043.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail043.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail043.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail043.stderr-hugs
index 2153721a6d..2153721a6d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail043.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail043.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail044.hs b/testsuite/tests/typecheck/should_fail/tcfail044.hs
index b271d0f977..b271d0f977 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail044.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail044.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail044.stderr b/testsuite/tests/typecheck/should_fail/tcfail044.stderr
index 03ad2fb705..03ad2fb705 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail044.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail044.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail044.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail044.stderr-hugs
index 6fe05624cd..6fe05624cd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail044.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail044.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail046.hs b/testsuite/tests/typecheck/should_fail/tcfail046.hs
index 67225acde0..67225acde0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail046.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail046.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail046.stderr b/testsuite/tests/typecheck/should_fail/tcfail046.stderr
index 1b668d07a6..1b668d07a6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail046.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail046.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail046.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail046.stderr-hugs
index 583bd7ffd8..583bd7ffd8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail046.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail046.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail047.hs b/testsuite/tests/typecheck/should_fail/tcfail047.hs
index f3cdb19741..f3cdb19741 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail047.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail047.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail047.stderr b/testsuite/tests/typecheck/should_fail/tcfail047.stderr
index e99d9df755..e99d9df755 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail047.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail047.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail047.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail047.stderr-hugs
index 8b2a529fe8..8b2a529fe8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail047.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail047.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail048.hs b/testsuite/tests/typecheck/should_fail/tcfail048.hs
index f4400e2fa0..f4400e2fa0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail048.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail048.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail048.stderr b/testsuite/tests/typecheck/should_fail/tcfail048.stderr
index 569b85f915..569b85f915 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail048.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail048.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail048.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail048.stderr-hugs
index 8ae3da6dea..8ae3da6dea 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail048.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail048.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail049.hs b/testsuite/tests/typecheck/should_fail/tcfail049.hs
index 64dee54a5c..64dee54a5c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail049.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail049.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail049.stderr b/testsuite/tests/typecheck/should_fail/tcfail049.stderr
index 750a65bc3c..750a65bc3c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail049.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail049.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail049.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail049.stderr-hugs
index 95c25d66e3..95c25d66e3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail049.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail049.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail050.hs b/testsuite/tests/typecheck/should_fail/tcfail050.hs
index c0cee979f7..c0cee979f7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail050.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail050.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail050.stderr b/testsuite/tests/typecheck/should_fail/tcfail050.stderr
index 9115af93fb..9115af93fb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail050.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail050.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail050.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail050.stderr-hugs
index d3153a8875..d3153a8875 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail050.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail050.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail051.hs b/testsuite/tests/typecheck/should_fail/tcfail051.hs
index 1b8e251c40..1b8e251c40 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail051.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail051.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail051.stderr b/testsuite/tests/typecheck/should_fail/tcfail051.stderr
index 97d4b13a1e..97d4b13a1e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail051.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail051.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail051.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail051.stderr-hugs
index 6f6d9689cd..6f6d9689cd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail051.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail051.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail052.hs b/testsuite/tests/typecheck/should_fail/tcfail052.hs
index e9be21e6f2..e9be21e6f2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail052.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail052.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail052.stderr b/testsuite/tests/typecheck/should_fail/tcfail052.stderr
index 9ffa31c227..9ffa31c227 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail052.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail052.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail052.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail052.stderr-hugs
index 57866de750..57866de750 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail052.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail052.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail053.hs b/testsuite/tests/typecheck/should_fail/tcfail053.hs
index d13e606434..d13e606434 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail053.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail053.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail053.stderr b/testsuite/tests/typecheck/should_fail/tcfail053.stderr
index 9889c3f0f6..9889c3f0f6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail053.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail053.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail053.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail053.stderr-hugs
index 85bd6abcc6..85bd6abcc6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail053.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail053.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail054.hs b/testsuite/tests/typecheck/should_fail/tcfail054.hs
index a4e724cf18..a4e724cf18 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail054.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail054.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail054.stderr b/testsuite/tests/typecheck/should_fail/tcfail054.stderr
index 1a5cfca053..1a5cfca053 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail054.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail054.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail054.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail054.stderr-hugs
index 2a20bb69d2..2a20bb69d2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail054.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail054.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail055.hs b/testsuite/tests/typecheck/should_fail/tcfail055.hs
index f61c5a81be..f61c5a81be 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail055.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail055.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail055.stderr b/testsuite/tests/typecheck/should_fail/tcfail055.stderr
index ac012da98e..ac012da98e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail055.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail055.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail055.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail055.stderr-hugs
index c9d13c2991..c9d13c2991 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail055.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail055.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail056.hs b/testsuite/tests/typecheck/should_fail/tcfail056.hs
index a8a1315be7..a8a1315be7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail056.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail056.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail056.stderr b/testsuite/tests/typecheck/should_fail/tcfail056.stderr
index 09505ed945..09505ed945 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail056.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail056.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail056.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail056.stderr-hugs
index d1521e1a78..d1521e1a78 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail056.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail056.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail057.hs b/testsuite/tests/typecheck/should_fail/tcfail057.hs
index 9659cf0801..9659cf0801 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail057.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail057.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail057.stderr b/testsuite/tests/typecheck/should_fail/tcfail057.stderr
index d67b969f37..d67b969f37 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail057.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail057.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail057.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail057.stderr-hugs
index c18a43df4a..c18a43df4a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail057.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail057.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail058.hs b/testsuite/tests/typecheck/should_fail/tcfail058.hs
index 2763e97bc7..2763e97bc7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail058.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail058.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail058.stderr b/testsuite/tests/typecheck/should_fail/tcfail058.stderr
index 4c017c8681..4c017c8681 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail058.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail058.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail058.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail058.stderr-hugs
index dee94737b2..dee94737b2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail058.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail058.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail061.hs b/testsuite/tests/typecheck/should_fail/tcfail061.hs
index 35e502c64e..35e502c64e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail061.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail061.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail061.stderr b/testsuite/tests/typecheck/should_fail/tcfail061.stderr
index a047863e9b..a047863e9b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail061.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail061.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail061.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail061.stderr-hugs
index 47faffae38..47faffae38 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail061.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail061.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail062.hs b/testsuite/tests/typecheck/should_fail/tcfail062.hs
index f37dc1e556..f37dc1e556 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail062.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail062.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail062.stderr b/testsuite/tests/typecheck/should_fail/tcfail062.stderr
index 9ee1bb75a9..9ee1bb75a9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail062.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail062.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail062.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail062.stderr-hugs
index 261199229e..261199229e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail062.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail062.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail063.hs b/testsuite/tests/typecheck/should_fail/tcfail063.hs
index 6e012dbb24..6e012dbb24 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail063.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail063.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail063.stderr b/testsuite/tests/typecheck/should_fail/tcfail063.stderr
index 1a1ee507f5..1a1ee507f5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail063.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail063.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail063.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail063.stderr-hugs
index 3ddc482a66..3ddc482a66 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail063.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail063.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail065.hs b/testsuite/tests/typecheck/should_fail/tcfail065.hs
index 3029b1978c..3029b1978c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail065.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail065.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail065.stderr b/testsuite/tests/typecheck/should_fail/tcfail065.stderr
index 9d94b920ff..9d94b920ff 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail065.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail065.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail065.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail065.stderr-hugs
index ef6178e6f2..ef6178e6f2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail065.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail065.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail067.hs b/testsuite/tests/typecheck/should_fail/tcfail067.hs
index bcdb0c75ed..bcdb0c75ed 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail067.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail067.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail067.stderr b/testsuite/tests/typecheck/should_fail/tcfail067.stderr
index 4c69c67391..4c69c67391 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail067.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail067.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail067.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail067.stderr-hugs
index ac6853972f..ac6853972f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail067.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail067.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail068.hs b/testsuite/tests/typecheck/should_fail/tcfail068.hs
index beae0f8359..beae0f8359 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail068.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail068.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail068.stderr b/testsuite/tests/typecheck/should_fail/tcfail068.stderr
index afc671a8bf..afc671a8bf 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail068.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail068.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail069.hs b/testsuite/tests/typecheck/should_fail/tcfail069.hs
index 63684fa9db..63684fa9db 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail069.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail069.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail069.stderr b/testsuite/tests/typecheck/should_fail/tcfail069.stderr
index 4c40526b5b..4c40526b5b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail069.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail069.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail069.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail069.stderr-hugs
index 4566c1d7a5..4566c1d7a5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail069.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail069.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail070.hs b/testsuite/tests/typecheck/should_fail/tcfail070.hs
index 6cd2a28404..6cd2a28404 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail070.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail070.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail070.stderr b/testsuite/tests/typecheck/should_fail/tcfail070.stderr
index 31dd66e77f..31dd66e77f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail070.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail070.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail070.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail070.stderr-hugs
index e96e9fcf6a..e96e9fcf6a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail070.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail070.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail071.hs b/testsuite/tests/typecheck/should_fail/tcfail071.hs
index cbbd25070f..cbbd25070f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail071.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail071.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail071.stderr b/testsuite/tests/typecheck/should_fail/tcfail071.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail071.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail071.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail072.hs b/testsuite/tests/typecheck/should_fail/tcfail072.hs
index 501976e5be..501976e5be 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail072.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail072.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail072.stderr b/testsuite/tests/typecheck/should_fail/tcfail072.stderr
index 469e75849a..469e75849a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail072.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail072.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail072.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail072.stderr-hugs
index 57ea305406..57ea305406 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail072.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail072.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail073.hs b/testsuite/tests/typecheck/should_fail/tcfail073.hs
index c52d39ae08..c52d39ae08 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail073.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail073.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail073.stderr b/testsuite/tests/typecheck/should_fail/tcfail073.stderr
index 4d3bef99ac..4d3bef99ac 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail073.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail073.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail073.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail073.stderr-hugs
index 8148b896ae..8148b896ae 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail073.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail073.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail075.hs b/testsuite/tests/typecheck/should_fail/tcfail075.hs
index c14f276b2d..c14f276b2d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail075.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail075.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail075.stderr b/testsuite/tests/typecheck/should_fail/tcfail075.stderr
index 2c251a7a84..2c251a7a84 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail075.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail075.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail076.hs b/testsuite/tests/typecheck/should_fail/tcfail076.hs
index abe96c5640..abe96c5640 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail076.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail076.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail076.stderr b/testsuite/tests/typecheck/should_fail/tcfail076.stderr
index 9c380de958..9c380de958 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail076.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail076.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail076.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail076.stderr-hugs
index a4a05f09ba..a4a05f09ba 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail076.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail076.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail077.hs b/testsuite/tests/typecheck/should_fail/tcfail077.hs
index 54735b98cd..54735b98cd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail077.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail077.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail077.stderr b/testsuite/tests/typecheck/should_fail/tcfail077.stderr
index 105604f66c..105604f66c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail077.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail077.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail077.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail077.stderr-hugs
index eb9afb0826..eb9afb0826 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail077.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail077.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail078.hs b/testsuite/tests/typecheck/should_fail/tcfail078.hs
index 1054f6d3d6..1054f6d3d6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail078.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail078.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail078.stderr b/testsuite/tests/typecheck/should_fail/tcfail078.stderr
index 60636c94bf..60636c94bf 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail078.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail078.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail078.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail078.stderr-hugs
index 22a992258a..22a992258a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail078.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail078.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail079.hs b/testsuite/tests/typecheck/should_fail/tcfail079.hs
index ec42260d69..ec42260d69 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail079.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail079.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail079.stderr b/testsuite/tests/typecheck/should_fail/tcfail079.stderr
index 149f9b2171..149f9b2171 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail079.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail079.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail080.hs b/testsuite/tests/typecheck/should_fail/tcfail080.hs
index b2a62cea54..b2a62cea54 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail080.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail080.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail080.stderr b/testsuite/tests/typecheck/should_fail/tcfail080.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail080.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail080.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail080.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail080.stderr-hugs
index 790c9b97fa..790c9b97fa 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail080.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail080.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail082.hs b/testsuite/tests/typecheck/should_fail/tcfail082.hs
index 2d4307acb1..2d4307acb1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail082.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail082.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail082.stderr b/testsuite/tests/typecheck/should_fail/tcfail082.stderr
index 4fd34e6022..4fd34e6022 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail082.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail082.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail082.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail082.stderr-hugs
index 028512324c..028512324c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail082.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail082.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail083.hs b/testsuite/tests/typecheck/should_fail/tcfail083.hs
index a79be4e7ac..a79be4e7ac 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail083.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail083.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail083.stderr b/testsuite/tests/typecheck/should_fail/tcfail083.stderr
index 77794ffaa6..77794ffaa6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail083.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail083.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail083.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail083.stderr-hugs
index 5535438428..5535438428 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail083.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail083.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail084.hs b/testsuite/tests/typecheck/should_fail/tcfail084.hs
index 22b5456b1e..22b5456b1e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail084.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail084.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail084.stderr b/testsuite/tests/typecheck/should_fail/tcfail084.stderr
index 1a7e8c3e28..1a7e8c3e28 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail084.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail084.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail084.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail084.stderr-hugs
index 2a9e60de1c..2a9e60de1c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail084.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail084.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail085.hs b/testsuite/tests/typecheck/should_fail/tcfail085.hs
index 81036b9dfc..81036b9dfc 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail085.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail085.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail085.stderr b/testsuite/tests/typecheck/should_fail/tcfail085.stderr
index c500e7a180..c500e7a180 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail085.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail085.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail085.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail085.stderr-hugs
index 9f1bc068ca..9f1bc068ca 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail085.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail085.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail086.hs b/testsuite/tests/typecheck/should_fail/tcfail086.hs
index 46d330daa6..46d330daa6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail086.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail086.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail086.stderr b/testsuite/tests/typecheck/should_fail/tcfail086.stderr
index 4b221839ea..4b221839ea 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail086.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail086.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail086.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail086.stderr-hugs
index 4c3902b5b6..4c3902b5b6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail086.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail086.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail087.hs b/testsuite/tests/typecheck/should_fail/tcfail087.hs
index 6055a13d21..6055a13d21 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail087.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail087.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail087.stderr b/testsuite/tests/typecheck/should_fail/tcfail087.stderr
index 17d9f48537..17d9f48537 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail087.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail087.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail088.hs b/testsuite/tests/typecheck/should_fail/tcfail088.hs
index 6b9f50751e..6b9f50751e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail088.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail088.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail088.stderr b/testsuite/tests/typecheck/should_fail/tcfail088.stderr
index 1bf22ffaa8..1bf22ffaa8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail088.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail088.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail088.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail088.stderr-hugs
index e1b586a2e3..e1b586a2e3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail088.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail088.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail089.hs b/testsuite/tests/typecheck/should_fail/tcfail089.hs
index 142460b0f5..142460b0f5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail089.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail089.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail089.stderr b/testsuite/tests/typecheck/should_fail/tcfail089.stderr
index 19dd837c13..19dd837c13 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail089.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail089.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail089.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail089.stderr-hugs
index c1152bc807..c1152bc807 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail089.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail089.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail090.hs b/testsuite/tests/typecheck/should_fail/tcfail090.hs
index 93a9e9e925..93a9e9e925 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail090.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail090.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail090.stderr b/testsuite/tests/typecheck/should_fail/tcfail090.stderr
index c63ced52c3..c63ced52c3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail090.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail090.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail091.hs b/testsuite/tests/typecheck/should_fail/tcfail091.hs
index e64d1f512c..e64d1f512c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail091.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail091.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail091.stderr b/testsuite/tests/typecheck/should_fail/tcfail091.stderr
index 74ca90b463..74ca90b463 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail091.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail091.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail091.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail091.stderr-hugs
index f0a977936d..f0a977936d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail091.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail091.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail092.hs b/testsuite/tests/typecheck/should_fail/tcfail092.hs
index 747f0ca3c7..747f0ca3c7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail092.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail092.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail092.stderr b/testsuite/tests/typecheck/should_fail/tcfail092.stderr
index 2ba048bb26..2ba048bb26 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail092.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail092.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail093.hs b/testsuite/tests/typecheck/should_fail/tcfail093.hs
index 9c2d8ea80a..9c2d8ea80a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail093.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail093.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail094.hs b/testsuite/tests/typecheck/should_fail/tcfail094.hs
index 225ceb2d97..225ceb2d97 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail094.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail094.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail094.stderr b/testsuite/tests/typecheck/should_fail/tcfail094.stderr
index 8cd67b632b..8cd67b632b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail094.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail094.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail094.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail094.stderr-hugs
index 0d2e0206b2..0d2e0206b2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail094.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail094.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail095.hs b/testsuite/tests/typecheck/should_fail/tcfail095.hs
index b7cae9dbe5..b7cae9dbe5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail095.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail095.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail095.stderr b/testsuite/tests/typecheck/should_fail/tcfail095.stderr
index 55f5b2954d..55f5b2954d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail095.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail095.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail096.hs b/testsuite/tests/typecheck/should_fail/tcfail096.hs
index 8a4edfbc6c..8a4edfbc6c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail096.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail096.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail096.stderr b/testsuite/tests/typecheck/should_fail/tcfail096.stderr
index c0ac91f6bf..c0ac91f6bf 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail096.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail096.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail096.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail096.stderr-hugs
index 7c3345bb51..7c3345bb51 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail096.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail096.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail097.hs b/testsuite/tests/typecheck/should_fail/tcfail097.hs
index 4bcc798b98..4bcc798b98 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail097.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail097.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail097.stderr b/testsuite/tests/typecheck/should_fail/tcfail097.stderr
index 967b172bb9..967b172bb9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail097.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail097.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail097.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail097.stderr-hugs
index 9051289079..9051289079 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail097.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail097.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail098.hs b/testsuite/tests/typecheck/should_fail/tcfail098.hs
index 2eab9e8f3b..2eab9e8f3b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail098.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail098.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail098.stderr b/testsuite/tests/typecheck/should_fail/tcfail098.stderr
index bf2ccabc30..bf2ccabc30 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail098.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail098.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail098.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail098.stderr-hugs
index 9107dbbf06..9107dbbf06 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail098.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail098.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail099.hs b/testsuite/tests/typecheck/should_fail/tcfail099.hs
index 4cfa22c0f0..4cfa22c0f0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail099.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail099.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail099.stderr b/testsuite/tests/typecheck/should_fail/tcfail099.stderr
index f97c5a1161..f97c5a1161 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail099.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail099.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail099.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail099.stderr-hugs
index b36a4c519e..b36a4c519e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail099.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail099.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail100.hs b/testsuite/tests/typecheck/should_fail/tcfail100.hs
index 1f125f3fda..1f125f3fda 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail100.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail100.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail100.stderr b/testsuite/tests/typecheck/should_fail/tcfail100.stderr
index 36ee6f8218..36ee6f8218 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail100.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail100.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail100.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail100.stderr-hugs
index b4aa433ae9..b4aa433ae9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail100.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail100.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail101.hs b/testsuite/tests/typecheck/should_fail/tcfail101.hs
index 8bd88749c3..8bd88749c3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail101.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail101.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail101.stderr b/testsuite/tests/typecheck/should_fail/tcfail101.stderr
index 0d82b50750..0d82b50750 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail101.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail101.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail101.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail101.stderr-hugs
index 626664525d..626664525d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail101.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail101.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail102.hs b/testsuite/tests/typecheck/should_fail/tcfail102.hs
index f4941789ff..f4941789ff 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail102.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail102.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail102.stderr b/testsuite/tests/typecheck/should_fail/tcfail102.stderr
index af047e5dce..af047e5dce 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail102.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail102.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail102.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail102.stderr-hugs
index 7584fda32e..7584fda32e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail102.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail102.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail103.hs b/testsuite/tests/typecheck/should_fail/tcfail103.hs
index 2ed6df2485..2ed6df2485 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail103.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail103.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail103.stderr b/testsuite/tests/typecheck/should_fail/tcfail103.stderr
index 636ab29ae7..636ab29ae7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail103.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail103.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail104.hs b/testsuite/tests/typecheck/should_fail/tcfail104.hs
index 292780541c..292780541c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail104.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail104.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail104.stderr b/testsuite/tests/typecheck/should_fail/tcfail104.stderr
index 8bd4608bde..8bd4608bde 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail104.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail104.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail105.hs b/testsuite/tests/typecheck/should_fail/tcfail105.hs
index 331e38322b..331e38322b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail105.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail105.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail105.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail105.stderr-hugs
index 16bedfe8b9..16bedfe8b9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail105.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail105.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail106.hs b/testsuite/tests/typecheck/should_fail/tcfail106.hs
index 22c732e4ce..22c732e4ce 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail106.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail106.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail106.stderr b/testsuite/tests/typecheck/should_fail/tcfail106.stderr
index e9de772233..e9de772233 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail106.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail106.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail106.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail106.stderr-hugs
index 6574cc7864..6574cc7864 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail106.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail106.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail107.hs b/testsuite/tests/typecheck/should_fail/tcfail107.hs
index e612e65093..e612e65093 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail107.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail107.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail107.stderr b/testsuite/tests/typecheck/should_fail/tcfail107.stderr
index eae3610c1d..eae3610c1d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail107.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail107.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail107.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail107.stderr-hugs
index 6c08b363b5..6c08b363b5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail107.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail107.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail108.hs b/testsuite/tests/typecheck/should_fail/tcfail108.hs
index 5ccebde83e..5ccebde83e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail108.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail108.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail108.stderr b/testsuite/tests/typecheck/should_fail/tcfail108.stderr
index 5d406cd5a6..5d406cd5a6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail108.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail108.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail108.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail108.stderr-hugs
index f5011fddc7..f5011fddc7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail108.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail108.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail109.hs b/testsuite/tests/typecheck/should_fail/tcfail109.hs
index 861183a399..861183a399 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail109.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail109.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail109.stderr b/testsuite/tests/typecheck/should_fail/tcfail109.stderr
index a72c6238d9..a72c6238d9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail109.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail109.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail109.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail109.stderr-hugs
index 3a7abb8842..3a7abb8842 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail109.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail109.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail110.hs b/testsuite/tests/typecheck/should_fail/tcfail110.hs
index 92aeb56c06..92aeb56c06 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail110.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail110.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail110.stderr b/testsuite/tests/typecheck/should_fail/tcfail110.stderr
index e663999edb..e663999edb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail110.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail110.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail110.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail110.stderr-hugs
index 4cc90e0a43..4cc90e0a43 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail110.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail110.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail111.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail111.stderr-hugs
index 46e9b8d08e..46e9b8d08e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail111.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail111.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail112.hs b/testsuite/tests/typecheck/should_fail/tcfail112.hs
index 01dd578ab7..01dd578ab7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail112.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail112.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail112.stderr b/testsuite/tests/typecheck/should_fail/tcfail112.stderr
index 602c1e4b69..602c1e4b69 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail112.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail112.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail112.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail112.stderr-hugs
index 3b64822662..3b64822662 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail112.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail112.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail113.hs b/testsuite/tests/typecheck/should_fail/tcfail113.hs
index 1628cd7c41..1628cd7c41 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail113.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail113.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail113.stderr b/testsuite/tests/typecheck/should_fail/tcfail113.stderr
index d4c9208243..d4c9208243 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail113.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail113.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail113.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail113.stderr-hugs
index 014006a69a..014006a69a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail113.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail113.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail114.hs b/testsuite/tests/typecheck/should_fail/tcfail114.hs
index 2d0fc19f4b..2d0fc19f4b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail114.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail114.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail114.stderr b/testsuite/tests/typecheck/should_fail/tcfail114.stderr
index 601feff85b..601feff85b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail114.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail114.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail114.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail114.stderr-hugs
index 3a7663b166..3a7663b166 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail114.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail114.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail115.hs b/testsuite/tests/typecheck/should_fail/tcfail115.hs
index 971f625a9a..971f625a9a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail115.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail115.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail115.stderr b/testsuite/tests/typecheck/should_fail/tcfail115.stderr
index fd1a02c02d..fd1a02c02d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail115.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail115.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail116.hs b/testsuite/tests/typecheck/should_fail/tcfail116.hs
index 1c32c956d3..1c32c956d3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail116.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail116.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail116.stderr b/testsuite/tests/typecheck/should_fail/tcfail116.stderr
index 8e7372413a..8e7372413a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail116.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail116.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail116.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail116.stderr-hugs
index fba5f2db38..fba5f2db38 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail116.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail116.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail117.hs b/testsuite/tests/typecheck/should_fail/tcfail117.hs
index 2a5ae99172..2a5ae99172 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail117.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail117.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail117.stderr b/testsuite/tests/typecheck/should_fail/tcfail117.stderr
index 2bc3d7fd63..2bc3d7fd63 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail117.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail117.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail117.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail117.stderr-hugs
index b6db2d800a..b6db2d800a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail117.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail117.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail118.hs b/testsuite/tests/typecheck/should_fail/tcfail118.hs
index 1b81c7e01a..1b81c7e01a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail118.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail118.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail118.stderr b/testsuite/tests/typecheck/should_fail/tcfail118.stderr
index 206bec47be..206bec47be 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail118.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail118.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail118.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail118.stderr-hugs
index 691a20ee0a..691a20ee0a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail118.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail118.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail119.hs b/testsuite/tests/typecheck/should_fail/tcfail119.hs
index 52b9c8a5eb..52b9c8a5eb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail119.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail119.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail119.stderr b/testsuite/tests/typecheck/should_fail/tcfail119.stderr
index 1984617b2b..1984617b2b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail119.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail119.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail119.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail119.stderr-hugs
index 443f073bcd..443f073bcd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail119.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail119.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail120.hs b/testsuite/tests/typecheck/should_fail/tcfail120.hs
index 04b7cd60ab..04b7cd60ab 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail120.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail120.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail120.stderr b/testsuite/tests/typecheck/should_fail/tcfail120.stderr
index 7693b0c7c5..7693b0c7c5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail120.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail120.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail121.hs b/testsuite/tests/typecheck/should_fail/tcfail121.hs
index 86c2a92c5c..86c2a92c5c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail121.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail121.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail121.stderr b/testsuite/tests/typecheck/should_fail/tcfail121.stderr
index 783331fdfc..783331fdfc 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail121.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail121.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail122.hs b/testsuite/tests/typecheck/should_fail/tcfail122.hs
index ae2bef8bea..ae2bef8bea 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail122.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail122.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail122.stderr b/testsuite/tests/typecheck/should_fail/tcfail122.stderr
index 3f6c035a55..3f6c035a55 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail122.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail122.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail123.hs b/testsuite/tests/typecheck/should_fail/tcfail123.hs
index 8e91bbe885..8e91bbe885 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail123.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail123.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail123.stderr b/testsuite/tests/typecheck/should_fail/tcfail123.stderr
index 560c8d9048..560c8d9048 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail123.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail123.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail124.hs b/testsuite/tests/typecheck/should_fail/tcfail124.hs
index 729d14b601..729d14b601 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail124.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail124.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail124.stderr b/testsuite/tests/typecheck/should_fail/tcfail124.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail124.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail124.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail125.hs b/testsuite/tests/typecheck/should_fail/tcfail125.hs
index 664354d840..664354d840 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail125.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail125.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail125.stderr b/testsuite/tests/typecheck/should_fail/tcfail125.stderr
index 988540dad5..988540dad5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail125.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail125.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail125.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail125.stderr-hugs
index 7fc582ba2d..7fc582ba2d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail125.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail125.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail126.hs b/testsuite/tests/typecheck/should_fail/tcfail126.hs
index 1ef2b4820e..1ef2b4820e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail126.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail126.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail126.stderr b/testsuite/tests/typecheck/should_fail/tcfail126.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail126.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail126.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail127.hs b/testsuite/tests/typecheck/should_fail/tcfail127.hs
index 32b9e37de5..32b9e37de5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail127.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail127.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail127.stderr b/testsuite/tests/typecheck/should_fail/tcfail127.stderr
index 8fa64fb204..8fa64fb204 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail127.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail127.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail128.hs b/testsuite/tests/typecheck/should_fail/tcfail128.hs
index 08971837a2..08971837a2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail128.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail128.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail128.stderr b/testsuite/tests/typecheck/should_fail/tcfail128.stderr
index a3c99a9548..a3c99a9548 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail128.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail128.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail128.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail128.stderr-hugs
index fa3977e1e9..fa3977e1e9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail128.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail128.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail129.hs b/testsuite/tests/typecheck/should_fail/tcfail129.hs
index 1a74749f56..1a74749f56 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail129.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail129.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail129.stderr b/testsuite/tests/typecheck/should_fail/tcfail129.stderr
index f9ee8a567d..f9ee8a567d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail129.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail129.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail129.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail129.stderr-hugs
index ff4f0a79c6..ff4f0a79c6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail129.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail129.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail130.hs b/testsuite/tests/typecheck/should_fail/tcfail130.hs
index 96101b534a..96101b534a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail130.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail130.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail130.stderr b/testsuite/tests/typecheck/should_fail/tcfail130.stderr
index 3534dba679..3534dba679 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail130.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail130.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail130.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail130.stderr-hugs
index d4e366eb19..d4e366eb19 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail130.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail130.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail131.hs b/testsuite/tests/typecheck/should_fail/tcfail131.hs
index 98b0a29c80..98b0a29c80 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail131.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail131.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail131.stderr b/testsuite/tests/typecheck/should_fail/tcfail131.stderr
index 134b76ffb3..134b76ffb3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail131.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail131.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail132.hs b/testsuite/tests/typecheck/should_fail/tcfail132.hs
index cc933dc6ee..cc933dc6ee 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail132.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail132.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail132.stderr b/testsuite/tests/typecheck/should_fail/tcfail132.stderr
index b25f21a809..b25f21a809 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail132.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail132.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail132.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail132.stderr-hugs
index 3b5f68fc7e..3b5f68fc7e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail132.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail132.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail133.hs b/testsuite/tests/typecheck/should_fail/tcfail133.hs
index af45be93cd..af45be93cd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail133.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail133.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail133.stderr b/testsuite/tests/typecheck/should_fail/tcfail133.stderr
index 2808159950..2808159950 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail133.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail133.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail134.hs b/testsuite/tests/typecheck/should_fail/tcfail134.hs
index 467bffdad0..467bffdad0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail134.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail134.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail134.stderr b/testsuite/tests/typecheck/should_fail/tcfail134.stderr
index ea302f058a..ea302f058a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail134.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail134.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail134.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail134.stderr-hugs
index 3726341ee9..3726341ee9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail134.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail134.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail135.hs b/testsuite/tests/typecheck/should_fail/tcfail135.hs
index 5cfc926085..5cfc926085 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail135.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail135.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail135.stderr b/testsuite/tests/typecheck/should_fail/tcfail135.stderr
index 37274283ed..37274283ed 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail135.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail135.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail135.stderr-hugs b/testsuite/tests/typecheck/should_fail/tcfail135.stderr-hugs
index c4c792a7ab..c4c792a7ab 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail135.stderr-hugs
+++ b/testsuite/tests/typecheck/should_fail/tcfail135.stderr-hugs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail136.hs b/testsuite/tests/typecheck/should_fail/tcfail136.hs
index 19989d4a61..19989d4a61 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail136.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail136.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail136.stderr b/testsuite/tests/typecheck/should_fail/tcfail136.stderr
index cdeff3c8a5..cdeff3c8a5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail136.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail136.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail137.hs b/testsuite/tests/typecheck/should_fail/tcfail137.hs
index 3d3b4e0369..3d3b4e0369 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail137.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail137.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail137.stderr b/testsuite/tests/typecheck/should_fail/tcfail137.stderr
index 9cbe69b98d..9cbe69b98d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail137.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail137.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail138.hs b/testsuite/tests/typecheck/should_fail/tcfail138.hs
index cf91a023f4..cf91a023f4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail138.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail138.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail138.stderr b/testsuite/tests/typecheck/should_fail/tcfail138.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail138.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail138.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail139.hs b/testsuite/tests/typecheck/should_fail/tcfail139.hs
index af21c8afba..af21c8afba 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail139.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail139.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail139.stderr b/testsuite/tests/typecheck/should_fail/tcfail139.stderr
index 91559a9f68..91559a9f68 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail139.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail139.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail140.hs b/testsuite/tests/typecheck/should_fail/tcfail140.hs
index 791dd19cf8..791dd19cf8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail140.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail140.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail140.stderr b/testsuite/tests/typecheck/should_fail/tcfail140.stderr
index bc888d2309..bc888d2309 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail140.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail140.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail141.hs b/testsuite/tests/typecheck/should_fail/tcfail141.hs
index 12504d04f3..12504d04f3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail141.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail141.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail141.stderr b/testsuite/tests/typecheck/should_fail/tcfail141.stderr
index 27c7ede212..27c7ede212 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail141.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail141.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail142.hs b/testsuite/tests/typecheck/should_fail/tcfail142.hs
index add92e43ab..add92e43ab 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail142.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail142.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail142.stderr b/testsuite/tests/typecheck/should_fail/tcfail142.stderr
index cd0161658f..cd0161658f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail142.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail142.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail143.hs b/testsuite/tests/typecheck/should_fail/tcfail143.hs
index 67eb62bafb..67eb62bafb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail143.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail143.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail143.stderr b/testsuite/tests/typecheck/should_fail/tcfail143.stderr
index 846f8c0252..846f8c0252 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail143.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail143.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail144.hs b/testsuite/tests/typecheck/should_fail/tcfail144.hs
index bdeb6f6a91..bdeb6f6a91 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail144.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail144.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail144.stderr b/testsuite/tests/typecheck/should_fail/tcfail144.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail144.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail144.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail145.hs b/testsuite/tests/typecheck/should_fail/tcfail145.hs
index d33dc1892f..d33dc1892f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail145.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail145.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail145.stderr b/testsuite/tests/typecheck/should_fail/tcfail145.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail145.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail145.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail146.hs b/testsuite/tests/typecheck/should_fail/tcfail146.hs
index f5ab46f4c5..f5ab46f4c5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail146.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail146.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail146.stderr b/testsuite/tests/typecheck/should_fail/tcfail146.stderr
index 25031ae618..25031ae618 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail146.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail146.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail147.hs b/testsuite/tests/typecheck/should_fail/tcfail147.hs
index 1ca703a403..1ca703a403 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail147.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail147.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail147.stderr b/testsuite/tests/typecheck/should_fail/tcfail147.stderr
index 81e77fe648..81e77fe648 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail147.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail147.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail148.hs b/testsuite/tests/typecheck/should_fail/tcfail148.hs
index d80db2ccf5..d80db2ccf5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail148.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail148.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail148.stderr b/testsuite/tests/typecheck/should_fail/tcfail148.stderr
index 13d4293807..13d4293807 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail148.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail148.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail149.hs b/testsuite/tests/typecheck/should_fail/tcfail149.hs
index 2479ed75c8..2479ed75c8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail149.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail149.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail149.stderr b/testsuite/tests/typecheck/should_fail/tcfail149.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail149.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail149.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail149.stdout b/testsuite/tests/typecheck/should_fail/tcfail149.stdout
index c1fcb5d3f7..c1fcb5d3f7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail149.stdout
+++ b/testsuite/tests/typecheck/should_fail/tcfail149.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail150.hs b/testsuite/tests/typecheck/should_fail/tcfail150.hs
index cc2ca034ef..cc2ca034ef 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail150.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail150.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail150.stderr b/testsuite/tests/typecheck/should_fail/tcfail150.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail150.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail150.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail151.hs b/testsuite/tests/typecheck/should_fail/tcfail151.hs
index 112973b71e..112973b71e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail151.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail151.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail151.stderr b/testsuite/tests/typecheck/should_fail/tcfail151.stderr
index bf549602e7..bf549602e7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail151.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail151.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail152.hs b/testsuite/tests/typecheck/should_fail/tcfail152.hs
index 3ebb6fe0f6..3ebb6fe0f6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail152.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail152.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail152.stderr b/testsuite/tests/typecheck/should_fail/tcfail152.stderr
index 5ae2f52f00..5ae2f52f00 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail152.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail152.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail153.hs b/testsuite/tests/typecheck/should_fail/tcfail153.hs
index add0479980..add0479980 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail153.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail153.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail153.stderr b/testsuite/tests/typecheck/should_fail/tcfail153.stderr
index 0b40df47d1..0b40df47d1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail153.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail153.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail154.hs b/testsuite/tests/typecheck/should_fail/tcfail154.hs
index 6e3161bd46..6e3161bd46 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail154.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail154.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail154.stderr b/testsuite/tests/typecheck/should_fail/tcfail154.stderr
index f8f3d69a4c..f8f3d69a4c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail154.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail154.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail155.hs b/testsuite/tests/typecheck/should_fail/tcfail155.hs
index 265d9d83a9..265d9d83a9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail155.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail155.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail155.stderr b/testsuite/tests/typecheck/should_fail/tcfail155.stderr
index fcc1133d4d..fcc1133d4d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail155.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail155.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail156.hs b/testsuite/tests/typecheck/should_fail/tcfail156.hs
index 7956c5b76a..7956c5b76a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail156.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail156.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail156.stderr b/testsuite/tests/typecheck/should_fail/tcfail156.stderr
index d93549e136..d93549e136 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail156.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail156.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail157.hs b/testsuite/tests/typecheck/should_fail/tcfail157.hs
index 74f02ed1e5..74f02ed1e5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail157.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail157.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail157.stderr b/testsuite/tests/typecheck/should_fail/tcfail157.stderr
index c68f957652..c68f957652 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail157.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail157.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail158.hs b/testsuite/tests/typecheck/should_fail/tcfail158.hs
index 95af345b36..95af345b36 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail158.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail158.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail158.stderr b/testsuite/tests/typecheck/should_fail/tcfail158.stderr
index b9c3a7dbca..b9c3a7dbca 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail158.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail158.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail159.hs b/testsuite/tests/typecheck/should_fail/tcfail159.hs
index c0c2eb1902..c0c2eb1902 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail159.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail159.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail159.stderr b/testsuite/tests/typecheck/should_fail/tcfail159.stderr
index b389ef1e96..b389ef1e96 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail159.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail159.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail160.hs b/testsuite/tests/typecheck/should_fail/tcfail160.hs
index 79b75df305..79b75df305 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail160.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail160.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail160.stderr b/testsuite/tests/typecheck/should_fail/tcfail160.stderr
index 33cbbbb8f1..33cbbbb8f1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail160.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail160.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail161.hs b/testsuite/tests/typecheck/should_fail/tcfail161.hs
index 6ebdfddc85..6ebdfddc85 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail161.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail161.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail161.stderr b/testsuite/tests/typecheck/should_fail/tcfail161.stderr
index 0b04d8ef02..0b04d8ef02 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail161.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail161.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail162.hs b/testsuite/tests/typecheck/should_fail/tcfail162.hs
index b13ccaa33e..b13ccaa33e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail162.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail162.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail162.stderr b/testsuite/tests/typecheck/should_fail/tcfail162.stderr
index ae7b1c5d27..ae7b1c5d27 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail162.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail162.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail164.hs b/testsuite/tests/typecheck/should_fail/tcfail164.hs
index 97ff3caf4e..97ff3caf4e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail164.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail164.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail164.stderr b/testsuite/tests/typecheck/should_fail/tcfail164.stderr
index 65f9c9f9ac..65f9c9f9ac 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail164.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail164.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail165.hs b/testsuite/tests/typecheck/should_fail/tcfail165.hs
index c23a7f39b4..c23a7f39b4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail165.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail165.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail165.stderr b/testsuite/tests/typecheck/should_fail/tcfail165.stderr
index 878a707120..878a707120 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail165.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail165.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail166.hs b/testsuite/tests/typecheck/should_fail/tcfail166.hs
index 5a2d4b8df7..5a2d4b8df7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail166.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail166.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail166.stderr b/testsuite/tests/typecheck/should_fail/tcfail166.stderr
index 3907418e10..3907418e10 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail166.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail166.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail167.hs b/testsuite/tests/typecheck/should_fail/tcfail167.hs
index b4d404a74d..b4d404a74d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail167.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail167.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail167.stderr b/testsuite/tests/typecheck/should_fail/tcfail167.stderr
index f62f524ebd..f62f524ebd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail167.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail167.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail168.hs b/testsuite/tests/typecheck/should_fail/tcfail168.hs
index 94a78a93b0..94a78a93b0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail168.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail168.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail168.stderr b/testsuite/tests/typecheck/should_fail/tcfail168.stderr
index f16f65bdb1..f16f65bdb1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail168.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail168.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail169.hs b/testsuite/tests/typecheck/should_fail/tcfail169.hs
index e0d6e4f838..e0d6e4f838 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail169.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail169.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail169.stderr b/testsuite/tests/typecheck/should_fail/tcfail169.stderr
index cfe63c06ee..cfe63c06ee 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail169.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail169.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail170.hs b/testsuite/tests/typecheck/should_fail/tcfail170.hs
index 1e7838cb43..1e7838cb43 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail170.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail170.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail170.stderr b/testsuite/tests/typecheck/should_fail/tcfail170.stderr
index 914ab0cde0..914ab0cde0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail170.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail170.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail171.hs b/testsuite/tests/typecheck/should_fail/tcfail171.hs
index fb8e4b652c..fb8e4b652c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail171.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail171.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail171.stderr b/testsuite/tests/typecheck/should_fail/tcfail171.stderr
index b4efd33e32..b4efd33e32 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail171.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail171.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail172.hs b/testsuite/tests/typecheck/should_fail/tcfail172.hs
index bb31501cec..bb31501cec 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail172.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail172.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail172.stderr b/testsuite/tests/typecheck/should_fail/tcfail172.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail172.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail172.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail173.hs b/testsuite/tests/typecheck/should_fail/tcfail173.hs
index bad14bd539..bad14bd539 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail173.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail173.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail173.stderr b/testsuite/tests/typecheck/should_fail/tcfail173.stderr
index ee8f59b525..ee8f59b525 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail173.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail173.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail174.hs b/testsuite/tests/typecheck/should_fail/tcfail174.hs
index 47c63d7248..47c63d7248 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail174.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail174.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail174.stderr b/testsuite/tests/typecheck/should_fail/tcfail174.stderr
index 84c0868db4..84c0868db4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail174.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail174.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail175.hs b/testsuite/tests/typecheck/should_fail/tcfail175.hs
index 5eacd24291..5eacd24291 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail175.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail175.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail175.stderr b/testsuite/tests/typecheck/should_fail/tcfail175.stderr
index f181c00bcd..f181c00bcd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail175.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail175.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail176.hs b/testsuite/tests/typecheck/should_fail/tcfail176.hs
index 39f3818ede..39f3818ede 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail176.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail176.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail176.stderr b/testsuite/tests/typecheck/should_fail/tcfail176.stderr
index f804b000cf..f804b000cf 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail176.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail176.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail177.hs b/testsuite/tests/typecheck/should_fail/tcfail177.hs
index d9e60e96fc..d9e60e96fc 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail177.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail177.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail177.stderr b/testsuite/tests/typecheck/should_fail/tcfail177.stderr
index 3107d1e668..3107d1e668 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail177.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail177.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail178.hs b/testsuite/tests/typecheck/should_fail/tcfail178.hs
index 8071def02e..8071def02e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail178.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail178.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail178.stderr b/testsuite/tests/typecheck/should_fail/tcfail178.stderr
index 63119af75e..63119af75e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail178.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail178.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail179.hs b/testsuite/tests/typecheck/should_fail/tcfail179.hs
index a270cbffb2..a270cbffb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail179.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail179.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail179.stderr b/testsuite/tests/typecheck/should_fail/tcfail179.stderr
index ba995b65ea..ba995b65ea 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail179.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail179.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail180.hs b/testsuite/tests/typecheck/should_fail/tcfail180.hs
index 4c228eedda..4c228eedda 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail180.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail180.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail180.stderr b/testsuite/tests/typecheck/should_fail/tcfail180.stderr
index 96d76100ea..96d76100ea 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail180.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail180.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail181.hs b/testsuite/tests/typecheck/should_fail/tcfail181.hs
index 01d06599ef..01d06599ef 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail181.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail181.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail181.stderr b/testsuite/tests/typecheck/should_fail/tcfail181.stderr
index 59fe8b83af..59fe8b83af 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail181.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail181.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail182.hs b/testsuite/tests/typecheck/should_fail/tcfail182.hs
index 7b04df489f..7b04df489f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail182.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail182.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail182.stderr b/testsuite/tests/typecheck/should_fail/tcfail182.stderr
index d6b97af250..d6b97af250 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail182.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail182.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail183.hs b/testsuite/tests/typecheck/should_fail/tcfail183.hs
index d46d87ad7c..d46d87ad7c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail183.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail183.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail183.stderr b/testsuite/tests/typecheck/should_fail/tcfail183.stderr
index fad1ccf736..fad1ccf736 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail183.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail183.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail184.hs b/testsuite/tests/typecheck/should_fail/tcfail184.hs
index 210a9c7c9b..210a9c7c9b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail184.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail184.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail184.stderr b/testsuite/tests/typecheck/should_fail/tcfail184.stderr
index 20920d822b..20920d822b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail184.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail184.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail185.hs b/testsuite/tests/typecheck/should_fail/tcfail185.hs
index 59af50f738..59af50f738 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail185.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail185.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail185.stderr b/testsuite/tests/typecheck/should_fail/tcfail185.stderr
index 1e4c8d718f..1e4c8d718f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail185.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail185.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail186.hs b/testsuite/tests/typecheck/should_fail/tcfail186.hs
index 6148517a6d..6148517a6d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail186.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail186.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail186.stderr b/testsuite/tests/typecheck/should_fail/tcfail186.stderr
index 3f4504b810..3f4504b810 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail186.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail186.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail186.stderr-ghc-7.0 b/testsuite/tests/typecheck/should_fail/tcfail186.stderr-ghc-7.0
index 737a0663ea..737a0663ea 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail186.stderr-ghc-7.0
+++ b/testsuite/tests/typecheck/should_fail/tcfail186.stderr-ghc-7.0
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail187.hs b/testsuite/tests/typecheck/should_fail/tcfail187.hs
index eb508066ec..eb508066ec 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail187.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail187.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail187.stderr b/testsuite/tests/typecheck/should_fail/tcfail187.stderr
index 07a741d025..07a741d025 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail187.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail187.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail188.hs b/testsuite/tests/typecheck/should_fail/tcfail188.hs
index a79087d90d..a79087d90d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail188.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail188.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail188.stderr b/testsuite/tests/typecheck/should_fail/tcfail188.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail188.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail188.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail189.hs b/testsuite/tests/typecheck/should_fail/tcfail189.hs
index 3de16070c3..3de16070c3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail189.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail189.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail189.stderr b/testsuite/tests/typecheck/should_fail/tcfail189.stderr
index b3a6cb4b96..b3a6cb4b96 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail189.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail189.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail190.hs b/testsuite/tests/typecheck/should_fail/tcfail190.hs
index 7cc768af65..7cc768af65 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail190.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail190.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail190.stderr b/testsuite/tests/typecheck/should_fail/tcfail190.stderr
index a2e1034162..a2e1034162 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail190.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail190.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail191.hs b/testsuite/tests/typecheck/should_fail/tcfail191.hs
index e6553d07e2..e6553d07e2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail191.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail191.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail191.stderr b/testsuite/tests/typecheck/should_fail/tcfail191.stderr
index 6fd626afd4..6fd626afd4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail191.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail191.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail192.hs b/testsuite/tests/typecheck/should_fail/tcfail192.hs
index 15de576d91..15de576d91 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail192.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail192.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail192.stderr b/testsuite/tests/typecheck/should_fail/tcfail192.stderr
index d72c821fd6..d72c821fd6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail192.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail192.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail193.hs b/testsuite/tests/typecheck/should_fail/tcfail193.hs
index f8bfd8f681..f8bfd8f681 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail193.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail193.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail193.stderr b/testsuite/tests/typecheck/should_fail/tcfail193.stderr
index 6fd99ae61b..6fd99ae61b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail193.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail193.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail194.hs b/testsuite/tests/typecheck/should_fail/tcfail194.hs
index 9166b18b4a..9166b18b4a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail194.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail194.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail194.stderr b/testsuite/tests/typecheck/should_fail/tcfail194.stderr
index be6e37ec6b..be6e37ec6b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail194.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail194.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail195.hs b/testsuite/tests/typecheck/should_fail/tcfail195.hs
index 4c2408e8ba..4c2408e8ba 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail195.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail195.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail195.stderr b/testsuite/tests/typecheck/should_fail/tcfail195.stderr
index 5816773f48..5816773f48 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail195.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail195.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail196.hs b/testsuite/tests/typecheck/should_fail/tcfail196.hs
index a88f3c7f44..a88f3c7f44 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail196.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail196.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail196.stderr b/testsuite/tests/typecheck/should_fail/tcfail196.stderr
index 79cc7266eb..79cc7266eb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail196.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail196.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail197.hs b/testsuite/tests/typecheck/should_fail/tcfail197.hs
index 1aaffcd389..1aaffcd389 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail197.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail197.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail197.stderr b/testsuite/tests/typecheck/should_fail/tcfail197.stderr
index 3abe57be7b..3abe57be7b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail197.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail197.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail198.hs b/testsuite/tests/typecheck/should_fail/tcfail198.hs
index 658545e9b2..658545e9b2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail198.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail198.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail198.stderr b/testsuite/tests/typecheck/should_fail/tcfail198.stderr
index cc3ca54b14..cc3ca54b14 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail198.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail198.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail199.hs b/testsuite/tests/typecheck/should_fail/tcfail199.hs
index bf4dd6503d..bf4dd6503d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail199.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail199.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail199.stderr b/testsuite/tests/typecheck/should_fail/tcfail199.stderr
index 6866a26452..6866a26452 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail199.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail199.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail200.hs b/testsuite/tests/typecheck/should_fail/tcfail200.hs
index 18d626207b..18d626207b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail200.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail200.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail200.stderr b/testsuite/tests/typecheck/should_fail/tcfail200.stderr
index 90f590d8e2..90f590d8e2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail200.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail200.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail201.hs b/testsuite/tests/typecheck/should_fail/tcfail201.hs
index 276efd05ae..276efd05ae 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail201.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail201.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail201.stderr b/testsuite/tests/typecheck/should_fail/tcfail201.stderr
index 653e503edc..653e503edc 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail201.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail201.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail202.hs b/testsuite/tests/typecheck/should_fail/tcfail202.hs
index 7565755218..7565755218 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail202.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail202.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail202.stderr b/testsuite/tests/typecheck/should_fail/tcfail202.stderr
index a43f726580..a43f726580 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail202.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail202.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail203.hs b/testsuite/tests/typecheck/should_fail/tcfail203.hs
index 7f51dae3b5..7f51dae3b5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail203.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail203.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail203.stderr b/testsuite/tests/typecheck/should_fail/tcfail203.stderr
index 29cf84095b..29cf84095b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail203.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail203.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail203a.hs b/testsuite/tests/typecheck/should_fail/tcfail203a.hs
index fd5ccaefbb..fd5ccaefbb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail203a.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail203a.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail203a.stderr b/testsuite/tests/typecheck/should_fail/tcfail203a.stderr
index 272ff4254e..272ff4254e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail203a.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail203a.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail204.hs b/testsuite/tests/typecheck/should_fail/tcfail204.hs
index ed561c3290..ed561c3290 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail204.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail204.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail204.stderr b/testsuite/tests/typecheck/should_fail/tcfail204.stderr
index e9d9bb739d..e9d9bb739d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail204.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail204.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail205.hs b/testsuite/tests/typecheck/should_fail/tcfail205.hs
index 6b676fbb78..6b676fbb78 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail205.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail205.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail205.stderr b/testsuite/tests/typecheck/should_fail/tcfail205.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail205.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail205.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail206.hs b/testsuite/tests/typecheck/should_fail/tcfail206.hs
index a256bc3e34..a256bc3e34 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail206.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail206.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail206.stderr b/testsuite/tests/typecheck/should_fail/tcfail206.stderr
index 46419c4522..46419c4522 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail206.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail206.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail207.hs b/testsuite/tests/typecheck/should_fail/tcfail207.hs
index cd57f4892f..cd57f4892f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail207.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail207.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail207.stderr b/testsuite/tests/typecheck/should_fail/tcfail207.stderr
index 307b4044d5..307b4044d5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail207.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail207.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail208.hs b/testsuite/tests/typecheck/should_fail/tcfail208.hs
index 71c0f3c19b..71c0f3c19b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail208.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail208.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail208.stderr b/testsuite/tests/typecheck/should_fail/tcfail208.stderr
index 64200a696d..64200a696d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail208.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail208.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/IPRun.hs b/testsuite/tests/typecheck/should_run/IPRun.hs
index 66abe6dcbe..66abe6dcbe 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/IPRun.hs
+++ b/testsuite/tests/typecheck/should_run/IPRun.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/IPRun.stdout b/testsuite/tests/typecheck/should_run/IPRun.stdout
index e558e3cc3a..e558e3cc3a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/IPRun.stdout
+++ b/testsuite/tests/typecheck/should_run/IPRun.stdout
diff --git a/testsuite/tests/typecheck/should_run/Makefile b/testsuite/tests/typecheck/should_run/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/typecheck/should_run/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T1624.hs b/testsuite/tests/typecheck/should_run/T1624.hs
index e92e2664d3..e92e2664d3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T1624.hs
+++ b/testsuite/tests/typecheck/should_run/T1624.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T1624.stdout b/testsuite/tests/typecheck/should_run/T1624.stdout
index 4cd37620ea..4cd37620ea 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T1624.stdout
+++ b/testsuite/tests/typecheck/should_run/T1624.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T1735.hs b/testsuite/tests/typecheck/should_run/T1735.hs
index a8d453c39f..a8d453c39f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T1735.hs
+++ b/testsuite/tests/typecheck/should_run/T1735.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T1735.stdout b/testsuite/tests/typecheck/should_run/T1735.stdout
index 4df191aac2..4df191aac2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T1735.stdout
+++ b/testsuite/tests/typecheck/should_run/T1735.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T1735_Help/Basics.hs b/testsuite/tests/typecheck/should_run/T1735_Help/Basics.hs
index c7fad91395..c7fad91395 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T1735_Help/Basics.hs
+++ b/testsuite/tests/typecheck/should_run/T1735_Help/Basics.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T1735_Help/Context.hs b/testsuite/tests/typecheck/should_run/T1735_Help/Context.hs
index 25b9df94a8..25b9df94a8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T1735_Help/Context.hs
+++ b/testsuite/tests/typecheck/should_run/T1735_Help/Context.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T1735_Help/Instances.hs b/testsuite/tests/typecheck/should_run/T1735_Help/Instances.hs
index 6a626138ea..6a626138ea 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T1735_Help/Instances.hs
+++ b/testsuite/tests/typecheck/should_run/T1735_Help/Instances.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T1735_Help/Main.hs b/testsuite/tests/typecheck/should_run/T1735_Help/Main.hs
index 0a6e1c59f4..0a6e1c59f4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T1735_Help/Main.hs
+++ b/testsuite/tests/typecheck/should_run/T1735_Help/Main.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T1735_Help/State.hs b/testsuite/tests/typecheck/should_run/T1735_Help/State.hs
index 7b048eb2df..7b048eb2df 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T1735_Help/State.hs
+++ b/testsuite/tests/typecheck/should_run/T1735_Help/State.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T1735_Help/Xml.hs b/testsuite/tests/typecheck/should_run/T1735_Help/Xml.hs
index b641c6a82c..b641c6a82c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T1735_Help/Xml.hs
+++ b/testsuite/tests/typecheck/should_run/T1735_Help/Xml.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T2722.hs b/testsuite/tests/typecheck/should_run/T2722.hs
index 3912c840e7..3912c840e7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T2722.hs
+++ b/testsuite/tests/typecheck/should_run/T2722.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T2722.stdout b/testsuite/tests/typecheck/should_run/T2722.stdout
index daad811123..daad811123 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T2722.stdout
+++ b/testsuite/tests/typecheck/should_run/T2722.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T3500a.hs b/testsuite/tests/typecheck/should_run/T3500a.hs
index c3adeb0c61..c3adeb0c61 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T3500a.hs
+++ b/testsuite/tests/typecheck/should_run/T3500a.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T3500a.stdout b/testsuite/tests/typecheck/should_run/T3500a.stdout
index 78c6baefdd..78c6baefdd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T3500a.stdout
+++ b/testsuite/tests/typecheck/should_run/T3500a.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T3500b.hs b/testsuite/tests/typecheck/should_run/T3500b.hs
index 59a2c47983..59a2c47983 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T3500b.hs
+++ b/testsuite/tests/typecheck/should_run/T3500b.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T3500b.stdout b/testsuite/tests/typecheck/should_run/T3500b.stdout
index 7acb74ffa3..7acb74ffa3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T3500b.stdout
+++ b/testsuite/tests/typecheck/should_run/T3500b.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T3731-short.hs b/testsuite/tests/typecheck/should_run/T3731-short.hs
index 8f09d5ff52..8f09d5ff52 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T3731-short.hs
+++ b/testsuite/tests/typecheck/should_run/T3731-short.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T3731-short.stdout b/testsuite/tests/typecheck/should_run/T3731-short.stdout
index 9bc983e8f0..9bc983e8f0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T3731-short.stdout
+++ b/testsuite/tests/typecheck/should_run/T3731-short.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T3731.hs b/testsuite/tests/typecheck/should_run/T3731.hs
index af858e570a..af858e570a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T3731.hs
+++ b/testsuite/tests/typecheck/should_run/T3731.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T3731.stdout b/testsuite/tests/typecheck/should_run/T3731.stdout
index 688ef59dd4..688ef59dd4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T3731.stdout
+++ b/testsuite/tests/typecheck/should_run/T3731.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T4809.hs b/testsuite/tests/typecheck/should_run/T4809.hs
index 0c0b50826c..0c0b50826c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T4809.hs
+++ b/testsuite/tests/typecheck/should_run/T4809.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T4809.stdout b/testsuite/tests/typecheck/should_run/T4809.stdout
index ad220dd0bd..ad220dd0bd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T4809.stdout
+++ b/testsuite/tests/typecheck/should_run/T4809.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T4809_IdentityT.hs b/testsuite/tests/typecheck/should_run/T4809_IdentityT.hs
index f030fc5b8d..f030fc5b8d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T4809_IdentityT.hs
+++ b/testsuite/tests/typecheck/should_run/T4809_IdentityT.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/T4809_XMLGenerator.hs b/testsuite/tests/typecheck/should_run/T4809_XMLGenerator.hs
index 9ee37e8c6d..9ee37e8c6d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/T4809_XMLGenerator.hs
+++ b/testsuite/tests/typecheck/should_run/T4809_XMLGenerator.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/TcRun025_B.hs b/testsuite/tests/typecheck/should_run/TcRun025_B.hs
index a6d752c1a7..a6d752c1a7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/TcRun025_B.hs
+++ b/testsuite/tests/typecheck/should_run/TcRun025_B.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/TcRun038_B.hs b/testsuite/tests/typecheck/should_run/TcRun038_B.hs
index 994348ba42..994348ba42 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/TcRun038_B.hs
+++ b/testsuite/tests/typecheck/should_run/TcRun038_B.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/all.T b/testsuite/tests/typecheck/should_run/all.T
index a66586f0d8..a66586f0d8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/all.T
+++ b/testsuite/tests/typecheck/should_run/all.T
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/church.hs b/testsuite/tests/typecheck/should_run/church.hs
index 2b7ee92b8b..2b7ee92b8b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/church.hs
+++ b/testsuite/tests/typecheck/should_run/church.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/church.stdout b/testsuite/tests/typecheck/should_run/church.stdout
index fff0a2476a..fff0a2476a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/church.stdout
+++ b/testsuite/tests/typecheck/should_run/church.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/mc17.hs b/testsuite/tests/typecheck/should_run/mc17.hs
index abd3b7b579..abd3b7b579 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/mc17.hs
+++ b/testsuite/tests/typecheck/should_run/mc17.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/mc17.stdout b/testsuite/tests/typecheck/should_run/mc17.stdout
index bb1e684d68..bb1e684d68 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/mc17.stdout
+++ b/testsuite/tests/typecheck/should_run/mc17.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun001.hs b/testsuite/tests/typecheck/should_run/tcrun001.hs
index 209ca3fe00..209ca3fe00 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun001.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun001.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun001.stdout b/testsuite/tests/typecheck/should_run/tcrun001.stdout
index b8626c4cff..b8626c4cff 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun001.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun001.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun002.hs b/testsuite/tests/typecheck/should_run/tcrun002.hs
index 45fe19fdc9..45fe19fdc9 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun002.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun002.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun002.stdout b/testsuite/tests/typecheck/should_run/tcrun002.stdout
index 928909f816..928909f816 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun002.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun002.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun002.stdout-alpha-dec-osf3 b/testsuite/tests/typecheck/should_run/tcrun002.stdout-alpha-dec-osf3
index 31e0b55e93..31e0b55e93 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun002.stdout-alpha-dec-osf3
+++ b/testsuite/tests/typecheck/should_run/tcrun002.stdout-alpha-dec-osf3
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun002.stdout-mips-sgi-irix b/testsuite/tests/typecheck/should_run/tcrun002.stdout-mips-sgi-irix
index 31e0b55e93..31e0b55e93 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun002.stdout-mips-sgi-irix
+++ b/testsuite/tests/typecheck/should_run/tcrun002.stdout-mips-sgi-irix
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun002.stdout-ws-64 b/testsuite/tests/typecheck/should_run/tcrun002.stdout-ws-64
index 31e0b55e93..31e0b55e93 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun002.stdout-ws-64
+++ b/testsuite/tests/typecheck/should_run/tcrun002.stdout-ws-64
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun002.stdout-x86_64-unknown-openbsd b/testsuite/tests/typecheck/should_run/tcrun002.stdout-x86_64-unknown-openbsd
index 31e0b55e93..31e0b55e93 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun002.stdout-x86_64-unknown-openbsd
+++ b/testsuite/tests/typecheck/should_run/tcrun002.stdout-x86_64-unknown-openbsd
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun003.hs b/testsuite/tests/typecheck/should_run/tcrun003.hs
index 67b9771d5f..67b9771d5f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun003.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun003.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun003.stdout b/testsuite/tests/typecheck/should_run/tcrun003.stdout
index 14896f2f71..14896f2f71 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun003.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun003.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun003.stdout-ghc b/testsuite/tests/typecheck/should_run/tcrun003.stdout-ghc
index 14896f2f71..14896f2f71 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun003.stdout-ghc
+++ b/testsuite/tests/typecheck/should_run/tcrun003.stdout-ghc
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun004.hs b/testsuite/tests/typecheck/should_run/tcrun004.hs
index 2319fc3bec..2319fc3bec 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun004.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun004.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun004.stdout b/testsuite/tests/typecheck/should_run/tcrun004.stdout
index f0842b68d7..f0842b68d7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun004.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun004.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun005.hs b/testsuite/tests/typecheck/should_run/tcrun005.hs
index 2c315725ef..2c315725ef 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun005.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun005.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun005.stdout b/testsuite/tests/typecheck/should_run/tcrun005.stdout
index 52c33a57c7..52c33a57c7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun005.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun005.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun006.hs b/testsuite/tests/typecheck/should_run/tcrun006.hs
index f3d0e13cef..f3d0e13cef 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun006.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun006.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun006.stdout b/testsuite/tests/typecheck/should_run/tcrun006.stdout
index e96d077c6e..e96d077c6e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun006.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun006.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun008.hs b/testsuite/tests/typecheck/should_run/tcrun008.hs
index 80097a8f24..80097a8f24 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun008.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun008.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun008.stdout b/testsuite/tests/typecheck/should_run/tcrun008.stdout
index f494982ffa..f494982ffa 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun008.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun008.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun009.hs b/testsuite/tests/typecheck/should_run/tcrun009.hs
index 1adc350084..1adc350084 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun009.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun009.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun009.stdout b/testsuite/tests/typecheck/should_run/tcrun009.stdout
index cb59695753..cb59695753 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun009.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun009.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun010.hs b/testsuite/tests/typecheck/should_run/tcrun010.hs
index 7621f4d4e0..7621f4d4e0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun010.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun010.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun010.stdout b/testsuite/tests/typecheck/should_run/tcrun010.stdout
index ae94b77716..ae94b77716 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun010.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun010.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun011.hs b/testsuite/tests/typecheck/should_run/tcrun011.hs
index 5c6cab8ea0..5c6cab8ea0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun011.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun011.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun011.stdout b/testsuite/tests/typecheck/should_run/tcrun011.stdout
index 7984134ce3..7984134ce3 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun011.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun011.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun012.hs b/testsuite/tests/typecheck/should_run/tcrun012.hs
index a3c946a24e..a3c946a24e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun012.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun012.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun012.stdout b/testsuite/tests/typecheck/should_run/tcrun012.stdout
index df9e19c591..df9e19c591 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun012.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun012.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun013.hs b/testsuite/tests/typecheck/should_run/tcrun013.hs
index dc156c0d83..dc156c0d83 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun013.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun013.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun013.stdout b/testsuite/tests/typecheck/should_run/tcrun013.stdout
index bb1e684d68..bb1e684d68 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun013.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun013.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun014.hs b/testsuite/tests/typecheck/should_run/tcrun014.hs
index 751e9aa5bf..751e9aa5bf 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun014.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun014.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun014.stdout b/testsuite/tests/typecheck/should_run/tcrun014.stdout
index 573541ac97..573541ac97 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun014.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun014.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun015.hs b/testsuite/tests/typecheck/should_run/tcrun015.hs
index a75e7e88d5..a75e7e88d5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun015.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun015.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun015.stdout b/testsuite/tests/typecheck/should_run/tcrun015.stdout
index 7e8952116f..7e8952116f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun015.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun015.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun016.hs b/testsuite/tests/typecheck/should_run/tcrun016.hs
index b498ed4220..b498ed4220 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun016.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun016.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun016.stdout b/testsuite/tests/typecheck/should_run/tcrun016.stdout
index 56ead6b617..56ead6b617 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun016.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun016.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun017.hs b/testsuite/tests/typecheck/should_run/tcrun017.hs
index f994df3a4f..f994df3a4f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun017.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun017.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun017.stdout b/testsuite/tests/typecheck/should_run/tcrun017.stdout
index 3f49878157..3f49878157 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun017.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun017.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun018.hs b/testsuite/tests/typecheck/should_run/tcrun018.hs
index 9f9bd14d0f..9f9bd14d0f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun018.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun018.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun018.stdout b/testsuite/tests/typecheck/should_run/tcrun018.stdout
index 66b4edf967..66b4edf967 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun018.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun018.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun019.hs b/testsuite/tests/typecheck/should_run/tcrun019.hs
index 266e01d9c0..266e01d9c0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun019.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun019.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun019.stdout b/testsuite/tests/typecheck/should_run/tcrun019.stdout
index f599e28b8a..f599e28b8a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun019.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun019.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun020.hs b/testsuite/tests/typecheck/should_run/tcrun020.hs
index 98cbc71e3c..98cbc71e3c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun020.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun020.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun020.stdout b/testsuite/tests/typecheck/should_run/tcrun020.stdout
index 3e69f58e11..3e69f58e11 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun020.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun020.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun021.hs b/testsuite/tests/typecheck/should_run/tcrun021.hs
index 50497dd640..50497dd640 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun021.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun021.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun021.stdout b/testsuite/tests/typecheck/should_run/tcrun021.stdout
index c16e4c39e1..c16e4c39e1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun021.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun021.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun022.hs b/testsuite/tests/typecheck/should_run/tcrun022.hs
index 54613d7917..54613d7917 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun022.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun022.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun022.stdout b/testsuite/tests/typecheck/should_run/tcrun022.stdout
index 3943681c07..3943681c07 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun022.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun022.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun023.hs b/testsuite/tests/typecheck/should_run/tcrun023.hs
index 3a6166b015..3a6166b015 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun023.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun023.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun023.stdout b/testsuite/tests/typecheck/should_run/tcrun023.stdout
index 2050fde75a..2050fde75a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun023.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun023.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun024.hs b/testsuite/tests/typecheck/should_run/tcrun024.hs
index 82c6f49e33..82c6f49e33 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun024.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun024.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun024.stdout b/testsuite/tests/typecheck/should_run/tcrun024.stdout
index bdafbe58ac..bdafbe58ac 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun024.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun024.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun025.hs b/testsuite/tests/typecheck/should_run/tcrun025.hs
index b7a565934e..b7a565934e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun025.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun025.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun025.stdout b/testsuite/tests/typecheck/should_run/tcrun025.stdout
index bdafbe58ac..bdafbe58ac 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun025.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun025.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun026.hs b/testsuite/tests/typecheck/should_run/tcrun026.hs
index 7e52d3ce54..7e52d3ce54 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun026.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun026.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun026.stderr b/testsuite/tests/typecheck/should_run/tcrun026.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun026.stderr
+++ b/testsuite/tests/typecheck/should_run/tcrun026.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun026.stdout b/testsuite/tests/typecheck/should_run/tcrun026.stdout
index 810c96eeeb..810c96eeeb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun026.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun026.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun027.hs b/testsuite/tests/typecheck/should_run/tcrun027.hs
index 734d230394..734d230394 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun027.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun027.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun027.stdout b/testsuite/tests/typecheck/should_run/tcrun027.stdout
index dabf967d39..dabf967d39 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun027.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun027.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun028.hs b/testsuite/tests/typecheck/should_run/tcrun028.hs
index f4f8fd9d61..f4f8fd9d61 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun028.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun028.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun028.stdout b/testsuite/tests/typecheck/should_run/tcrun028.stdout
index 7d447a7415..7d447a7415 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun028.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun028.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun029.hs b/testsuite/tests/typecheck/should_run/tcrun029.hs
index 55071be483..55071be483 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun029.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun029.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun029.stdout b/testsuite/tests/typecheck/should_run/tcrun029.stdout
index 127a2b4781..127a2b4781 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun029.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun029.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun030.hs b/testsuite/tests/typecheck/should_run/tcrun030.hs
index fe28a33091..fe28a33091 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun030.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun030.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun030.stdout b/testsuite/tests/typecheck/should_run/tcrun030.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun030.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun030.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun031.hs b/testsuite/tests/typecheck/should_run/tcrun031.hs
index fbffe97c0e..fbffe97c0e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun031.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun031.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun031.stdout b/testsuite/tests/typecheck/should_run/tcrun031.stdout
index 347fadaa0c..347fadaa0c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun031.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun031.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun032.hs b/testsuite/tests/typecheck/should_run/tcrun032.hs
index 8aa43637ba..8aa43637ba 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun032.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun032.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun032.stdout b/testsuite/tests/typecheck/should_run/tcrun032.stdout
index 9639b4b410..9639b4b410 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun032.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun032.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun033.hs b/testsuite/tests/typecheck/should_run/tcrun033.hs
index f9cf6a3faa..f9cf6a3faa 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun033.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun033.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun033.stdout b/testsuite/tests/typecheck/should_run/tcrun033.stdout
index 3bd41263bf..3bd41263bf 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun033.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun033.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun034.hs b/testsuite/tests/typecheck/should_run/tcrun034.hs
index ac07869b40..ac07869b40 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun034.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun034.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun034.stdout b/testsuite/tests/typecheck/should_run/tcrun034.stdout
index 7ee0007bf1..7ee0007bf1 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun034.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun034.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun035.hs b/testsuite/tests/typecheck/should_run/tcrun035.hs
index ee9f27bb7b..ee9f27bb7b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun035.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun035.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun035.stderr b/testsuite/tests/typecheck/should_run/tcrun035.stderr
index 67d341883e..67d341883e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun035.stderr
+++ b/testsuite/tests/typecheck/should_run/tcrun035.stderr
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun036.hs b/testsuite/tests/typecheck/should_run/tcrun036.hs
index cef36a613d..cef36a613d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun036.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun036.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun036.stdout b/testsuite/tests/typecheck/should_run/tcrun036.stdout
index 209e3ef4b6..209e3ef4b6 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun036.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun036.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun037.hs b/testsuite/tests/typecheck/should_run/tcrun037.hs
index e79817d5cb..e79817d5cb 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun037.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun037.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun037.stdout b/testsuite/tests/typecheck/should_run/tcrun037.stdout
index ef74440844..ef74440844 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun037.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun037.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun038.hs b/testsuite/tests/typecheck/should_run/tcrun038.hs
index 26337cdb95..26337cdb95 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun038.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun038.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun038.stdout b/testsuite/tests/typecheck/should_run/tcrun038.stdout
index 84b19cd5a7..84b19cd5a7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun038.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun038.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun039.hs b/testsuite/tests/typecheck/should_run/tcrun039.hs
index 916d5330e4..916d5330e4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun039.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun039.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun039.stdout b/testsuite/tests/typecheck/should_run/tcrun039.stdout
index a13aef23d7..a13aef23d7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun039.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun039.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun040.hs b/testsuite/tests/typecheck/should_run/tcrun040.hs
index adfaf95898..adfaf95898 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun040.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun040.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun040.stdout b/testsuite/tests/typecheck/should_run/tcrun040.stdout
index 827c4f698a..827c4f698a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun040.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun040.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun041.hs b/testsuite/tests/typecheck/should_run/tcrun041.hs
index f78141adc7..f78141adc7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun041.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun041.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun041.stdout b/testsuite/tests/typecheck/should_run/tcrun041.stdout
index 83a55b7ca7..83a55b7ca7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun041.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun041.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun042.hs b/testsuite/tests/typecheck/should_run/tcrun042.hs
index 1ea5c2467f..1ea5c2467f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun042.hs
+++ b/testsuite/tests/typecheck/should_run/tcrun042.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun042.stdout b/testsuite/tests/typecheck/should_run/tcrun042.stdout
index 3ce33b9abd..3ce33b9abd 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/tcrun042.stdout
+++ b/testsuite/tests/typecheck/should_run/tcrun042.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/testeq2.hs b/testsuite/tests/typecheck/should_run/testeq2.hs
index 811131b453..811131b453 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/testeq2.hs
+++ b/testsuite/tests/typecheck/should_run/testeq2.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/should_run/testeq2.stdout b/testsuite/tests/typecheck/should_run/testeq2.stdout
index 7f7d90eae7..7f7d90eae7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_run/testeq2.stdout
+++ b/testsuite/tests/typecheck/should_run/testeq2.stdout
diff --git a/testsuite/tests/ghc-regress/typecheck/testeq1/FakePrelude.hs b/testsuite/tests/typecheck/testeq1/FakePrelude.hs
index 80161655d0..80161655d0 100644
--- a/testsuite/tests/ghc-regress/typecheck/testeq1/FakePrelude.hs
+++ b/testsuite/tests/typecheck/testeq1/FakePrelude.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/testeq1/Main.hs b/testsuite/tests/typecheck/testeq1/Main.hs
index 1e28d00192..1e28d00192 100644
--- a/testsuite/tests/ghc-regress/typecheck/testeq1/Main.hs
+++ b/testsuite/tests/typecheck/testeq1/Main.hs
diff --git a/testsuite/tests/typecheck/testeq1/Makefile b/testsuite/tests/typecheck/testeq1/Makefile
new file mode 100644
index 0000000000..9101fbd40a
--- /dev/null
+++ b/testsuite/tests/typecheck/testeq1/Makefile
@@ -0,0 +1,3 @@
+TOP=../../..
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/test.mk
diff --git a/testsuite/tests/ghc-regress/typecheck/testeq1/TypeCast.hs b/testsuite/tests/typecheck/testeq1/TypeCast.hs
index 96a4d66e57..96a4d66e57 100644
--- a/testsuite/tests/ghc-regress/typecheck/testeq1/TypeCast.hs
+++ b/testsuite/tests/typecheck/testeq1/TypeCast.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/testeq1/TypeEq.hs b/testsuite/tests/typecheck/testeq1/TypeEq.hs
index 599893cc09..599893cc09 100644
--- a/testsuite/tests/ghc-regress/typecheck/testeq1/TypeEq.hs
+++ b/testsuite/tests/typecheck/testeq1/TypeEq.hs
diff --git a/testsuite/tests/ghc-regress/typecheck/testeq1/test.T b/testsuite/tests/typecheck/testeq1/test.T
index dbb63fb9f8..dbb63fb9f8 100644
--- a/testsuite/tests/ghc-regress/typecheck/testeq1/test.T
+++ b/testsuite/tests/typecheck/testeq1/test.T
diff --git a/testsuite/tests/ghc-regress/typecheck/testeq1/typecheck.testeq1.stdout b/testsuite/tests/typecheck/testeq1/typecheck.testeq1.stdout
index 7f7d90eae7..7f7d90eae7 100644
--- a/testsuite/tests/ghc-regress/typecheck/testeq1/typecheck.testeq1.stdout
+++ b/testsuite/tests/typecheck/testeq1/typecheck.testeq1.stdout