Merge branch 'master' of http://darcs.haskell.org/testsuite

290 files changed, 506 insertions, 431 deletions

diff --git a/testsuite/driver/runtests.py b/testsuite/driver/runtests.py
index d2b5c7849f..66e3bf4d5e 100644
--- a/testsuite/driver/runtests.py
+++ b/testsuite/driver/runtests.py
@@ -181,32 +181,28 @@ from testlib import *
 
 # On Windows we need to set $PATH to include the paths to all the DLLs
 # in order for the dynamic library tests to work.
-# if windows or darwin:
-pkginfo = getStdout([config.ghc_pkg, 'dump'])
-topdir = config.libdir
-for line in pkginfo.split('\n'):
-    if line.startswith('library-dirs:'):
-        path = line.rstrip()
-        path = re.sub('^library-dirs: ', '', path)
-        path = re.sub('\\$topdir', topdir, path)
-        if path.startswith('"'):
-            path = re.sub('^"(.*)"$', '\\1', path)
-            path = re.sub('\\\\(.)', '\\1', path)
-        if windows:
-            if config.cygwin:
-                # On cygwin we can't put "c:\foo" in $PATH, as : is a
-                # field separator. So convert to /cygdrive/c/foo instead.
-                # Other pythons use ; as the separator, so no problem.
-                path = re.sub('([a-zA-Z]):', '/cygdrive/\\1', path)
-                path = re.sub('\\\\', '/', path)
-            os.environ['PATH'] = os.pathsep.join([path, os.environ.get("PATH", "")])
-        elif darwin:
-            # darwin
-            os.environ['DYLD_LIBRARY_PATH'] = os.pathsep.join([path, os.environ.get("DYLD_LIBRARY_PATH", "")])
-        else:
-            # unix
-            os.environ['LD_LIBRARY_PATH'] = os.pathsep.join([path, os.environ.get("LD_LIBRARY_PATH", "")])
-
+if windows or darwin:
+    pkginfo = getStdout([config.ghc_pkg, 'dump'])
+    topdir = config.libdir
+    for line in pkginfo.split('\n'):
+        if line.startswith('library-dirs:'):
+            path = line.rstrip()
+            path = re.sub('^library-dirs: ', '', path)
+            path = re.sub('\\$topdir', topdir, path)
+            if path.startswith('"'):
+                path = re.sub('^"(.*)"$', '\\1', path)
+                path = re.sub('\\\\(.)', '\\1', path)
+            if windows:
+                if config.cygwin:
+                    # On cygwin we can't put "c:\foo" in $PATH, as : is a
+                    # field separator. So convert to /cygdrive/c/foo instead.
+                    # Other pythons use ; as the separator, so no problem.
+                    path = re.sub('([a-zA-Z]):', '/cygdrive/\\1', path)
+                    path = re.sub('\\\\', '/', path)
+                os.environ['PATH'] = os.pathsep.join([path, os.environ.get("PATH", "")])
+            else:
+                # darwin
+                os.environ['DYLD_LIBRARY_PATH'] = os.pathsep.join([path, os.environ.get("DYLD_LIBRARY_PATH", "")])
 
 global testopts_local
 testopts_local.x = TestOptions()
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index b57a0800af..40ecf86d67 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -645,7 +645,7 @@ def test (name, setup, func, args):
     global allTestNames
     if name in allTestNames:
         framework_fail(name, 'duplicate', 'There are multiple tests with this name')
-    if not re.match('^[a-zA-Z0-9][a-zA-Z0-9._-]*$', name):
+    if not re.match('^[0-9]*[a-zA-Z][a-zA-Z0-9._-]*$', name):
         framework_fail(name, 'bad_name', 'This test has an invalid name')
     myTestOpts = copy.copy(thisdir_testopts)
 
@@ -887,6 +887,8 @@ def do_test(name, way, func, args):
                         t.expected_failures[name] = [way]
         else:
             framework_fail(name, way, 'bad result ' + passFail)
+    except KeyboardInterrupt:
+        raise
     except:
         framework_fail(name, way, 'do_test exception')
         traceback.print_exc()
diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk
index f1cd6c8131..f9ed52ee0f 100644
--- a/testsuite/mk/boilerplate.mk
+++ b/testsuite/mk/boilerplate.mk
@@ -66,9 +66,21 @@ IN_TREE_COMPILER = NO
 # passed in by the user, but
 #     which ghc          == /usr/bin/ghc
 #     which /usr/bin/ghc == /usr/bin/ghc
-# so we can just always 'which' it. We need to use 'override' in order
-# to override a value given on the commandline.
+# so on unix-like platforms we can just always 'which' it.
+# However, on cygwin, we can't just use which:
+#     $ which c:/ghc/ghc-7.4.1/bin/ghc.exe
+#     which: no ghc.exe in (./c:/ghc/ghc-7.4.1/bin)
+# so we start off by using realpath, and if that succeeds then we use
+# that value. Otherwise we fall back on 'which'.
+#
+# Note also that we need to use 'override' in order to override a
+# value given on the commandline.
+TEST_HC_REALPATH := $(realpath $(TEST_HC))
+ifeq "$(TEST_HC_REALPATH)" ""
 override TEST_HC := $(shell which '$(TEST_HC)')
+else
+override TEST_HC := $(TEST_HC_REALPATH)
+endif
 endif
 
 # We can't use $(dir ...) here as TEST_HC might be in a path
diff --git a/testsuite/tests/cabal/1750.stderr b/testsuite/tests/cabal/1750.stderr
deleted file mode 100644
index 71bed0745b..0000000000
--- a/testsuite/tests/cabal/1750.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-WARNING: there are broken packages.  Run 'ghc-pkg check' for more details.
-<command line>: cannot satisfy -package 1750A: 
-    1750A-1-XXX is unusable due to missing or recursive dependencies:
-      1750B-1-XXX
-    (use -v for more information)
diff --git a/testsuite/tests/cabal/1750.stdout b/testsuite/tests/cabal/1750.stdout
deleted file mode 100644
index dac998e2ac..0000000000
--- a/testsuite/tests/cabal/1750.stdout
+++ /dev/null
@@ -1,4 +0,0 @@
-local1750.package.conf:
-    {1750A-1}
-    {1750B-1}
-
diff --git a/testsuite/tests/cabal/1750A.pkg b/testsuite/tests/cabal/1750A.pkg
deleted file mode 100644
index e32c97ff8b..0000000000
--- a/testsuite/tests/cabal/1750A.pkg
+++ /dev/null
@@ -1,4 +0,0 @@
-name: 1750A
-version: 1
-id: 1750A-1-XXX
-depends: 1750B-1-XXX
diff --git a/testsuite/tests/cabal/1750B.pkg b/testsuite/tests/cabal/1750B.pkg
deleted file mode 100644
index 5e9ff1f56d..0000000000
--- a/testsuite/tests/cabal/1750B.pkg
+++ /dev/null
@@ -1,4 +0,0 @@
-name: 1750B
-version: 1
-id: 1750B-1-XXX
-depends: 1750A-1-XXX
diff --git a/testsuite/tests/cabal/Makefile b/testsuite/tests/cabal/Makefile
index 769a50d3fd..f0091bceeb 100644
--- a/testsuite/tests/cabal/Makefile
+++ b/testsuite/tests/cabal/Makefile
@@ -110,20 +110,20 @@ ghcpkg06 :
 	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-db -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-db list
+PKGCONFT1750=localT1750.package.conf
+LOCAL_GHC_PKGT1750 = '$(GHC_PKG)' --no-user-package-db -f $(PKGCONFT1750)
+
+T1750:
+	rm -rf $(PKGCONFT1750) T1750.hs T1750.o T1750.hi T1750.out
+	$(LOCAL_GHC_PKGT1750) init $(PKGCONFT1750)
+	$(LOCAL_GHC_PKGT1750) register --force T1750A.pkg >T1750.out 2>&1
+	$(LOCAL_GHC_PKGT1750) register --force T1750B.pkg >T1750.out 2>&1
+	GHC_PACKAGE_PATH=$(PKGCONFT1750) '$(GHC_PKG)' --no-user-package-db 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-db $(PKGCONF1750) -package 1750A 1750.hs || true
+	echo "main = return ()" >T1750.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONFT1750) -package T1750A T1750.hs || true
 
 PKGCONFSHADOW1=localshadow1.package.conf
 PKGCONFSHADOW2=localshadow2.package.conf
diff --git a/testsuite/tests/cabal/T1750.stderr b/testsuite/tests/cabal/T1750.stderr
new file mode 100644
index 0000000000..1809d5b050
--- /dev/null
+++ b/testsuite/tests/cabal/T1750.stderr
@@ -0,0 +1,5 @@
+WARNING: there are broken packages.  Run 'ghc-pkg check' for more details.
+<command line>: cannot satisfy -package T1750A: 
+    T1750A-1-XXX is unusable due to missing or recursive dependencies:
+      T1750B-1-XXX
+    (use -v for more information)
diff --git a/testsuite/tests/cabal/T1750.stdout b/testsuite/tests/cabal/T1750.stdout
new file mode 100644
index 0000000000..62d032334a
--- /dev/null
+++ b/testsuite/tests/cabal/T1750.stdout
@@ -0,0 +1,4 @@
+localT1750.package.conf:
+    {T1750A-1}
+    {T1750B-1}
+
diff --git a/testsuite/tests/cabal/T1750A.pkg b/testsuite/tests/cabal/T1750A.pkg
new file mode 100644
index 0000000000..9bda51eea0
--- /dev/null
+++ b/testsuite/tests/cabal/T1750A.pkg
@@ -0,0 +1,4 @@
+name: T1750A
+version: 1
+id: T1750A-1-XXX
+depends: T1750B-1-XXX
diff --git a/testsuite/tests/cabal/T1750B.pkg b/testsuite/tests/cabal/T1750B.pkg
new file mode 100644
index 0000000000..479ce7092c
--- /dev/null
+++ b/testsuite/tests/cabal/T1750B.pkg
@@ -0,0 +1,4 @@
+name: T1750B
+version: 1
+id: T1750B-1-XXX
+depends: T1750A-1-XXX
diff --git a/testsuite/tests/cabal/all.T b/testsuite/tests/cabal/all.T
index f84688cbb5..04e918d23a 100644
--- a/testsuite/tests/cabal/all.T
+++ b/testsuite/tests/cabal/all.T
@@ -51,11 +51,11 @@ test('ghcpkg06',
 # (this was disallowed in GHC 6.4 and earlier)
 test('pkg01', normal, compile, [''])
 
-test('1750',
-     extra_clean(['1750.hs', '1750.out',
-                  'local1750.package.conf',
-                  'local1750.package.conf.old']),
-     run_command, ['$MAKE -s --no-print-directory 1750'])
+test('T1750',
+     extra_clean(['T1750.hs', 'T1750.out',
+                  'localT1750.package.conf',
+                  'localT1750.package.conf.old']),
+     run_command, ['$MAKE -s --no-print-directory T1750'])
 
 test('shadow',
      extra_clean(['shadow.out', 'shadow.hs', 'shadow.hi',
diff --git a/testsuite/tests/codeGen/should_compile/Makefile b/testsuite/tests/codeGen/should_compile/Makefile
index ff43099198..c804a12ea7 100644
--- a/testsuite/tests/codeGen/should_compile/Makefile
+++ b/testsuite/tests/codeGen/should_compile/Makefile
@@ -2,6 +2,6 @@ TOP=../../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/test.mk
 
-2578:
-	'$(TEST_HC)' $(TEST_HC_OPTS) --make 2578 -fforce-recomp -v0
+T2578:
+	'$(TEST_HC)' $(TEST_HC_OPTS) --make T2578 -fforce-recomp -v0
 
diff --git a/testsuite/tests/codeGen/should_compile/1916.hs b/testsuite/tests/codeGen/should_compile/T1916.hs
index 7210aaf41c..7210aaf41c 100644
--- a/testsuite/tests/codeGen/should_compile/1916.hs
+++ b/testsuite/tests/codeGen/should_compile/T1916.hs
diff --git a/testsuite/tests/codeGen/should_compile/2388.hs b/testsuite/tests/codeGen/should_compile/T2388.hs
index f3364f5b6e..f3364f5b6e 100644
--- a/testsuite/tests/codeGen/should_compile/2388.hs
+++ b/testsuite/tests/codeGen/should_compile/T2388.hs
diff --git a/testsuite/tests/codeGen/should_compile/2578.hs b/testsuite/tests/codeGen/should_compile/T2578.hs
index c851b54f88..c851b54f88 100644
--- a/testsuite/tests/codeGen/should_compile/2578.hs
+++ b/testsuite/tests/codeGen/should_compile/T2578.hs
diff --git a/testsuite/tests/codeGen/should_compile/3132.hs b/testsuite/tests/codeGen/should_compile/T3132.hs
index c6aa2579e9..c6aa2579e9 100644
--- a/testsuite/tests/codeGen/should_compile/3132.hs
+++ b/testsuite/tests/codeGen/should_compile/T3132.hs
diff --git a/testsuite/tests/codeGen/should_compile/3579.hs b/testsuite/tests/codeGen/should_compile/T3579.hs
index 29711e147b..29711e147b 100644
--- a/testsuite/tests/codeGen/should_compile/3579.hs
+++ b/testsuite/tests/codeGen/should_compile/T3579.hs
diff --git a/testsuite/tests/codeGen/should_compile/all.T b/testsuite/tests/codeGen/should_compile/all.T
index 77d7f02473..046d98ec56 100644
--- a/testsuite/tests/codeGen/should_compile/all.T
+++ b/testsuite/tests/codeGen/should_compile/all.T
@@ -7,13 +7,13 @@ test('cg006', normal, compile, [''])
 test('cg007', normal, compile, [''])
 test('cg008', normal, compile, [''])
 
-test('1916', normal, compile, [''])
-test('2388', normal, compile, [''])
-test('3132', normal, compile, ['-dcmm-lint'])
+test('T1916', normal, compile, [''])
+test('T2388', normal, compile, [''])
+test('T3132', normal, compile, ['-dcmm-lint'])
 test('T3286', extra_clean(['T3286b.o','T3286b.hi']), 
               multimod_compile, ['T3286', '-v0'])
-test('3579', normal, compile, [''])
-test('2578', normal, run_command, ['$MAKE -s --no-print-directory 2578'])
+test('T3579', normal, compile, [''])
+test('T2578', normal, run_command, ['$MAKE -s --no-print-directory T2578'])
 # skip llvm on i386 as we don't support fPIC
 test('jmp_tbl', if_arch('i386', omit_ways(['llvm', 'optllvm'])), compile, ['-fPIC -O'])
 test('massive_array',
diff --git a/testsuite/tests/codeGen/should_run/5626.stderr b/testsuite/tests/codeGen/should_run/5626.stderr
deleted file mode 100644
index 7cab83de79..0000000000
--- a/testsuite/tests/codeGen/should_run/5626.stderr
+++ /dev/null
@@ -1 +0,0 @@
-5626: Prelude.undefined
diff --git a/testsuite/tests/codeGen/should_run/1852.hs b/testsuite/tests/codeGen/should_run/T1852.hs
index f5d9370741..f5d9370741 100644
--- a/testsuite/tests/codeGen/should_run/1852.hs
+++ b/testsuite/tests/codeGen/should_run/T1852.hs
diff --git a/testsuite/tests/codeGen/should_run/1852.stdout b/testsuite/tests/codeGen/should_run/T1852.stdout
index 8adb9bb604..8adb9bb604 100644
--- a/testsuite/tests/codeGen/should_run/1852.stdout
+++ b/testsuite/tests/codeGen/should_run/T1852.stdout
diff --git a/testsuite/tests/codeGen/should_run/1861.hs b/testsuite/tests/codeGen/should_run/T1861.hs
index b6136f4ea2..b6136f4ea2 100644
--- a/testsuite/tests/codeGen/should_run/1861.hs
+++ b/testsuite/tests/codeGen/should_run/T1861.hs
diff --git a/testsuite/tests/codeGen/should_run/1861.stdout b/testsuite/tests/codeGen/should_run/T1861.stdout
index 06eb4d10ee..06eb4d10ee 100644
--- a/testsuite/tests/codeGen/should_run/1861.stdout
+++ b/testsuite/tests/codeGen/should_run/T1861.stdout
diff --git a/testsuite/tests/codeGen/should_run/2080.hs b/testsuite/tests/codeGen/should_run/T2080.hs
index a1baf757f5..a1baf757f5 100644
--- a/testsuite/tests/codeGen/should_run/2080.hs
+++ b/testsuite/tests/codeGen/should_run/T2080.hs
diff --git a/testsuite/tests/codeGen/should_run/2080.stdout b/testsuite/tests/codeGen/should_run/T2080.stdout
index bc59c12aa1..bc59c12aa1 100644
--- a/testsuite/tests/codeGen/should_run/2080.stdout
+++ b/testsuite/tests/codeGen/should_run/T2080.stdout
diff --git a/testsuite/tests/codeGen/should_run/2838.hs b/testsuite/tests/codeGen/should_run/T2838.hs
index 0933c1203e..0933c1203e 100644
--- a/testsuite/tests/codeGen/should_run/2838.hs
+++ b/testsuite/tests/codeGen/should_run/T2838.hs
diff --git a/testsuite/tests/codeGen/should_run/2838.stdout b/testsuite/tests/codeGen/should_run/T2838.stdout
index 573541ac97..573541ac97 100644
--- a/testsuite/tests/codeGen/should_run/2838.stdout
+++ b/testsuite/tests/codeGen/should_run/T2838.stdout
diff --git a/testsuite/tests/codeGen/should_run/2838.stdout-ws-64 b/testsuite/tests/codeGen/should_run/T2838.stdout-ws-64
index 1862ace676..1862ace676 100644
--- a/testsuite/tests/codeGen/should_run/2838.stdout-ws-64
+++ b/testsuite/tests/codeGen/should_run/T2838.stdout-ws-64
diff --git a/testsuite/tests/codeGen/should_run/3207.hs b/testsuite/tests/codeGen/should_run/T3207.hs
index 4738fca343..4738fca343 100644
--- a/testsuite/tests/codeGen/should_run/3207.hs
+++ b/testsuite/tests/codeGen/should_run/T3207.hs
diff --git a/testsuite/tests/codeGen/should_run/3207.stdout b/testsuite/tests/codeGen/should_run/T3207.stdout
index 6a452c185a..6a452c185a 100644
--- a/testsuite/tests/codeGen/should_run/3207.stdout
+++ b/testsuite/tests/codeGen/should_run/T3207.stdout
diff --git a/testsuite/tests/codeGen/should_run/3561.hs b/testsuite/tests/codeGen/should_run/T3561.hs
index 44258a839c..44258a839c 100644
--- a/testsuite/tests/codeGen/should_run/3561.hs
+++ b/testsuite/tests/codeGen/should_run/T3561.hs
diff --git a/testsuite/tests/codeGen/should_run/3561.stdout b/testsuite/tests/codeGen/should_run/T3561.stdout
index 7ed6ff82de..7ed6ff82de 100644
--- a/testsuite/tests/codeGen/should_run/3561.stdout
+++ b/testsuite/tests/codeGen/should_run/T3561.stdout
diff --git a/testsuite/tests/codeGen/should_run/3677.hs b/testsuite/tests/codeGen/should_run/T3677.hs
index 67b12b2672..67b12b2672 100644
--- a/testsuite/tests/codeGen/should_run/3677.hs
+++ b/testsuite/tests/codeGen/should_run/T3677.hs
diff --git a/testsuite/tests/codeGen/should_run/3677.stdout b/testsuite/tests/codeGen/should_run/T3677.stdout
index 53b22189de..53b22189de 100644
--- a/testsuite/tests/codeGen/should_run/3677.stdout
+++ b/testsuite/tests/codeGen/should_run/T3677.stdout
diff --git a/testsuite/tests/codeGen/should_run/4441.hs b/testsuite/tests/codeGen/should_run/T4441.hs
index ee96170af8..ee96170af8 100644
--- a/testsuite/tests/codeGen/should_run/4441.hs
+++ b/testsuite/tests/codeGen/should_run/T4441.hs
diff --git a/testsuite/tests/codeGen/should_run/4441.stdout b/testsuite/tests/codeGen/should_run/T4441.stdout
index 865b73fb17..865b73fb17 100644
--- a/testsuite/tests/codeGen/should_run/4441.stdout
+++ b/testsuite/tests/codeGen/should_run/T4441.stdout
diff --git a/testsuite/tests/codeGen/should_run/5129.hs b/testsuite/tests/codeGen/should_run/T5129.hs
index 6bc1912754..6bc1912754 100644
--- a/testsuite/tests/codeGen/should_run/5129.hs
+++ b/testsuite/tests/codeGen/should_run/T5129.hs
diff --git a/testsuite/tests/codeGen/should_run/5149.hs b/testsuite/tests/codeGen/should_run/T5149.hs
index c0c88e3015..c0c88e3015 100644
--- a/testsuite/tests/codeGen/should_run/5149.hs
+++ b/testsuite/tests/codeGen/should_run/T5149.hs
diff --git a/testsuite/tests/codeGen/should_run/5149.stdout b/testsuite/tests/codeGen/should_run/T5149.stdout
index d00491fd7e..d00491fd7e 100644
--- a/testsuite/tests/codeGen/should_run/5149.stdout
+++ b/testsuite/tests/codeGen/should_run/T5149.stdout
diff --git a/testsuite/tests/codeGen/should_run/5149_cmm.cmm b/testsuite/tests/codeGen/should_run/T5149_cmm.cmm
index 567699c3ee..567699c3ee 100644
--- a/testsuite/tests/codeGen/should_run/5149_cmm.cmm
+++ b/testsuite/tests/codeGen/should_run/T5149_cmm.cmm
diff --git a/testsuite/tests/codeGen/should_run/5626.hs b/testsuite/tests/codeGen/should_run/T5626.hs
index 93afcf7c6d..93afcf7c6d 100644
--- a/testsuite/tests/codeGen/should_run/5626.hs
+++ b/testsuite/tests/codeGen/should_run/T5626.hs
diff --git a/testsuite/tests/codeGen/should_run/T5626.stderr b/testsuite/tests/codeGen/should_run/T5626.stderr
new file mode 100644
index 0000000000..df9cfc932a
--- /dev/null
+++ b/testsuite/tests/codeGen/should_run/T5626.stderr
@@ -0,0 +1 @@
+T5626: Prelude.undefined
diff --git a/testsuite/tests/codeGen/should_run/5747.hs b/testsuite/tests/codeGen/should_run/T5747.hs
index 2975b55f07..2975b55f07 100644
--- a/testsuite/tests/codeGen/should_run/5747.hs
+++ b/testsuite/tests/codeGen/should_run/T5747.hs
diff --git a/testsuite/tests/codeGen/should_run/5747.stdout b/testsuite/tests/codeGen/should_run/T5747.stdout
index d3827e75a5..d3827e75a5 100644
--- a/testsuite/tests/codeGen/should_run/5747.stdout
+++ b/testsuite/tests/codeGen/should_run/T5747.stdout
diff --git a/testsuite/tests/codeGen/should_run/5785.hs b/testsuite/tests/codeGen/should_run/T5785.hs
index 1b27f10a15..1b27f10a15 100644
--- a/testsuite/tests/codeGen/should_run/5785.hs
+++ b/testsuite/tests/codeGen/should_run/T5785.hs
diff --git a/testsuite/tests/codeGen/should_run/5785.stdout b/testsuite/tests/codeGen/should_run/T5785.stdout
index f3d21155e5..f3d21155e5 100644
--- a/testsuite/tests/codeGen/should_run/5785.stdout
+++ b/testsuite/tests/codeGen/should_run/T5785.stdout
diff --git a/testsuite/tests/codeGen/should_run/6146.hs b/testsuite/tests/codeGen/should_run/T6146.hs
index 1142f5fabd..1142f5fabd 100644
--- a/testsuite/tests/codeGen/should_run/6146.hs
+++ b/testsuite/tests/codeGen/should_run/T6146.hs
diff --git a/testsuite/tests/codeGen/should_run/6146.stdin b/testsuite/tests/codeGen/should_run/T6146.stdin
index 4792e70f33..4792e70f33 100644
--- a/testsuite/tests/codeGen/should_run/6146.stdin
+++ b/testsuite/tests/codeGen/should_run/T6146.stdin
diff --git a/testsuite/tests/codeGen/should_run/6146.stdout b/testsuite/tests/codeGen/should_run/T6146.stdout
index e6ce1acc30..e6ce1acc30 100644
--- a/testsuite/tests/codeGen/should_run/6146.stdout
+++ b/testsuite/tests/codeGen/should_run/T6146.stdout
diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T
index a8c5a0a707..b12c30b8f7 100644
--- a/testsuite/tests/codeGen/should_run/all.T
+++ b/testsuite/tests/codeGen/should_run/all.T
@@ -75,23 +75,23 @@ test('cgrun069', omit_ways(['ghci']), multi_compile_and_run,
 test('cgrun070', normal, compile_and_run, [''])
 test('cgrun071', normal, compile_and_run, [''])
 
-test('1852', normal, compile_and_run, [''])
-test('1861', extra_run_opts('0'), compile_and_run, [''])
-test('2080', normal, compile_and_run, [''])
-test('2838', normal, compile_and_run, [''])
-test('3207', normal, compile_and_run, [''])
-test('3561', normal, compile_and_run, [''])
-test('3677', extra_run_opts('+RTS -K8k -RTS'), compile_and_run, [''])
-test('4441', normal, compile_and_run, [''])
-test('5149', omit_ways(['ghci']), multi_compile_and_run,
-                 ['5149', [('5149_cmm.cmm', '')], ''])
-test('5129', normal, compile_and_run, [''])
-test('5626', exit_code(1), compile_and_run, [''])
-test('5747', if_arch('i386', extra_hc_opts('-msse2')), compile_and_run, ['-O2'])
-test('5785', normal, compile_and_run, [''])
+test('T1852', normal, compile_and_run, [''])
+test('T1861', extra_run_opts('0'), compile_and_run, [''])
+test('T2080', normal, compile_and_run, [''])
+test('T2838', normal, compile_and_run, [''])
+test('T3207', normal, compile_and_run, [''])
+test('T3561', normal, compile_and_run, [''])
+test('T3677', extra_run_opts('+RTS -K8k -RTS'), compile_and_run, [''])
+test('T4441', normal, compile_and_run, [''])
+test('T5149', omit_ways(['ghci']), multi_compile_and_run,
+                 ['T5149', [('T5149_cmm.cmm', '')], ''])
+test('T5129', normal, compile_and_run, [''])
+test('T5626', exit_code(1), compile_and_run, [''])
+test('T5747', if_arch('i386', extra_hc_opts('-msse2')), compile_and_run, ['-O2'])
+test('T5785', normal, compile_and_run, [''])
 test('setByteArray', normal, compile_and_run, [''])
 
-test('6146', normal, compile_and_run, [''])
+test('T6146', normal, compile_and_run, [''])
 test('T5900', normal, compile_and_run, [''])
 test('T7163', normal, compile_and_run, [''])
 
diff --git a/testsuite/tests/concurrent/2317/Makefile b/testsuite/tests/concurrent/T2317/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/concurrent/2317/Makefile
+++ b/testsuite/tests/concurrent/T2317/Makefile
diff --git a/testsuite/tests/concurrent/2317/2317.hs b/testsuite/tests/concurrent/T2317/T2317.hs
index 5025582ebe..5025582ebe 100644
--- a/testsuite/tests/concurrent/2317/2317.hs
+++ b/testsuite/tests/concurrent/T2317/T2317.hs
diff --git a/testsuite/tests/concurrent/2317/2317.stdout b/testsuite/tests/concurrent/T2317/T2317.stdout
index 7ab314964e..7ab314964e 100644
--- a/testsuite/tests/concurrent/2317/2317.stdout
+++ b/testsuite/tests/concurrent/T2317/T2317.stdout
diff --git a/testsuite/tests/concurrent/2317/all.T b/testsuite/tests/concurrent/T2317/all.T
index ab4e890721..0ad9db3dc5 100644
--- a/testsuite/tests/concurrent/2317/all.T
+++ b/testsuite/tests/concurrent/T2317/all.T
@@ -1,5 +1,5 @@
-test('2317',
+test('T2317',
      [skip_if_fast,
       reqlib('parallel'), reqlib('random')],
      multimod_compile_and_run,
-     ['2317',''])
+     ['T2317',''])
diff --git a/testsuite/tests/concurrent/should_run/4030.stderr b/testsuite/tests/concurrent/should_run/4030.stderr
deleted file mode 100644
index 0e2a7bfc12..0000000000
--- a/testsuite/tests/concurrent/should_run/4030.stderr
+++ /dev/null
@@ -1 +0,0 @@
-4030: <<loop>>
diff --git a/testsuite/tests/concurrent/should_run/5611.stderr b/testsuite/tests/concurrent/should_run/5611.stderr
deleted file mode 100644
index 7a7f2c7acc..0000000000
--- a/testsuite/tests/concurrent/should_run/5611.stderr
+++ /dev/null
@@ -1 +0,0 @@
-5611: user error (Exception delivered successfully)
diff --git a/testsuite/tests/concurrent/should_run/5866.stderr b/testsuite/tests/concurrent/should_run/5866.stderr
deleted file mode 100644
index a4774f25ab..0000000000
--- a/testsuite/tests/concurrent/should_run/5866.stderr
+++ /dev/null
@@ -1 +0,0 @@
-5866: thread blocked indefinitely in an STM transaction
diff --git a/testsuite/tests/concurrent/should_run/1980.hs b/testsuite/tests/concurrent/should_run/T1980.hs
index 61fcd9d15b..61fcd9d15b 100644
--- a/testsuite/tests/concurrent/should_run/1980.hs
+++ b/testsuite/tests/concurrent/should_run/T1980.hs
diff --git a/testsuite/tests/concurrent/should_run/2910.hs b/testsuite/tests/concurrent/should_run/T2910.hs
index 2867008159..2867008159 100644
--- a/testsuite/tests/concurrent/should_run/2910.hs
+++ b/testsuite/tests/concurrent/should_run/T2910.hs
diff --git a/testsuite/tests/concurrent/should_run/2910.stdout b/testsuite/tests/concurrent/should_run/T2910.stdout
index 145fced527..145fced527 100644
--- a/testsuite/tests/concurrent/should_run/2910.stdout
+++ b/testsuite/tests/concurrent/should_run/T2910.stdout
diff --git a/testsuite/tests/concurrent/should_run/2910a.hs b/testsuite/tests/concurrent/should_run/T2910a.hs
index 380c15467d..380c15467d 100644
--- a/testsuite/tests/concurrent/should_run/2910a.hs
+++ b/testsuite/tests/concurrent/should_run/T2910a.hs
diff --git a/testsuite/tests/concurrent/should_run/2910a.stdout b/testsuite/tests/concurrent/should_run/T2910a.stdout
index 145fced527..145fced527 100644
--- a/testsuite/tests/concurrent/should_run/2910a.stdout
+++ b/testsuite/tests/concurrent/should_run/T2910a.stdout
diff --git a/testsuite/tests/concurrent/should_run/3279.hs b/testsuite/tests/concurrent/should_run/T3279.hs
index f479704310..f479704310 100644
--- a/testsuite/tests/concurrent/should_run/3279.hs
+++ b/testsuite/tests/concurrent/should_run/T3279.hs
diff --git a/testsuite/tests/concurrent/should_run/3279.stdout b/testsuite/tests/concurrent/should_run/T3279.stdout
index 0cfbf08886..0cfbf08886 100644
--- a/testsuite/tests/concurrent/should_run/3279.stdout
+++ b/testsuite/tests/concurrent/should_run/T3279.stdout
diff --git a/testsuite/tests/concurrent/should_run/3429.hs b/testsuite/tests/concurrent/should_run/T3429.hs
index 8b12a8b1ff..8b12a8b1ff 100644
--- a/testsuite/tests/concurrent/should_run/3429.hs
+++ b/testsuite/tests/concurrent/should_run/T3429.hs
diff --git a/testsuite/tests/concurrent/should_run/3429.stdout b/testsuite/tests/concurrent/should_run/T3429.stdout
index ad88db8c31..ad88db8c31 100644
--- a/testsuite/tests/concurrent/should_run/3429.stdout
+++ b/testsuite/tests/concurrent/should_run/T3429.stdout
diff --git a/testsuite/tests/concurrent/should_run/367.hs b/testsuite/tests/concurrent/should_run/T367.hs
index 52f41a38a1..52f41a38a1 100644
--- a/testsuite/tests/concurrent/should_run/367.hs
+++ b/testsuite/tests/concurrent/should_run/T367.hs
diff --git a/testsuite/tests/concurrent/should_run/367.stdout b/testsuite/tests/concurrent/should_run/T367.stdout
index a965a70ed4..a965a70ed4 100644
--- a/testsuite/tests/concurrent/should_run/367.stdout
+++ b/testsuite/tests/concurrent/should_run/T367.stdout
diff --git a/testsuite/tests/concurrent/should_run/367_letnoescape.hs b/testsuite/tests/concurrent/should_run/T367_letnoescape.hs
index 5230509e71..5230509e71 100644
--- a/testsuite/tests/concurrent/should_run/367_letnoescape.hs
+++ b/testsuite/tests/concurrent/should_run/T367_letnoescape.hs
diff --git a/testsuite/tests/concurrent/should_run/367_letnoescape.stdout b/testsuite/tests/concurrent/should_run/T367_letnoescape.stdout
index a965a70ed4..a965a70ed4 100644
--- a/testsuite/tests/concurrent/should_run/367_letnoescape.stdout
+++ b/testsuite/tests/concurrent/should_run/T367_letnoescape.stdout
diff --git a/testsuite/tests/concurrent/should_run/4030.hs b/testsuite/tests/concurrent/should_run/T4030.hs
index 1993bad86b..1993bad86b 100644
--- a/testsuite/tests/concurrent/should_run/4030.hs
+++ b/testsuite/tests/concurrent/should_run/T4030.hs
diff --git a/testsuite/tests/concurrent/should_run/T4030.stderr b/testsuite/tests/concurrent/should_run/T4030.stderr
new file mode 100644
index 0000000000..428476bb8f
--- /dev/null
+++ b/testsuite/tests/concurrent/should_run/T4030.stderr
@@ -0,0 +1 @@
+T4030: <<loop>>
diff --git a/testsuite/tests/concurrent/should_run/4262.hs b/testsuite/tests/concurrent/should_run/T4262.hs
index e114b558a6..e114b558a6 100644
--- a/testsuite/tests/concurrent/should_run/4262.hs
+++ b/testsuite/tests/concurrent/should_run/T4262.hs
diff --git a/testsuite/tests/concurrent/should_run/4262.stdout b/testsuite/tests/concurrent/should_run/T4262.stdout
index 45a4fb75db..45a4fb75db 100644
--- a/testsuite/tests/concurrent/should_run/4262.stdout
+++ b/testsuite/tests/concurrent/should_run/T4262.stdout
diff --git a/testsuite/tests/concurrent/should_run/4811.hs b/testsuite/tests/concurrent/should_run/T4811.hs
index 5aad0a51df..5aad0a51df 100644
--- a/testsuite/tests/concurrent/should_run/4811.hs
+++ b/testsuite/tests/concurrent/should_run/T4811.hs
diff --git a/testsuite/tests/concurrent/should_run/4813.hs b/testsuite/tests/concurrent/should_run/T4813.hs
index db3a9778c6..db3a9778c6 100644
--- a/testsuite/tests/concurrent/should_run/4813.hs
+++ b/testsuite/tests/concurrent/should_run/T4813.hs
diff --git a/testsuite/tests/concurrent/should_run/5238.hs b/testsuite/tests/concurrent/should_run/T5238.hs
index 1de60c4e80..1de60c4e80 100644
--- a/testsuite/tests/concurrent/should_run/5238.hs
+++ b/testsuite/tests/concurrent/should_run/T5238.hs
diff --git a/testsuite/tests/concurrent/should_run/5238.stdout b/testsuite/tests/concurrent/should_run/T5238.stdout
index 8262bfafc2..8262bfafc2 100644
--- a/testsuite/tests/concurrent/should_run/5238.stdout
+++ b/testsuite/tests/concurrent/should_run/T5238.stdout
diff --git a/testsuite/tests/concurrent/should_run/5421.hs b/testsuite/tests/concurrent/should_run/T5421.hs
index 863820ba4a..863820ba4a 100644
--- a/testsuite/tests/concurrent/should_run/5421.hs
+++ b/testsuite/tests/concurrent/should_run/T5421.hs
diff --git a/testsuite/tests/concurrent/should_run/5558.hs b/testsuite/tests/concurrent/should_run/T5558.hs
index 4197da6aa1..4197da6aa1 100644
--- a/testsuite/tests/concurrent/should_run/5558.hs
+++ b/testsuite/tests/concurrent/should_run/T5558.hs
diff --git a/testsuite/tests/concurrent/should_run/5611.hs b/testsuite/tests/concurrent/should_run/T5611.hs
index e46859d27c..e46859d27c 100644
--- a/testsuite/tests/concurrent/should_run/5611.hs
+++ b/testsuite/tests/concurrent/should_run/T5611.hs
diff --git a/testsuite/tests/concurrent/should_run/T5611.stderr b/testsuite/tests/concurrent/should_run/T5611.stderr
new file mode 100644
index 0000000000..6fdc96912c
--- /dev/null
+++ b/testsuite/tests/concurrent/should_run/T5611.stderr
@@ -0,0 +1 @@
+T5611: user error (Exception delivered successfully)
diff --git a/testsuite/tests/concurrent/should_run/5611.stdout b/testsuite/tests/concurrent/should_run/T5611.stdout
index cf4f0d2827..cf4f0d2827 100644
--- a/testsuite/tests/concurrent/should_run/5611.stdout
+++ b/testsuite/tests/concurrent/should_run/T5611.stdout
diff --git a/testsuite/tests/concurrent/should_run/5866.hs b/testsuite/tests/concurrent/should_run/T5866.hs
index 4650ea66e9..4650ea66e9 100644
--- a/testsuite/tests/concurrent/should_run/5866.hs
+++ b/testsuite/tests/concurrent/should_run/T5866.hs
diff --git a/testsuite/tests/concurrent/should_run/T5866.stderr b/testsuite/tests/concurrent/should_run/T5866.stderr
new file mode 100644
index 0000000000..f2d13997e7
--- /dev/null
+++ b/testsuite/tests/concurrent/should_run/T5866.stderr
@@ -0,0 +1 @@
+T5866: thread blocked indefinitely in an STM transaction
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index 71b821f47c..356cdbc6bb 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/tests/concurrent/should_run/all.T
@@ -22,20 +22,20 @@ test('conc072', only_ways(['threaded2']), compile_and_run, [''])
 test('conc073', normal, compile_and_run, [''])
 
 # vector code must get inlined to become non-allocating
-test('367', composes([reqlib('vector'), timeout_multiplier(0.001)]), compile_and_run, ['-O2 -fno-omit-yields'])
-test('367_letnoescape', composes([timeout_multiplier(0.001)]), compile_and_run, ['-fno-omit-yields'])
+test('T367', composes([reqlib('vector'), timeout_multiplier(0.001)]), compile_and_run, ['-O2 -fno-omit-yields'])
+test('T367_letnoescape', composes([timeout_multiplier(0.001)]), compile_and_run, ['-fno-omit-yields'])
 
-test('1980', normal, compile_and_run, [''])
-test('2910', normal, compile_and_run, [''])
-test('2910a', normal, compile_and_run, [''])
-test('3279', normal, compile_and_run, [''])
+test('T1980', normal, compile_and_run, [''])
+test('T2910', normal, compile_and_run, [''])
+test('T2910a', normal, compile_and_run, [''])
+test('T3279', normal, compile_and_run, [''])
 
 # This test takes a long time with the default context switch interval
-test('3429', extra_run_opts('+RTS -C0.001 -RTS'), compile_and_run, [''])
+test('T3429', extra_run_opts('+RTS -C0.001 -RTS'), compile_and_run, [''])
 
 # without -O, goes into an infinite loop
 # GHCi does not detect the infinite loop.  We should really fix this.
-test('4030', omit_ways('ghci'), compile_and_run, ['-O'])
+test('T4030', omit_ways('ghci'), compile_and_run, ['-O'])
 
 # each of these runs for about a second
 test('throwto001', [reqlib('random'), extra_run_opts('1000 2000')],
@@ -50,29 +50,29 @@ test('async001', normal, compile_and_run, [''])
 
 test('numsparks001', only_ways(['threaded1']), compile_and_run, [''])
 
-test('4262', [ skip, # skip for now, it doesn't give reliable results
-               only_ways(['threaded1']),
-               unless_os('linux',skip),
-               if_compiler_lt('ghc', '7.1', expect_fail) ],
-             compile_and_run, [''])
+test('T4262', [ skip, # skip for now, it doesn't give reliable results
+                only_ways(['threaded1']),
+                unless_os('linux',skip),
+                if_compiler_lt('ghc', '7.1', expect_fail) ],
+              compile_and_run, [''])
 
-test('4813', normal, compile_and_run, [''])
-test('4811', normal, compile_and_run, [''])
+test('T4813', normal, compile_and_run, [''])
+test('T4811', normal, compile_and_run, [''])
 
 test('allowinterrupt001', normal, compile_and_run, [''])
 
 # try hard to provoke the error by running the test 100 times
-test('5558',
+test('T5558',
      [ only_ways(['threaded2']),
        cmd_wrapper(
          lambda c: "for i in %s; do %s || break; done"  %
            (" ".join(str(i) for i in range(1,101)), c)) ],
      compile_and_run, [''])
 
-test('5421', normal, compile_and_run, [''])
-test('5611', normal, compile_and_run, [''])
-test('5238', normal, compile_and_run, [''])
-test('5866', exit_code(1), compile_and_run, [''])
+test('T5421', normal, compile_and_run, [''])
+test('T5611', normal, compile_and_run, [''])
+test('T5238', normal, compile_and_run, [''])
+test('T5866', exit_code(1), compile_and_run, [''])
 
 # -----------------------------------------------------------------------------
 # These tests we only do for a full run
diff --git a/testsuite/tests/driver/1372/all.T b/testsuite/tests/driver/1372/all.T
deleted file mode 100644
index cabf3c01f8..0000000000
--- a/testsuite/tests/driver/1372/all.T
+++ /dev/null
@@ -1,5 +0,0 @@
-test('1372',
-     clean_cmd('$MAKE -s clean'),
-     run_command,
-     ['$MAKE -s --no-print-directory 1372'])
-
diff --git a/testsuite/tests/driver/2499.stderr b/testsuite/tests/driver/2499.stderr
deleted file mode 100644
index 73404befe3..0000000000
--- a/testsuite/tests/driver/2499.stderr
+++ /dev/null
@@ -1,4 +0,0 @@
-
-2499.hs:1:12: unknown flag in  {-# OPTIONS_GHC #-} pragma: -package
-
-2499.hs:1:12: unknown flag in  {-# OPTIONS_GHC #-} pragma: blargh
diff --git a/testsuite/tests/driver/Makefile b/testsuite/tests/driver/Makefile
index e293772f49..bd24b2e88d 100644
--- a/testsuite/tests/driver/Makefile
+++ b/testsuite/tests/driver/Makefile
@@ -411,7 +411,7 @@ test200:
 
 # -----------------------------------------------------------------------------
 
-2566::
+T2566::
 	if "$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) -c foo2566.bar; then false else true; fi
 
 .PHONY: mode001
@@ -439,10 +439,10 @@ shared001:
 
 # -----------------------------------------------------------------------------
 
-3674:
-	$(RM) 3674*.o 3674*.hi 3674_pre
-	"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --make 3674_pre.hs
-	"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --make 3674.hs
+T3674:
+	$(RM) T3674*.o T3674*.hi T3674_pre
+	"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --make T3674_pre.hs
+	"$(TEST_HC)" $(TEST_HC_OPTS_NO_RECOMP) --make T3674.hs
 
 .PHONY: rtsopts001
 rtsopts001:
diff --git a/testsuite/tests/driver/1372/Makefile b/testsuite/tests/driver/T1372/Makefile
index e0b3873ec6..91ef6d50c7 100644
--- a/testsuite/tests/driver/1372/Makefile
+++ b/testsuite/tests/driver/T1372/Makefile
@@ -17,7 +17,7 @@ clean:
 	rm -f p1/A.hs
 	rm -f $(LOCAL_PKGCONF)
 
-1372:
+T1372:
 	$(MAKE) clean
 	$(MAKE) prep
 # This should recompile Main.hs, because A in package p1 has changed
diff --git a/testsuite/tests/driver/1372/1372.stderr b/testsuite/tests/driver/T1372/T1372.stderr
index f06f294dae..f06f294dae 100644
--- a/testsuite/tests/driver/1372/1372.stderr
+++ b/testsuite/tests/driver/T1372/T1372.stderr
diff --git a/testsuite/tests/driver/T1372/all.T b/testsuite/tests/driver/T1372/all.T
new file mode 100644
index 0000000000..352d66b5d8
--- /dev/null
+++ b/testsuite/tests/driver/T1372/all.T
@@ -0,0 +1,5 @@
+test('T1372',
+     clean_cmd('$MAKE -s clean'),
+     run_command,
+     ['$MAKE -s --no-print-directory T1372'])
+
diff --git a/testsuite/tests/driver/1372/p1/A1.hs b/testsuite/tests/driver/T1372/p1/A1.hs
index 6656b4bdfc..6656b4bdfc 100644
--- a/testsuite/tests/driver/1372/p1/A1.hs
+++ b/testsuite/tests/driver/T1372/p1/A1.hs
diff --git a/testsuite/tests/driver/1372/p1/A2.hs b/testsuite/tests/driver/T1372/p1/A2.hs
index aa0767c452..aa0767c452 100644
--- a/testsuite/tests/driver/1372/p1/A2.hs
+++ b/testsuite/tests/driver/T1372/p1/A2.hs
diff --git a/testsuite/tests/driver/1372/p1/Setup.hs b/testsuite/tests/driver/T1372/p1/Setup.hs
index 6fa548caf7..6fa548caf7 100644
--- a/testsuite/tests/driver/1372/p1/Setup.hs
+++ b/testsuite/tests/driver/T1372/p1/Setup.hs
diff --git a/testsuite/tests/driver/1372/p1/p1.cabal b/testsuite/tests/driver/T1372/p1/p1.cabal
index 66d4f0ec4c..66d4f0ec4c 100644
--- a/testsuite/tests/driver/1372/p1/p1.cabal
+++ b/testsuite/tests/driver/T1372/p1/p1.cabal
diff --git a/testsuite/tests/driver/1372/p2/Main.hs b/testsuite/tests/driver/T1372/p2/Main.hs
index b423120e43..b423120e43 100644
--- a/testsuite/tests/driver/1372/p2/Main.hs
+++ b/testsuite/tests/driver/T1372/p2/Main.hs
diff --git a/testsuite/tests/driver/1372/p2/Setup.hs b/testsuite/tests/driver/T1372/p2/Setup.hs
index 6fa548caf7..6fa548caf7 100644
--- a/testsuite/tests/driver/1372/p2/Setup.hs
+++ b/testsuite/tests/driver/T1372/p2/Setup.hs
diff --git a/testsuite/tests/driver/1372/p2/p2.cabal b/testsuite/tests/driver/T1372/p2/p2.cabal
index 903515e80c..903515e80c 100644
--- a/testsuite/tests/driver/1372/p2/p2.cabal
+++ b/testsuite/tests/driver/T1372/p2/p2.cabal
diff --git a/testsuite/tests/driver/1959/B.hs b/testsuite/tests/driver/T1959/B.hs
index 8523c17bb4..8523c17bb4 100644
--- a/testsuite/tests/driver/1959/B.hs
+++ b/testsuite/tests/driver/T1959/B.hs
diff --git a/testsuite/tests/driver/1959/C.hs b/testsuite/tests/driver/T1959/C.hs
index 9106a32495..9106a32495 100644
--- a/testsuite/tests/driver/1959/C.hs
+++ b/testsuite/tests/driver/T1959/C.hs
diff --git a/testsuite/tests/driver/1959/D.hs b/testsuite/tests/driver/T1959/D.hs
index 8ff5b1397d..8ff5b1397d 100644
--- a/testsuite/tests/driver/1959/D.hs
+++ b/testsuite/tests/driver/T1959/D.hs
diff --git a/testsuite/tests/driver/1959/E1.hs b/testsuite/tests/driver/T1959/E1.hs
index 1efb41b3e4..1efb41b3e4 100644
--- a/testsuite/tests/driver/1959/E1.hs
+++ b/testsuite/tests/driver/T1959/E1.hs
diff --git a/testsuite/tests/driver/1959/E2.hs b/testsuite/tests/driver/T1959/E2.hs
index cb0ca32ad0..cb0ca32ad0 100644
--- a/testsuite/tests/driver/1959/E2.hs
+++ b/testsuite/tests/driver/T1959/E2.hs
diff --git a/testsuite/tests/driver/1959/Makefile b/testsuite/tests/driver/T1959/Makefile
index f7db491d96..f7db491d96 100644
--- a/testsuite/tests/driver/1959/Makefile
+++ b/testsuite/tests/driver/T1959/Makefile
diff --git a/testsuite/tests/driver/1959/1959.stdout b/testsuite/tests/driver/T1959/T1959.stdout
index 3db47397ee..3db47397ee 100644
--- a/testsuite/tests/driver/1959/1959.stdout
+++ b/testsuite/tests/driver/T1959/T1959.stdout
diff --git a/testsuite/tests/driver/1959/test.T b/testsuite/tests/driver/T1959/test.T
index ff9e8f63a4..563206f09b 100644
--- a/testsuite/tests/driver/1959/test.T
+++ b/testsuite/tests/driver/T1959/test.T
@@ -1,4 +1,4 @@
-test('1959',
+test('T1959',
      extra_clean(['E.hi', 'E.o', 'E.hs', 'prog', 'compile.out',
                   'B.hi', 'B.o', 'C.hi', 'C.o', 'D.hi', 'D.o']),
      run_command,
diff --git a/testsuite/tests/driver/2464.hs b/testsuite/tests/driver/T2464.hs
index 3547c100fb..3547c100fb 100644
--- a/testsuite/tests/driver/2464.hs
+++ b/testsuite/tests/driver/T2464.hs
diff --git a/testsuite/tests/driver/2464.stderr b/testsuite/tests/driver/T2464.stderr
index 31e794e33c..92e5e640c6 100644
--- a/testsuite/tests/driver/2464.stderr
+++ b/testsuite/tests/driver/T2464.stderr
@@ -1,3 +1,3 @@
 
-2464.hs:3:16:
+T2464.hs:3:16:
     Warning: -fffi is deprecated: use -XForeignFunctionInterface or pragma {-# LANGUAGE ForeignFunctionInterface #-} instead
diff --git a/testsuite/tests/driver/2499.hs b/testsuite/tests/driver/T2499.hs
index b4f48879ee..b4f48879ee 100644
--- a/testsuite/tests/driver/2499.hs
+++ b/testsuite/tests/driver/T2499.hs
diff --git a/testsuite/tests/driver/T2499.stderr b/testsuite/tests/driver/T2499.stderr
new file mode 100644
index 0000000000..9a082d34b1
--- /dev/null
+++ b/testsuite/tests/driver/T2499.stderr
@@ -0,0 +1,4 @@
+
+T2499.hs:1:12: unknown flag in  {-# OPTIONS_GHC #-} pragma: -package
+
+T2499.hs:1:12: unknown flag in  {-# OPTIONS_GHC #-} pragma: blargh
diff --git a/testsuite/tests/driver/2566.stderr b/testsuite/tests/driver/T2566.stderr
index 526c76a86a..526c76a86a 100644
--- a/testsuite/tests/driver/2566.stderr
+++ b/testsuite/tests/driver/T2566.stderr
diff --git a/testsuite/tests/driver/3674.hs b/testsuite/tests/driver/T3674.hs
index 2253ca12ce..055b281224 100644
--- a/testsuite/tests/driver/3674.hs
+++ b/testsuite/tests/driver/T3674.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -F -pgmF ./3674_pre #-}
+{-# OPTIONS -F -pgmF ./T3674_pre #-}
 
 module Test3674 where
 
diff --git a/testsuite/tests/driver/3674_pre.hs b/testsuite/tests/driver/T3674_pre.hs
index aef9cef9c7..aef9cef9c7 100644
--- a/testsuite/tests/driver/3674_pre.hs
+++ b/testsuite/tests/driver/T3674_pre.hs
diff --git a/testsuite/tests/driver/437/Makefile b/testsuite/tests/driver/T437/Makefile
index 649d462b1e..8c18b1c3c3 100644
--- a/testsuite/tests/driver/437/Makefile
+++ b/testsuite/tests/driver/T437/Makefile
@@ -15,7 +15,7 @@ clean:
 
 # bug #437
 
-437: clean
+T437: clean
 	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP)  --make -main-is Test.main Test.hs
 	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP)  --make -main-is Test2.main Test2.hs
 	./Test
diff --git a/testsuite/tests/driver/437/437.stderr b/testsuite/tests/driver/T437/T437.stderr
index e69de29bb2..e69de29bb2 100644
--- a/testsuite/tests/driver/437/437.stderr
+++ b/testsuite/tests/driver/T437/T437.stderr
diff --git a/testsuite/tests/driver/437/437.stdout b/testsuite/tests/driver/T437/T437.stdout
index 7508a5f9e0..7508a5f9e0 100644
--- a/testsuite/tests/driver/437/437.stdout
+++ b/testsuite/tests/driver/T437/T437.stdout
diff --git a/testsuite/tests/driver/437/Test.hs b/testsuite/tests/driver/T437/Test.hs
index 7c58c0524e..7c58c0524e 100644
--- a/testsuite/tests/driver/437/Test.hs
+++ b/testsuite/tests/driver/T437/Test.hs
diff --git a/testsuite/tests/driver/437/Test2.hs b/testsuite/tests/driver/T437/Test2.hs
index d7732c9424..d7732c9424 100644
--- a/testsuite/tests/driver/437/Test2.hs
+++ b/testsuite/tests/driver/T437/Test2.hs
diff --git a/testsuite/tests/driver/437/all.T b/testsuite/tests/driver/T437/all.T
index 34bb7f88b2..2588738941 100644
--- a/testsuite/tests/driver/437/all.T
+++ b/testsuite/tests/driver/T437/all.T
@@ -1,7 +1,7 @@
 # Test for #437, a recompilation bug with '-main-is'
 
-test('437',
+test('T437',
      [ clean_cmd('$MAKE -s clean') ],
      run_command,
-     ['$MAKE -s --no-print-directory 437'])
+     ['$MAKE -s --no-print-directory T437'])
 
diff --git a/testsuite/tests/driver/5313.hs b/testsuite/tests/driver/T5313.hs
index 5b73f11adf..5b73f11adf 100644
--- a/testsuite/tests/driver/5313.hs
+++ b/testsuite/tests/driver/T5313.hs
diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T
index f60dc4172b..1bf7c7e33d 100644
--- a/testsuite/tests/driver/all.T
+++ b/testsuite/tests/driver/all.T
@@ -282,15 +282,15 @@ test('driver200',
      run_command,
      ['$MAKE -s --no-print-directory test200'])
 
-test('2566',
+test('T2566',
      normalise_fun(normalise_errmsg),
      run_command,
-     ['$MAKE -s --no-print-directory 2566'])
+     ['$MAKE -s --no-print-directory T2566'])
 
 test('pragma001', normal, compile, [''])
 test('pragma002', normal, compile, [''])
 
-test('2499', normal, compile_fail, [''])
+test('T2499', normal, compile_fail, [''])
 
 test('mode001', normal, run_command,
      ['$MAKE -s --no-print-directory mode001'])
@@ -311,14 +311,14 @@ test('dynHelloWorld',
      compile_and_run,
      [''])
 
-test('5313', extra_run_opts('"' + config.libdir + '"'), compile_and_run, ['-package ghc'])
+test('T5313', extra_run_opts('"' + config.libdir + '"'), compile_and_run, ['-package ghc'])
 
-test('2464', normal, compile, [''])
-test('3674',
+test('T2464', normal, compile, [''])
+test('T3674',
      [ignore_output,
-      extra_clean(['3674_pre.hi', '3674_pre.o', '3674_pre', '3674_pre.exe'])],
+      extra_clean(['T3674_pre.hi', 'T3674_pre.o', 'T3674_pre', 'T3674_pre.exe'])],
      run_command, 
-     ['$MAKE -s --no-print-directory 3674'])
+     ['$MAKE -s --no-print-directory T3674'])
 
 test('rtsopts001',
      extra_clean(['rtsOpts.hi', 'rtsOpts.o', 'rtsOpts', 'rtsOpts.exe']),
diff --git a/testsuite/tests/ffi/should_compile/1357.hs b/testsuite/tests/ffi/should_compile/T1357.hs
index 1f5479bc1c..1f5479bc1c 100644
--- a/testsuite/tests/ffi/should_compile/1357.hs
+++ b/testsuite/tests/ffi/should_compile/T1357.hs
diff --git a/testsuite/tests/ffi/should_compile/1357.stderr b/testsuite/tests/ffi/should_compile/T1357.stderr
index cd1cb7031a..6678973fe4 100644
--- a/testsuite/tests/ffi/should_compile/1357.stderr
+++ b/testsuite/tests/ffi/should_compile/T1357.stderr
@@ -1,3 +1,3 @@
 
-1357.hs:5:1:
+T1357.hs:5:1:
     Warning: possible missing & in foreign import of FunPtr
diff --git a/testsuite/tests/ffi/should_compile/3624.hs b/testsuite/tests/ffi/should_compile/T3624.hs
index 8f42efc055..8f42efc055 100644
--- a/testsuite/tests/ffi/should_compile/3624.hs
+++ b/testsuite/tests/ffi/should_compile/T3624.hs
diff --git a/testsuite/tests/ffi/should_compile/3742.hs b/testsuite/tests/ffi/should_compile/T3742.hs
index c16b6009eb..c16b6009eb 100644
--- a/testsuite/tests/ffi/should_compile/3742.hs
+++ b/testsuite/tests/ffi/should_compile/T3742.hs
diff --git a/testsuite/tests/ffi/should_compile/all.T b/testsuite/tests/ffi/should_compile/all.T
index f4b4cdd5cb..99c5eef8f4 100644
--- a/testsuite/tests/ffi/should_compile/all.T
+++ b/testsuite/tests/ffi/should_compile/all.T
@@ -33,8 +33,8 @@ test('cc013', normal, compile, [''])
 test('cc014', normal, compile, [''])
 test('ffi-deriv1', normal, compile, [''])
 
-test('1357', normal, compile, [''])
-test('3624', normal, compile, [''])
-test('3742', normal, compile, [''])
+test('T1357', normal, compile, [''])
+test('T3624', normal, compile, [''])
+test('T3742', normal, compile, [''])
 test('cc015', normal, compile, [''])
 test('cc016', normal, compile, [''])
diff --git a/testsuite/tests/ffi/should_run/7170.stderr b/testsuite/tests/ffi/should_run/7170.stderr
deleted file mode 100644
index 3223f224b7..0000000000
--- a/testsuite/tests/ffi/should_run/7170.stderr
+++ /dev/null
@@ -1 +0,0 @@
-7170: thread blocked indefinitely in an MVar operation
diff --git a/testsuite/tests/ffi/should_run/Makefile b/testsuite/tests/ffi/should_run/Makefile
index 80ff28647e..7f846ce53d 100644
--- a/testsuite/tests/ffi/should_run/Makefile
+++ b/testsuite/tests/ffi/should_run/Makefile
@@ -5,20 +5,20 @@ 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
+T1288_ghci_setup :
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T1288_ghci_c.c
 
-2276_ghci_setup :
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c 2276_ghci_c.c
+T2276_ghci_setup :
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T2276_ghci_c.c
 
 ffi002_setup :
 	'$(TEST_HC)' $(TEST_HC_OPTS) -c ffi002.hs
 
-5402_setup :
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c 5402.hs
+T5402_setup :
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T5402.hs
 
-5594_setup :
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c 5594.hs
+T5594_setup :
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T5594.hs
 
 .PHONY: Capi_Ctype_001
 Capi_Ctype_001:
diff --git a/testsuite/tests/ffi/should_run/1288.hs b/testsuite/tests/ffi/should_run/T1288.hs
index 8b3a8f8417..8b3a8f8417 100644
--- a/testsuite/tests/ffi/should_run/1288.hs
+++ b/testsuite/tests/ffi/should_run/T1288.hs
diff --git a/testsuite/tests/ffi/should_run/1288.stdout b/testsuite/tests/ffi/should_run/T1288.stdout
index ef6be0406e..ef6be0406e 100644
--- a/testsuite/tests/ffi/should_run/1288.stdout
+++ b/testsuite/tests/ffi/should_run/T1288.stdout
diff --git a/testsuite/tests/ffi/should_run/1288_c.c b/testsuite/tests/ffi/should_run/T1288_c.c
index f240d29529..f240d29529 100644
--- a/testsuite/tests/ffi/should_run/1288_c.c
+++ b/testsuite/tests/ffi/should_run/T1288_c.c
diff --git a/testsuite/tests/ffi/should_run/1288_ghci.hs b/testsuite/tests/ffi/should_run/T1288_ghci.hs
index 8b3a8f8417..8b3a8f8417 100644
--- a/testsuite/tests/ffi/should_run/1288_ghci.hs
+++ b/testsuite/tests/ffi/should_run/T1288_ghci.hs
diff --git a/testsuite/tests/ffi/should_run/1288_ghci.stdout b/testsuite/tests/ffi/should_run/T1288_ghci.stdout
index ef6be0406e..ef6be0406e 100644
--- a/testsuite/tests/ffi/should_run/1288_ghci.stdout
+++ b/testsuite/tests/ffi/should_run/T1288_ghci.stdout
diff --git a/testsuite/tests/ffi/should_run/1288_ghci_c.c b/testsuite/tests/ffi/should_run/T1288_ghci_c.c
index f240d29529..f240d29529 100644
--- a/testsuite/tests/ffi/should_run/1288_ghci_c.c
+++ b/testsuite/tests/ffi/should_run/T1288_ghci_c.c
diff --git a/testsuite/tests/ffi/should_run/1679.hs b/testsuite/tests/ffi/should_run/T1679.hs
index 15f8630004..15f8630004 100644
--- a/testsuite/tests/ffi/should_run/1679.hs
+++ b/testsuite/tests/ffi/should_run/T1679.hs
diff --git a/testsuite/tests/ffi/should_run/1679.stdout b/testsuite/tests/ffi/should_run/T1679.stdout
index ad2afa7c36..ad2afa7c36 100644
--- a/testsuite/tests/ffi/should_run/1679.stdout
+++ b/testsuite/tests/ffi/should_run/T1679.stdout
diff --git a/testsuite/tests/ffi/should_run/2276.hs b/testsuite/tests/ffi/should_run/T2276.hs
index 0ee1ee91ff..0ee1ee91ff 100644
--- a/testsuite/tests/ffi/should_run/2276.hs
+++ b/testsuite/tests/ffi/should_run/T2276.hs
diff --git a/testsuite/tests/ffi/should_run/2276.stdout b/testsuite/tests/ffi/should_run/T2276.stdout
index ef6be0406e..ef6be0406e 100644
--- a/testsuite/tests/ffi/should_run/2276.stdout
+++ b/testsuite/tests/ffi/should_run/T2276.stdout
diff --git a/testsuite/tests/ffi/should_run/2276_c.c b/testsuite/tests/ffi/should_run/T2276_c.c
index f240d29529..f240d29529 100644
--- a/testsuite/tests/ffi/should_run/2276_c.c
+++ b/testsuite/tests/ffi/should_run/T2276_c.c
diff --git a/testsuite/tests/ffi/should_run/2276_ghci.hs b/testsuite/tests/ffi/should_run/T2276_ghci.hs
index 0ee1ee91ff..0ee1ee91ff 100644
--- a/testsuite/tests/ffi/should_run/2276_ghci.hs
+++ b/testsuite/tests/ffi/should_run/T2276_ghci.hs
diff --git a/testsuite/tests/ffi/should_run/2276_ghci.stdout b/testsuite/tests/ffi/should_run/T2276_ghci.stdout
index ef6be0406e..ef6be0406e 100644
--- a/testsuite/tests/ffi/should_run/2276_ghci.stdout
+++ b/testsuite/tests/ffi/should_run/T2276_ghci.stdout
diff --git a/testsuite/tests/ffi/should_run/2276_ghci_c.c b/testsuite/tests/ffi/should_run/T2276_ghci_c.c
index f240d29529..f240d29529 100644
--- a/testsuite/tests/ffi/should_run/2276_ghci_c.c
+++ b/testsuite/tests/ffi/should_run/T2276_ghci_c.c
diff --git a/testsuite/tests/ffi/should_run/2469.hs b/testsuite/tests/ffi/should_run/T2469.hs
index dc68ad73bf..dc68ad73bf 100644
--- a/testsuite/tests/ffi/should_run/2469.hs
+++ b/testsuite/tests/ffi/should_run/T2469.hs
diff --git a/testsuite/tests/ffi/should_run/2594.hs b/testsuite/tests/ffi/should_run/T2594.hs
index cdfcfc71fd..cdfcfc71fd 100644
--- a/testsuite/tests/ffi/should_run/2594.hs
+++ b/testsuite/tests/ffi/should_run/T2594.hs
diff --git a/testsuite/tests/ffi/should_run/2594.stdout b/testsuite/tests/ffi/should_run/T2594.stdout
index bfb2cfef51..bfb2cfef51 100644
--- a/testsuite/tests/ffi/should_run/2594.stdout
+++ b/testsuite/tests/ffi/should_run/T2594.stdout
diff --git a/testsuite/tests/ffi/should_run/2594_c.c b/testsuite/tests/ffi/should_run/T2594_c.c
index f0dd3007fa..34d633edb7 100644
--- a/testsuite/tests/ffi/should_run/2594_c.c
+++ b/testsuite/tests/ffi/should_run/T2594_c.c
@@ -1,5 +1,5 @@
 
-#include "2594_c.h"
+#include "T2594_c.h"
 
 void call8 (funtype8 fun)  { fun(-1); }
 void call16(funtype16 fun) { fun(-1); }
diff --git a/testsuite/tests/ffi/should_run/2594_c.h b/testsuite/tests/ffi/should_run/T2594_c.h
index 5847b26662..5847b26662 100644
--- a/testsuite/tests/ffi/should_run/2594_c.h
+++ b/testsuite/tests/ffi/should_run/T2594_c.h
diff --git a/testsuite/tests/ffi/should_run/2917a.hs b/testsuite/tests/ffi/should_run/T2917a.hs
index cdfaabcd2a..cdfaabcd2a 100644
--- a/testsuite/tests/ffi/should_run/2917a.hs
+++ b/testsuite/tests/ffi/should_run/T2917a.hs
diff --git a/testsuite/tests/ffi/should_run/4038.hs b/testsuite/tests/ffi/should_run/T4038.hs
index 621168773a..621168773a 100644
--- a/testsuite/tests/ffi/should_run/4038.hs
+++ b/testsuite/tests/ffi/should_run/T4038.hs
diff --git a/testsuite/tests/ffi/should_run/4038.stdout b/testsuite/tests/ffi/should_run/T4038.stdout
index d81cc0710e..d81cc0710e 100644
--- a/testsuite/tests/ffi/should_run/4038.stdout
+++ b/testsuite/tests/ffi/should_run/T4038.stdout
diff --git a/testsuite/tests/ffi/should_run/4221.hs b/testsuite/tests/ffi/should_run/T4221.hs
index eba782e636..eba782e636 100644
--- a/testsuite/tests/ffi/should_run/4221.hs
+++ b/testsuite/tests/ffi/should_run/T4221.hs
diff --git a/testsuite/tests/ffi/should_run/4221.stdout b/testsuite/tests/ffi/should_run/T4221.stdout
index 237bd7fc81..237bd7fc81 100644
--- a/testsuite/tests/ffi/should_run/4221.stdout
+++ b/testsuite/tests/ffi/should_run/T4221.stdout
diff --git a/testsuite/tests/ffi/should_run/4221_c.c b/testsuite/tests/ffi/should_run/T4221_c.c
index 0c5ca228c1..0c5ca228c1 100644
--- a/testsuite/tests/ffi/should_run/4221_c.c
+++ b/testsuite/tests/ffi/should_run/T4221_c.c
diff --git a/testsuite/tests/ffi/should_run/5402.hs b/testsuite/tests/ffi/should_run/T5402.hs
index 6b20b9fb28..6b20b9fb28 100644
--- a/testsuite/tests/ffi/should_run/5402.hs
+++ b/testsuite/tests/ffi/should_run/T5402.hs
diff --git a/testsuite/tests/ffi/should_run/5402_main.c b/testsuite/tests/ffi/should_run/T5402_main.c
index 6ef2c651a9..efabfbcfa0 100644
--- a/testsuite/tests/ffi/should_run/5402_main.c
+++ b/testsuite/tests/ffi/should_run/T5402_main.c
@@ -1,7 +1,7 @@
 #include "HsFFI.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "5402_stub.h"
+#include "T5402_stub.h"
 
 int main (int argc, char *argv[])
 {
diff --git a/testsuite/tests/ffi/should_run/5594.hs b/testsuite/tests/ffi/should_run/T5594.hs
index 1ec2b87d9c..1ec2b87d9c 100644
--- a/testsuite/tests/ffi/should_run/5594.hs
+++ b/testsuite/tests/ffi/should_run/T5594.hs
diff --git a/testsuite/tests/ffi/should_run/5594.stdout b/testsuite/tests/ffi/should_run/T5594.stdout
index 10ddd6d257..10ddd6d257 100644
--- a/testsuite/tests/ffi/should_run/5594.stdout
+++ b/testsuite/tests/ffi/should_run/T5594.stdout
diff --git a/testsuite/tests/ffi/should_run/5594_c.c b/testsuite/tests/ffi/should_run/T5594_c.c
index 5de1f4d4c6..9ef22e8efd 100644
--- a/testsuite/tests/ffi/should_run/5594_c.c
+++ b/testsuite/tests/ffi/should_run/T5594_c.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include "5594_stub.h"
+#include "T5594_stub.h"
 
 #include "HsFFI.h"
 
diff --git a/testsuite/tests/ffi/should_run/7170.hs b/testsuite/tests/ffi/should_run/T7170.hs
index 4dbf65a157..4dbf65a157 100644
--- a/testsuite/tests/ffi/should_run/7170.hs
+++ b/testsuite/tests/ffi/should_run/T7170.hs
diff --git a/testsuite/tests/ffi/should_run/T7170.stderr b/testsuite/tests/ffi/should_run/T7170.stderr
new file mode 100644
index 0000000000..4ea63ebc4e
--- /dev/null
+++ b/testsuite/tests/ffi/should_run/T7170.stderr
@@ -0,0 +1 @@
+T7170: thread blocked indefinitely in an MVar operation
diff --git a/testsuite/tests/ffi/should_run/7170.stdout b/testsuite/tests/ffi/should_run/T7170.stdout
index 8962a40fe5..8962a40fe5 100644
--- a/testsuite/tests/ffi/should_run/7170.stdout
+++ b/testsuite/tests/ffi/should_run/T7170.stdout
diff --git a/testsuite/tests/ffi/should_run/all.T b/testsuite/tests/ffi/should_run/all.T
index e170db0dba..7727492656 100644
--- a/testsuite/tests/ffi/should_run/all.T
+++ b/testsuite/tests/ffi/should_run/all.T
@@ -116,30 +116,30 @@ test('ffi018_ghci', [ only_ways(['ghci']),
 test('ffi019', normal, compile_and_run, [''])
 
 # This one originally failed only GHCi, but doesn't hurt to test all ways.
-test('1679', normal, compile_and_run, [''])
-
-test('1288', [ omit_ways(['ghci']),
-               extra_clean(['1288_c.o']) ],
-             compile_and_run, ['1288_c.c'])
-test('1288_ghci', [ only_ways(['ghci']),
-                    cmd_prefix('$MAKE --no-print-directory 1288_ghci_setup && '),
-                    extra_clean(['1288_ghci_c.o']) ],
-                  compile_and_run, ['1288_ghci_c.o'])
-
-test('2276', [ omit_ways(['ghci']), 
-               extra_clean(['2276_c.o']) ],
-             compile_and_run, ['2276_c.c'])
-test('2276_ghci', [ only_ways(['ghci']),
-                    cmd_prefix('$MAKE --no-print-directory 2276_ghci_setup && '),
-                    extra_clean(['2276_ghci_c.o']) ],
-                  compile_and_run, ['-fobject-code 2276_ghci_c.o'])
-
-test('2469', normal, compile_and_run, ['-optc-std=gnu99'])
-
-test('2594',
-     [extra_clean(['2594_c.o']), omit_ways(['ghci'])],
+test('T1679', normal, compile_and_run, [''])
+
+test('T1288', [ omit_ways(['ghci']),
+                extra_clean(['T1288_c.o']) ],
+              compile_and_run, ['T1288_c.c'])
+test('T1288_ghci', [ only_ways(['ghci']),
+                     cmd_prefix('$MAKE --no-print-directory T1288_ghci_setup && '),
+                     extra_clean(['T1288_ghci_c.o']) ],
+                   compile_and_run, ['T1288_ghci_c.o'])
+
+test('T2276', [ omit_ways(['ghci']), 
+                extra_clean(['T2276_c.o']) ],
+              compile_and_run, ['T2276_c.c'])
+test('T2276_ghci', [ only_ways(['ghci']),
+                     cmd_prefix('$MAKE --no-print-directory T2276_ghci_setup && '),
+                     extra_clean(['T2276_ghci_c.o']) ],
+                   compile_and_run, ['-fobject-code T2276_ghci_c.o'])
+
+test('T2469', normal, compile_and_run, ['-optc-std=gnu99'])
+
+test('T2594',
+     [extra_clean(['T2594_c.o']), omit_ways(['ghci'])],
      compile_and_run,
-     ['2594_c.c'])
+     ['T2594_c.c'])
 
 test('fptr01', [ omit_ways(['ghci']), extra_clean(['fptr01_c.o']) ],
                compile_and_run, ['fptr01_c.c'])
@@ -149,7 +149,7 @@ test('fptrfail01', [ compose(omit_ways(['ghci']), exit_code(1)),
                      extra_clean(['fptrfail01_c.o']) ],
                    compile_and_run, ['fptrfail01_c.c'])
 
-test('2917a', normal, compile_and_run, [''])
+test('T2917a', normal, compile_and_run, [''])
 
 # omit prof ways, because this test causes the RTS to exit (correctly)
 # without generating profiling information.
@@ -163,30 +163,30 @@ test('ffi022', normal, compile_and_run, [''])
 
 if config.os == 'mingw32':
     # This test needs a larger C stack than we get by default on Windows
-	flagsFor4038 = ['-optl-Wl,--stack,10485760']
+	flagsForT4038 = ['-optl-Wl,--stack,10485760']
 else:
-	flagsFor4038 = ['']
-test('4038', normal, compile_and_run, flagsFor4038)
-
-test('4221', [ omit_ways(['ghci']), extra_clean(['4221_c.o']) ],
-               compile_and_run, ['4221_c.c'])
-
-test('5402', [ omit_ways(['ghci']),
-               exit_code(42),
-               extra_clean(['5402_main.o']),
-                 # The 5402_setup hack is to ensure that we generate
-                 # 5402_stub.h before compiling 5402_main.c, which
-                 # needs it.
-               compile_cmd_prefix('$MAKE --no-print-directory 5402_setup && ') ],
-             compile_and_run, ["-no-hs-main 5402_main.c"])
-
-test('5594', [ omit_ways(['ghci']),
-               extra_clean(['5594_c.o']),
-               compile_cmd_prefix('$MAKE --no-print-directory 5594_setup && ') ],
-               # The 5594_setup hack is to ensure that we generate
-               # 5594_stub.h before compiling 5594_c.c, which
-               # needs it.
-               compile_and_run, ['5594_c.c -no-hs-main'])
+	flagsForT4038 = ['']
+test('T4038', normal, compile_and_run, flagsForT4038)
+
+test('T4221', [ omit_ways(['ghci']), extra_clean(['T4221_c.o']) ],
+                compile_and_run, ['T4221_c.c'])
+
+test('T5402', [ omit_ways(['ghci']),
+                exit_code(42),
+                extra_clean(['T5402_main.o']),
+                  # The T5402_setup hack is to ensure that we generate
+                  # T5402_stub.h before compiling T5402_main.c, which
+                  # needs it.
+                compile_cmd_prefix('$MAKE --no-print-directory T5402_setup && ') ],
+              compile_and_run, ["-no-hs-main T5402_main.c"])
+
+test('T5594', [ omit_ways(['ghci']),
+                extra_clean(['T5594_c.o']),
+                compile_cmd_prefix('$MAKE --no-print-directory T5594_setup && ') ],
+                # The T5594_setup hack is to ensure that we generate
+                # T5594_stub.h before compiling T5594_c.c, which
+                # needs it.
+                compile_and_run, ['T5594_c.c -no-hs-main'])
 
 test('Capi_Ctype_001',
      extra_clean(['Capi_Ctype_A_001.o', 'Capi_Ctype_A_001.hi',
@@ -211,7 +211,7 @@ test('capi_value',
      compile_and_run,
      ['capi_value_c.c'])
 
-test('7170', exit_code(1), compile_and_run, [''])
+test('T7170', exit_code(1), compile_and_run, [''])
 
 test('T4012',
      [extra_clean(['T4012_A.hi', 'T4012_A.o', 'T4012_B.hi', 'T4012_B.o']),
diff --git a/testsuite/tests/ghc-api/dynCompileExpr/all.T b/testsuite/tests/ghc-api/dynCompileExpr/all.T
index 108b96407c..b466a3a59c 100644
--- a/testsuite/tests/ghc-api/dynCompileExpr/all.T
+++ b/testsuite/tests/ghc-api/dynCompileExpr/all.T
@@ -1,4 +1,5 @@
 test('dynCompileExpr',
      [ extra_run_opts('"' + config.libdir + '"'),
+       if_os('mingw32', expect_broken_for(5987, ['dyn'])),
        omit_ways(prof_ways) ], # cannot run interpreted code with -prof
      compile_and_run, ['-package ghc'])
diff --git a/testsuite/tests/ghc-e/should_run/Makefile b/testsuite/tests/ghc-e/should_run/Makefile
index 3596f02625..1971004d4c 100644
--- a/testsuite/tests/ghc-e/should_run/Makefile
+++ b/testsuite/tests/ghc-e/should_run/Makefile
@@ -18,14 +18,14 @@ ghc-e004:
 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
+T2228:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" T2228.hs
 
-2636:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" 2636.hs; if [ "$?" != 0 ]; then true; else false; fi
+T2636:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" T2636.hs; if [ "$?" != 0 ]; then true; else false; fi
 
-3890:
-	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" 3890.hs | cat
+T3890:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e ":main" T3890.hs | cat
 
 T7299:
 	'$(TEST_HC)' $(TEST_HC_OPTS) -ignore-dot-ghci -e "Control.Concurrent.threadDelay (1000 * 1000)"
diff --git a/testsuite/tests/ghc-e/should_run/2228.hs b/testsuite/tests/ghc-e/should_run/T2228.hs
index 0c53c5ae13..0c53c5ae13 100644
--- a/testsuite/tests/ghc-e/should_run/2228.hs
+++ b/testsuite/tests/ghc-e/should_run/T2228.hs
diff --git a/testsuite/tests/ghc-e/should_run/2228.stdout b/testsuite/tests/ghc-e/should_run/T2228.stdout
index 07576b5a74..07576b5a74 100644
--- a/testsuite/tests/ghc-e/should_run/2228.stdout
+++ b/testsuite/tests/ghc-e/should_run/T2228.stdout
diff --git a/testsuite/tests/ghc-e/should_run/2636.hs b/testsuite/tests/ghc-e/should_run/T2636.hs
index 9c6694955a..9c6694955a 100644
--- a/testsuite/tests/ghc-e/should_run/2636.hs
+++ b/testsuite/tests/ghc-e/should_run/T2636.hs
diff --git a/testsuite/tests/ghc-e/should_run/2636.stderr b/testsuite/tests/ghc-e/should_run/T2636.stderr
index e69b54b36e..369890fa2e 100644
--- a/testsuite/tests/ghc-e/should_run/2636.stderr
+++ b/testsuite/tests/ghc-e/should_run/T2636.stderr
@@ -1,4 +1,4 @@
 
-2636.hs:1:8:
+T2636.hs:1:8:
     Could not find module `MissingModule'
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/ghc-e/should_run/3890.hs b/testsuite/tests/ghc-e/should_run/T3890.hs
index a72e5c82a0..a72e5c82a0 100644
--- a/testsuite/tests/ghc-e/should_run/3890.hs
+++ b/testsuite/tests/ghc-e/should_run/T3890.hs
diff --git a/testsuite/tests/ghc-e/should_run/3890.stdout b/testsuite/tests/ghc-e/should_run/T3890.stdout
index 7e6c303ad6..7e6c303ad6 100644
--- a/testsuite/tests/ghc-e/should_run/3890.stdout
+++ b/testsuite/tests/ghc-e/should_run/T3890.stdout
diff --git a/testsuite/tests/ghc-e/should_run/all.T b/testsuite/tests/ghc-e/should_run/all.T
index e5a252978b..da14b703c2 100644
--- a/testsuite/tests/ghc-e/should_run/all.T
+++ b/testsuite/tests/ghc-e/should_run/all.T
@@ -7,10 +7,10 @@ test('ghc-e003', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e0
 test('ghc-e004', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e004'])
 test('ghc-e005', req_interp, run_command, ['$MAKE --no-print-directory -s ghc-e005'])
 
-test('2228',
+test('T2228',
      [req_interp, if_ghci_dynamic(expect_broken(7298))],
      run_command,
-     ['$MAKE --no-print-directory -s 2228'])
-test('2636', req_interp, run_command, ['$MAKE --no-print-directory -s 2636'])
-test('3890', req_interp, run_command, ['$MAKE --no-print-directory -s 3890'])
+     ['$MAKE --no-print-directory -s T2228'])
+test('T2636', req_interp, run_command, ['$MAKE --no-print-directory -s T2636'])
+test('T3890', req_interp, run_command, ['$MAKE --no-print-directory -s T3890'])
 test('T7299', req_interp, run_command, ['$MAKE --no-print-directory -s T7299'])
diff --git a/testsuite/tests/ghci.debugger/scripts/2740.hs b/testsuite/tests/ghci.debugger/scripts/T2740.hs
index 291e7c8c02..291e7c8c02 100644
--- a/testsuite/tests/ghci.debugger/scripts/2740.hs
+++ b/testsuite/tests/ghci.debugger/scripts/T2740.hs
diff --git a/testsuite/tests/ghci.debugger/scripts/2740.script b/testsuite/tests/ghci.debugger/scripts/T2740.script
index ac45616180..a7bd833690 100644
--- a/testsuite/tests/ghci.debugger/scripts/2740.script
+++ b/testsuite/tests/ghci.debugger/scripts/T2740.script
@@ -1,5 +1,5 @@
 :seti -XMonomorphismRestriction
-:l 2740.hs
+:l T2740.hs
 :step f 1 2 3
 :step
 :print x
diff --git a/testsuite/tests/ghci.debugger/scripts/2740.stdout b/testsuite/tests/ghci.debugger/scripts/T2740.stdout
index 68be6cb071..c6733bca9d 100644
--- a/testsuite/tests/ghci.debugger/scripts/2740.stdout
+++ b/testsuite/tests/ghci.debugger/scripts/T2740.stdout
@@ -1,6 +1,6 @@
-Stopped at 2740.hs:(3,1)-(4,25)
+Stopped at T2740.hs:(3,1)-(4,25)
 _result :: a = _
-Stopped at 2740.hs:3:11-13
+Stopped at T2740.hs:3:11-13
 _result :: Bool = _
 x :: Integer = 1
 y :: Integer = 2
diff --git a/testsuite/tests/ghci.debugger/scripts/all.T b/testsuite/tests/ghci.debugger/scripts/all.T
index a78a6f21a7..9eef1f62b2 100644
--- a/testsuite/tests/ghci.debugger/scripts/all.T
+++ b/testsuite/tests/ghci.debugger/scripts/all.T
@@ -83,7 +83,7 @@ test('listCommand002', normal, ghci_script, ['listCommand002.script'])
 
 test('hist001', normal, ghci_script, ['hist001.script'])
 
-test('2740', normal, ghci_script, ['2740.script'])
+test('T2740', normal, ghci_script, ['T2740.script'])
 
 test('getargs', normal, ghci_script, ['getargs.script'])
 test('T7386', normal, ghci_script, ['T7386.script'])
diff --git a/testsuite/tests/ghci/scripts/1914.script b/testsuite/tests/ghci/scripts/T1914.script
index 5a74350341..5a74350341 100644
--- a/testsuite/tests/ghci/scripts/1914.script
+++ b/testsuite/tests/ghci/scripts/T1914.script
diff --git a/testsuite/tests/ghci/scripts/1914.stderr b/testsuite/tests/ghci/scripts/T1914.stderr
index fe06f7e58f..fe06f7e58f 100644
--- a/testsuite/tests/ghci/scripts/1914.stderr
+++ b/testsuite/tests/ghci/scripts/T1914.stderr
diff --git a/testsuite/tests/ghci/scripts/1914.stdout b/testsuite/tests/ghci/scripts/T1914.stdout
index 063758e39c..063758e39c 100644
--- a/testsuite/tests/ghci/scripts/1914.stdout
+++ b/testsuite/tests/ghci/scripts/T1914.stdout
diff --git a/testsuite/tests/ghci/scripts/2452.script b/testsuite/tests/ghci/scripts/T2452.script
index 28d2bdc580..28d2bdc580 100644
--- a/testsuite/tests/ghci/scripts/2452.script
+++ b/testsuite/tests/ghci/scripts/T2452.script
diff --git a/testsuite/tests/ghci/scripts/2452.stderr b/testsuite/tests/ghci/scripts/T2452.stderr
index 2802ee2bdf..2802ee2bdf 100644
--- a/testsuite/tests/ghci/scripts/2452.stderr
+++ b/testsuite/tests/ghci/scripts/T2452.stderr
diff --git a/testsuite/tests/ghci/scripts/2816.script b/testsuite/tests/ghci/scripts/T2816.script
index 3f4ce8aefb..3f4ce8aefb 100644
--- a/testsuite/tests/ghci/scripts/2816.script
+++ b/testsuite/tests/ghci/scripts/T2816.script
diff --git a/testsuite/tests/ghci/scripts/2816.stderr b/testsuite/tests/ghci/scripts/T2816.stderr
index 3a9e972205..3a9e972205 100644
--- a/testsuite/tests/ghci/scripts/2816.stderr
+++ b/testsuite/tests/ghci/scripts/T2816.stderr
diff --git a/testsuite/tests/ghci/scripts/2816.stdout b/testsuite/tests/ghci/scripts/T2816.stdout
index 14a53b928e..14a53b928e 100644
--- a/testsuite/tests/ghci/scripts/2816.stdout
+++ b/testsuite/tests/ghci/scripts/T2816.stdout
diff --git a/testsuite/tests/ghci/scripts/2976.script b/testsuite/tests/ghci/scripts/T2976.script
index 32a5472b05..32a5472b05 100644
--- a/testsuite/tests/ghci/scripts/2976.script
+++ b/testsuite/tests/ghci/scripts/T2976.script
diff --git a/testsuite/tests/ghci/scripts/2976.stdout b/testsuite/tests/ghci/scripts/T2976.stdout
index 9fdc11072c..9fdc11072c 100644
--- a/testsuite/tests/ghci/scripts/2976.stdout
+++ b/testsuite/tests/ghci/scripts/T2976.stdout
diff --git a/testsuite/tests/ghci/scripts/4051.hs b/testsuite/tests/ghci/scripts/T4051.hs
index fc9974cb8e..fc9974cb8e 100644
--- a/testsuite/tests/ghci/scripts/4051.hs
+++ b/testsuite/tests/ghci/scripts/T4051.hs
diff --git a/testsuite/tests/ghci/scripts/4051.script b/testsuite/tests/ghci/scripts/T4051.script
index 545ce8b4d8..9c4dd1d1b9 100644
--- a/testsuite/tests/ghci/scripts/4051.script
+++ b/testsuite/tests/ghci/scripts/T4051.script
@@ -1,4 +1,4 @@
-:l 4051.hs
+:l T4051.hs
 :m -X'
 :m X'
 x
diff --git a/testsuite/tests/ghci/scripts/4051.stdout b/testsuite/tests/ghci/scripts/T4051.stdout
index 00750edc07..00750edc07 100644
--- a/testsuite/tests/ghci/scripts/4051.stdout
+++ b/testsuite/tests/ghci/scripts/T4051.stdout
diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T
index 317a34605f..659a275660 100755
--- a/testsuite/tests/ghci/scripts/all.T
+++ b/testsuite/tests/ghci/scripts/all.T
@@ -12,7 +12,7 @@ test('ghci007', combined_output, ghci_script, ['ghci007.script'])
 test('ghci008', combined_output, ghci_script, ['ghci008.script'])
 test('ghci009', combined_output, ghci_script, ['ghci009.script'])
 
-# Skip this test: deadlock can't be detected now, because we wait for
+# Skip this test: deadlock cannot be detected now, because we wait for
 # signals to arrive if there are signal handlers installed, and GHCi
 # has a ^C handler installed.
 test('ghci010', skip, ghci_script, ['ghci010.script'])
@@ -84,19 +84,19 @@ test('ghci056',
 
 test('ghci057', normal, ghci_script, ['ghci057.script'])
 
-test('2452', normal, ghci_script, ['2452.script'])
+test('T2452', normal, ghci_script, ['T2452.script'])
 test('T2766', normal, ghci_script, ['T2766.script'])
 
-test('1914',
+test('T1914',
      extra_clean(['T1914A.hs', 'T1914B.hs']),
      ghci_script,
-     ['1914.script'])
+     ['T1914.script'])
 
-test('2976', normal, ghci_script, ['2976.script'])
-test('2816', normal, ghci_script, ['2816.script'])
+test('T2976', normal, ghci_script, ['T2976.script'])
+test('T2816', normal, ghci_script, ['T2816.script'])
 test('T789', normal, ghci_script, ['T789.script'])
 test('T3263', normal, ghci_script, ['T3263.script'])
-test('4051', normal, ghci_script, ['4051.script'])
+test('T4051', normal, ghci_script, ['T4051.script'])
 test('T4087', normal, ghci_script, ['T4087.script'])
 test('T4015', normal, ghci_script, ['T4015.script'])
 test('T4127', normal, ghci_script, ['T4127.script'])
diff --git a/testsuite/tests/ghci/should_run/Makefile b/testsuite/tests/ghci/should_run/Makefile
index c61de97891..2558b54d08 100644
--- a/testsuite/tests/ghci/should_run/Makefile
+++ b/testsuite/tests/ghci/should_run/Makefile
@@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/test.mk
 
 # Test that threadDelay can be interrupted by ^C.
-3171:
+T3171:
 	echo "do Control.Concurrent.threadDelay 3000000; putStrLn \"threadDelay was not interrupted\"" | \
 	"$(TEST_HC)" $(TEST_HC_OPTS) -ignore-dot-ghci -v0 --interactive & \
 	sleep 2; kill -INT $$!; wait
diff --git a/testsuite/tests/ghci/should_run/2589.hs b/testsuite/tests/ghci/should_run/T2589.hs
index eadb9995e1..eadb9995e1 100644
--- a/testsuite/tests/ghci/should_run/2589.hs
+++ b/testsuite/tests/ghci/should_run/T2589.hs
diff --git a/testsuite/tests/ghci/should_run/2589.stdout b/testsuite/tests/ghci/should_run/T2589.stdout
index 0ca95142bb..0ca95142bb 100644
--- a/testsuite/tests/ghci/should_run/2589.stdout
+++ b/testsuite/tests/ghci/should_run/T2589.stdout
diff --git a/testsuite/tests/ghci/should_run/2881.hs b/testsuite/tests/ghci/should_run/T2881.hs
index 94ecfa6a00..94ecfa6a00 100644
--- a/testsuite/tests/ghci/should_run/2881.hs
+++ b/testsuite/tests/ghci/should_run/T2881.hs
diff --git a/testsuite/tests/ghci/should_run/2881.stdout b/testsuite/tests/ghci/should_run/T2881.stdout
index 06a735b308..06a735b308 100644
--- a/testsuite/tests/ghci/should_run/2881.stdout
+++ b/testsuite/tests/ghci/should_run/T2881.stdout
diff --git a/testsuite/tests/ghci/should_run/3171.stdout b/testsuite/tests/ghci/should_run/T3171.stdout
index c83176a2cf..c83176a2cf 100644
--- a/testsuite/tests/ghci/should_run/3171.stdout
+++ b/testsuite/tests/ghci/should_run/T3171.stdout
diff --git a/testsuite/tests/ghci/should_run/all.T b/testsuite/tests/ghci/should_run/all.T
index 527461af2c..d34eade39b 100644
--- a/testsuite/tests/ghci/should_run/all.T
+++ b/testsuite/tests/ghci/should_run/all.T
@@ -8,14 +8,14 @@ def just_ghci( opts ):
 test('ghcirun001', just_ghci, compile_and_run, [''])
 test('ghcirun002', just_ghci, compile_and_run, [''])
 test('ghcirun003', just_ghci, compile_and_run, [''])
-test('2589',    just_ghci, compile_and_run, [''])
-test('2881',    just_ghci, compile_and_run, [''])
+test('T2589',      just_ghci, compile_and_run, [''])
+test('T2881',      just_ghci, compile_and_run, [''])
 
-test('3171',
+test('T3171',
      [if_os('mingw32',skip),
       req_interp,
       combined_output],
      run_command,
-     ['$MAKE -s --no-print-directory 3171'])
+     ['$MAKE -s --no-print-directory T3171'])
 
 test('ghcirun004', just_ghci, compile_and_run, [''])
diff --git a/testsuite/tests/hsc2hs/Makefile b/testsuite/tests/hsc2hs/Makefile
index 9fbd62c989..ec16b16474 100644
--- a/testsuite/tests/hsc2hs/Makefile
+++ b/testsuite/tests/hsc2hs/Makefile
@@ -24,7 +24,7 @@ hsc2hs004:
 	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make $@
 	./$@
 
-.PHONY: 3837
-3837:
+.PHONY: T3837
+T3837:
 	LANG=C '$(HSC2HS)' $@.hsc
 	'$(TEST_HC)' $(TEST_HC_OPTS) -c $@.hs
diff --git a/testsuite/tests/hsc2hs/3837.hsc b/testsuite/tests/hsc2hs/T3837.hsc
index 7f8ee255af..7f8ee255af 100644
--- a/testsuite/tests/hsc2hs/3837.hsc
+++ b/testsuite/tests/hsc2hs/T3837.hsc
diff --git a/testsuite/tests/hsc2hs/all.T b/testsuite/tests/hsc2hs/all.T
index b358dc409a..b0957911b6 100644
--- a/testsuite/tests/hsc2hs/all.T
+++ b/testsuite/tests/hsc2hs/all.T
@@ -20,8 +20,8 @@ test('hsc2hs004',
      ['$MAKE -s --no-print-directory hsc2hs004'])
 
 
-test('3837',
-     [extra_clean(['3837.hs', '3837_hsc_make.c'])],
+test('T3837',
+     [extra_clean(['T3837.hs', 'T3837_hsc_make.c'])],
      run_command,
-     ['$MAKE -s --no-print-directory 3837'])
+     ['$MAKE -s --no-print-directory T3837'])
 
diff --git a/testsuite/tests/indexed-types/should_compile/T3017.stderr b/testsuite/tests/indexed-types/should_compile/T3017.stderr
index 28ddc14524..a6b44e3ad5 100644
--- a/testsuite/tests/indexed-types/should_compile/T3017.stderr
+++ b/testsuite/tests/indexed-types/should_compile/T3017.stderr
@@ -15,7 +15,7 @@ TYPE CONSTRUCTORS
       = L :: forall a. [a] -> ListColl a Stricts: _

       FamilyInstance: none

 COERCION AXIOMS

-  axiom Foo.TFCo:R:ElemListColl :: forall a. Elem (ListColl a) ~# a

+  axiom Foo.TFCo:R:ElemListColl :: Elem (ListColl a) = a

 INSTANCES

   instance Coll (ListColl a) -- Defined at T3017.hs:12:11

 FAMILY INSTANCES

diff --git a/testsuite/tests/indexed-types/should_compile/T7282.hs b/testsuite/tests/indexed-types/should_compile/T7282.hs
new file mode 100644
index 0000000000..a357d17647
--- /dev/null
+++ b/testsuite/tests/indexed-types/should_compile/T7282.hs
@@ -0,0 +1,9 @@
+ {-# OPTIONS -XTypeFamilies -XDataKinds -XPolyKinds #-}
+
+module T7282 where
+
+class Foo (xs :: [k]) where
+     type Bar xs :: *
+
+instance Foo '[] where
+     type Bar '[] = Int
diff --git a/testsuite/tests/indexed-types/should_compile/all.T b/testsuite/tests/indexed-types/should_compile/all.T
index b8edf95d48..019c5aca49 100644
--- a/testsuite/tests/indexed-types/should_compile/all.T
+++ b/testsuite/tests/indexed-types/should_compile/all.T
@@ -207,4 +207,5 @@ test('T7280', normal, compile, [''])
 test('T7474', normal, compile, [''])
 test('T7489', normal, compile, [''])
 test('T7585', normal, compile, [''])
+test('T7282', normal, compile, [''])
 
diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail9.hs b/testsuite/tests/indexed-types/should_fail/SimpleFail9.hs
index d45c9830a4..927c60caf0 100644
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail9.hs
+++ b/testsuite/tests/indexed-types/should_fail/SimpleFail9.hs
@@ -8,6 +8,8 @@ class C7 a b where
 instance C7 Char (a, Bool) where
   data S7 (a, Bool) = S7_1
 
--- must fail: type indexes don't match the instance types
+-- Used to fail, but now passes: 
+-- type indexes don't match the instance types by name
+-- but do by structure
 instance C7 Char (a, Int) where
   data S7 (b, Int) = S7_2
diff --git a/testsuite/tests/indexed-types/should_fail/SimpleFail9.stderr b/testsuite/tests/indexed-types/should_fail/SimpleFail9.stderr
deleted file mode 100644
index 4d6ea1c94f..0000000000
--- a/testsuite/tests/indexed-types/should_fail/SimpleFail9.stderr
+++ /dev/null
@@ -1,7 +0,0 @@
-
-SimpleFail9.hs:13:3:
-    Type indexes must match class instance head
-    Found `(b, Int)' but expected `(a, Int)'
-    In the data declaration for `S7'
-    In the data instance declaration for `S7'
-    In the instance declaration for `C7 Char (a, Int)'
diff --git a/testsuite/tests/indexed-types/should_fail/T2334.hs b/testsuite/tests/indexed-types/should_fail/T2334A.hs
index c73402e2d5..c73402e2d5 100644
--- a/testsuite/tests/indexed-types/should_fail/T2334.hs
+++ b/testsuite/tests/indexed-types/should_fail/T2334A.hs
diff --git a/testsuite/tests/indexed-types/should_fail/T2334.stderr b/testsuite/tests/indexed-types/should_fail/T2334A.stderr
index b8efc59383..16ad7b047e 100644
--- a/testsuite/tests/indexed-types/should_fail/T2334.stderr
+++ b/testsuite/tests/indexed-types/should_fail/T2334A.stderr
@@ -1,17 +1,17 @@
 
-T2334.hs:9:26:
+T2334A.hs:9:26:
     The constructor of a newtype must have exactly one field
       but `F' has two
     In the definition of data constructor `F'
     In the newtype instance declaration for `F'
 
-T2334.hs:10:27:
+T2334A.hs:10:27:
     The constructor of a newtype must have exactly one field
       but `H' has none
     In the definition of data constructor `H'
     In the newtype instance declaration for `F'
 
-T2334.hs:12:15:
+T2334A.hs:12:15:
     Conflicting family instance declarations:
-      F Bool -- Defined at T2334.hs:12:15
-      F Bool -- Defined at T2334.hs:13:15
+      F Bool -- Defined at T2334A.hs:12:15
+      F Bool -- Defined at T2334A.hs:13:15
diff --git a/testsuite/tests/indexed-types/should_fail/all.T b/testsuite/tests/indexed-types/should_fail/all.T
index 316e1ff0fc..19b05e63dd 100644
--- a/testsuite/tests/indexed-types/should_fail/all.T
+++ b/testsuite/tests/indexed-types/should_fail/all.T
@@ -12,7 +12,7 @@ test('SimpleFail5b', normal, compile_fail, [''])
 test('SimpleFail6', normal, compile_fail, [''])
 test('SimpleFail7', normal, compile_fail, [''])
 test('SimpleFail8', normal, compile_fail, [''])
-test('SimpleFail9', normal, compile_fail, [''])
+test('SimpleFail9', normal, compile, [''])
 test('SimpleFail10', normal, compile, [''])
 test('SimpleFail11a', normal, compile_fail, [''])
 test('SimpleFail11b', normal, compile_fail, [''])
@@ -41,7 +41,7 @@ test('Over',
 
 test('SkolemOccursLoop', expect_fail, compile_fail, [''])
 
-test('T2334', normal, compile_fail, [''])
+test('T2334A', normal, compile_fail, [''])
 test('T1900', normal, compile_fail, [''])
 test('T2157', normal, compile_fail, [''])
 test('T2203a', normal, compile_fail, [''])
diff --git a/testsuite/tests/llvm/should_compile/5054.hs b/testsuite/tests/llvm/should_compile/T5054.hs
index 79b01f624a..79b01f624a 100644
--- a/testsuite/tests/llvm/should_compile/5054.hs
+++ b/testsuite/tests/llvm/should_compile/T5054.hs
diff --git a/testsuite/tests/llvm/should_compile/5054_2.hs b/testsuite/tests/llvm/should_compile/T5054_2.hs
index 29a7ed829f..29a7ed829f 100644
--- a/testsuite/tests/llvm/should_compile/5054_2.hs
+++ b/testsuite/tests/llvm/should_compile/T5054_2.hs
diff --git a/testsuite/tests/llvm/should_compile/5486.hs b/testsuite/tests/llvm/should_compile/T5486.hs
index 730a7c2854..730a7c2854 100644
--- a/testsuite/tests/llvm/should_compile/5486.hs
+++ b/testsuite/tests/llvm/should_compile/T5486.hs
diff --git a/testsuite/tests/llvm/should_compile/5681.hs b/testsuite/tests/llvm/should_compile/T5681.hs
index 8a94fb44ce..8a94fb44ce 100644
--- a/testsuite/tests/llvm/should_compile/5681.hs
+++ b/testsuite/tests/llvm/should_compile/T5681.hs
diff --git a/testsuite/tests/llvm/should_compile/6158.hs b/testsuite/tests/llvm/should_compile/T6158.hs
index 02f2d068c9..02f2d068c9 100644
--- a/testsuite/tests/llvm/should_compile/6158.hs
+++ b/testsuite/tests/llvm/should_compile/T6158.hs
diff --git a/testsuite/tests/llvm/should_compile/all.T b/testsuite/tests/llvm/should_compile/all.T
index 41167377f4..61d0f3f615 100644
--- a/testsuite/tests/llvm/should_compile/all.T
+++ b/testsuite/tests/llvm/should_compile/all.T
@@ -5,10 +5,10 @@ def f( opts ):
 
 setTestOpts(f)
 
-test('5054', reqlib('hmatrix'), compile, ['-package hmatrix'])
-test('5054_2', reqlib('hmatrix'), compile, ['-package hmatrix'])
-test('5486', normal, compile, [''])
-test('5681', normal, compile, [''])
-test('6158', [reqlib('vector'), reqlib('primitive')], compile, ['-package vector -package primitive'])
+test('T5054', reqlib('hmatrix'), compile, ['-package hmatrix'])
+test('T5054_2', reqlib('hmatrix'), compile, ['-package hmatrix'])
+test('T5486', normal, compile, [''])
+test('T5681', normal, compile, [''])
+test('T6158', [reqlib('vector'), reqlib('primitive')], compile, ['-package vector -package primitive'])
 test('T7571', cmm_src, compile, [''])
 test('T7575', unless_wordsize(32, skip), compile, [''])
diff --git a/testsuite/tests/numeric/should_run/1603.hs b/testsuite/tests/numeric/should_run/T1603.hs
index 09dd05a550..09dd05a550 100644
--- a/testsuite/tests/numeric/should_run/1603.hs
+++ b/testsuite/tests/numeric/should_run/T1603.hs
diff --git a/testsuite/tests/numeric/should_run/1603.stdout b/testsuite/tests/numeric/should_run/T1603.stdout
index 2363a1ac08..2363a1ac08 100644
--- a/testsuite/tests/numeric/should_run/1603.stdout
+++ b/testsuite/tests/numeric/should_run/T1603.stdout
diff --git a/testsuite/tests/numeric/should_run/3676.hs b/testsuite/tests/numeric/should_run/T3676.hs
index 242a9c5bb3..242a9c5bb3 100644
--- a/testsuite/tests/numeric/should_run/3676.hs
+++ b/testsuite/tests/numeric/should_run/T3676.hs
diff --git a/testsuite/tests/numeric/should_run/3676.stdout b/testsuite/tests/numeric/should_run/T3676.stdout
index ab3234f458..ab3234f458 100644
--- a/testsuite/tests/numeric/should_run/3676.stdout
+++ b/testsuite/tests/numeric/should_run/T3676.stdout
diff --git a/testsuite/tests/numeric/should_run/4381.hs b/testsuite/tests/numeric/should_run/T4381.hs
index e55a86939e..e55a86939e 100644
--- a/testsuite/tests/numeric/should_run/4381.hs
+++ b/testsuite/tests/numeric/should_run/T4381.hs
diff --git a/testsuite/tests/numeric/should_run/4381.stdout b/testsuite/tests/numeric/should_run/T4381.stdout
index 715699eb5e..715699eb5e 100644
--- a/testsuite/tests/numeric/should_run/4381.stdout
+++ b/testsuite/tests/numeric/should_run/T4381.stdout
diff --git a/testsuite/tests/numeric/should_run/4383.hs b/testsuite/tests/numeric/should_run/T4383.hs
index 06c7b265d7..06c7b265d7 100644
--- a/testsuite/tests/numeric/should_run/4383.hs
+++ b/testsuite/tests/numeric/should_run/T4383.hs
diff --git a/testsuite/tests/numeric/should_run/4383.stdout b/testsuite/tests/numeric/should_run/T4383.stdout
index d6e38dc3fc..d6e38dc3fc 100644
--- a/testsuite/tests/numeric/should_run/4383.stdout
+++ b/testsuite/tests/numeric/should_run/T4383.stdout
diff --git a/testsuite/tests/numeric/should_run/all.T b/testsuite/tests/numeric/should_run/all.T
index c5cfc8cca4..b2109de9eb 100644
--- a/testsuite/tests/numeric/should_run/all.T
+++ b/testsuite/tests/numeric/should_run/all.T
@@ -35,12 +35,7 @@ test('arith015', normal, compile_and_run, [''])
 test('numrun009', normal, compile_and_run, [''])
 test('numrun010', normal, compile_and_run, [''])
 test('numrun011', normal, compile_and_run, [''])
-test('numrun012',
-        if_os('mingw32',expect_fail_for('ghci')),
-        # on Windows, GHCi says that "logBase 2 (2^31)" is "31.0", but
-        # other platforms (and compiled on Windows) reports 31.000000000000004
-        # I have no idea where the discrepancy comes from.  --SDM
-        compile_and_run, [''])
+test('numrun012', normal, compile_and_run, [''])
 test('numrun013', normal, compile_and_run, [''])
 test('numrun014', normal, compile_and_run, [''])
 test('arith016', compose(normal,only_compiler_types(['ghc'])), compile_and_run, [''])
@@ -49,10 +44,10 @@ test('arith018', normal, compile_and_run, [''])
 test('arith019', normal, compile_and_run, [''])
 test('expfloat', normal, compile_and_run, [''])
 
-test('1603', skip, compile_and_run, [''])
-test('3676', expect_broken(3676), compile_and_run, [''])
-test('4381', normal, compile_and_run, [''])
-test('4383', normal, compile_and_run, [''])
+test('T1603', skip, compile_and_run, [''])
+test('T3676', expect_broken(3676), compile_and_run, [''])
+test('T4381', normal, compile_and_run, [''])
+test('T4383', normal, compile_and_run, [''])
 
 test('add2', normal, compile_and_run, ['-fobject-code'])
 test('mul2', normal, compile_and_run, ['-fobject-code'])
diff --git a/testsuite/tests/parser/unicode/2302.stderr b/testsuite/tests/parser/unicode/2302.stderr
deleted file mode 100644
index 608c9ef0bd..0000000000
--- a/testsuite/tests/parser/unicode/2302.stderr
+++ /dev/null
@@ -1,2 +0,0 @@
-
-2302.hs:1:5: Not in scope: data constructor `À'
diff --git a/testsuite/tests/parser/unicode/1103.hs b/testsuite/tests/parser/unicode/T1103.hs
index 6d10064056..6d10064056 100644
--- a/testsuite/tests/parser/unicode/1103.hs
+++ b/testsuite/tests/parser/unicode/T1103.hs
diff --git a/testsuite/tests/parser/unicode/1744.hs b/testsuite/tests/parser/unicode/T1744.hs
index 90273741da..90273741da 100644
--- a/testsuite/tests/parser/unicode/1744.hs
+++ b/testsuite/tests/parser/unicode/T1744.hs
diff --git a/testsuite/tests/parser/unicode/1744.stdout b/testsuite/tests/parser/unicode/T1744.stdout
index f127f8d21d..f127f8d21d 100644
--- a/testsuite/tests/parser/unicode/1744.stdout
+++ b/testsuite/tests/parser/unicode/T1744.stdout
diff --git a/testsuite/tests/parser/unicode/2302.hs b/testsuite/tests/parser/unicode/T2302.hs
index c40c704cc3..c40c704cc3 100644
--- a/testsuite/tests/parser/unicode/2302.hs
+++ b/testsuite/tests/parser/unicode/T2302.hs
diff --git a/testsuite/tests/parser/unicode/T2302.stderr b/testsuite/tests/parser/unicode/T2302.stderr
new file mode 100644
index 0000000000..9718423be2
--- /dev/null
+++ b/testsuite/tests/parser/unicode/T2302.stderr
@@ -0,0 +1,2 @@
+
+T2302.hs:1:5: Not in scope: data constructor `À'
diff --git a/testsuite/tests/parser/unicode/4373.hs b/testsuite/tests/parser/unicode/T4373.hs
index a753432a41..a753432a41 100644
--- a/testsuite/tests/parser/unicode/4373.hs
+++ b/testsuite/tests/parser/unicode/T4373.hs
diff --git a/testsuite/tests/parser/unicode/all.T b/testsuite/tests/parser/unicode/all.T
index e5375a361e..c8ca793f73 100644
--- a/testsuite/tests/parser/unicode/all.T
+++ b/testsuite/tests/parser/unicode/all.T
@@ -16,7 +16,7 @@ test('utf8_022', normal, compile_fail, [''])
 
 test('utf8_024', normal, compile_and_run, [''])
 
-test('1744', normal, compile_and_run, [''])
-test('1103', normal, compile, [''])
-test('2302', only_ways(['normal']), compile_fail, [''])
-test('4373', normal, compile, [''])
+test('T1744', normal, compile_and_run, [''])
+test('T1103', normal, compile, [''])
+test('T2302', only_ways(['normal']), compile_fail, [''])
+test('T4373', normal, compile, [''])
diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T
index 5104ea9d16..07942bd662 100644
--- a/testsuite/tests/perf/haddock/all.T
+++ b/testsuite/tests/perf/haddock/all.T
@@ -2,21 +2,23 @@
 test('haddock.base',
      [unless_in_tree_compiler(skip)
      ,if_wordsize(64,
-          stats_range_field('peak_megabytes_allocated', 249, 10))
+          stats_range_field('peak_megabytes_allocated', 274, 10))
                                         # 2012-08-14: 240 (amd64/Linux)
                                         # 2012-09-18: 237 (amd64/Linux)
                                         # 2012-11-12: 249 (amd64/Linux)
+                                        # 2013-01-29: 274 (amd64/Linux)
      ,if_wordsize(32,
           stats_num_field('peak_megabytes_allocated', 110,
                                                       115))
                                         # 2012-08-14: 144 (x86/OSX)
                                         # 2012-10-30: 113 (x86/Windows)
      ,if_wordsize(64,
-          stats_range_field('max_bytes_used', 87265136, 10))
+          stats_range_field('max_bytes_used', 96022312, 10))
                                 # 2012-08-14: 87374568 (amd64/Linux)
                                 # 2012-08-21: 86428216 (amd64/Linux)
                                 # 2012-09-20: 84794136 (amd64/Linux)
                                 # 2012-11-12: 87265136 (amd64/Linux)
+                                # 2013-01-29: 96022312 (amd64/Linux)
      ,if_wordsize(32,
           stats_range_field('max_bytes_used', 45574928, 1))
                                 # 2012-08-14: 45574928 (x86/OSX)
diff --git a/testsuite/tests/perf/should_run/3586.hs b/testsuite/tests/perf/should_run/T3586.hs
index 968f2eba27..968f2eba27 100644
--- a/testsuite/tests/perf/should_run/3586.hs
+++ b/testsuite/tests/perf/should_run/T3586.hs
diff --git a/testsuite/tests/perf/should_run/3586.stdout b/testsuite/tests/perf/should_run/T3586.stdout
index 626282f10c..626282f10c 100644
--- a/testsuite/tests/perf/should_run/3586.stdout
+++ b/testsuite/tests/perf/should_run/T3586.stdout
diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T
index d7fe600f50..b201bb1b11 100644
--- a/testsuite/tests/perf/should_run/all.T
+++ b/testsuite/tests/perf/should_run/all.T
@@ -3,7 +3,7 @@
 # fortunately the values here are mostly independent of the wordsize,
 # because the test allocates an unboxed array of doubles.
 
-test('3586',
+test('T3586',
      [stats_num_field('peak_megabytes_allocated', 17,
                                                   18),
                                      # expected value: 17 (amd64/Linux)
@@ -120,7 +120,9 @@ test('T5113',
           stats_num_field('bytes allocated', 8000000,
                                              9000000)),
       only_ways(['normal']),
-      expect_broken(7046)
+      normal
+      # WAS: expect_broken(7046)
+      # but it started working again around 01/2013, see #7046
       ],
      compile_and_run,
      ['-O'])
diff --git a/testsuite/tests/polykinds/T7524.hs b/testsuite/tests/polykinds/T7524.hs
new file mode 100644
index 0000000000..52b24282bf
--- /dev/null
+++ b/testsuite/tests/polykinds/T7524.hs
@@ -0,0 +1,6 @@
+{-# LANGUAGE TypeFamilies, PolyKinds #-}
+module T7524 where
+
+type family F (a :: k1) (b :: k2)
+type instance F a a = Int
+type instance F a b = Bool
diff --git a/testsuite/tests/polykinds/T7524.stderr b/testsuite/tests/polykinds/T7524.stderr
new file mode 100644
index 0000000000..5d909593ed
--- /dev/null
+++ b/testsuite/tests/polykinds/T7524.stderr
@@ -0,0 +1,5 @@
+
+T7524.hs:5:15:
+    Conflicting family instance declarations:
+      F k k a a -- Defined at T7524.hs:5:15
+      F k k1 a b -- Defined at T7524.hs:6:15
diff --git a/testsuite/tests/polykinds/T7601.hs b/testsuite/tests/polykinds/T7601.hs
new file mode 100644
index 0000000000..f2325abc7c
--- /dev/null
+++ b/testsuite/tests/polykinds/T7601.hs
@@ -0,0 +1,12 @@
+{-# LANGUAGE PolyKinds              #-}
+{-# LANGUAGE TypeFamilies           #-}
+
+module T7601 where
+
+import GHC.Exts
+
+class C (a :: k) where
+   type F (a :: k)
+
+class Category (c :: k -> k -> *) where
+   type Ob c :: k -> Constraint
\ No newline at end of file
diff --git a/testsuite/tests/polykinds/all.T b/testsuite/tests/polykinds/all.T
index d84048f1c8..d492a54ca2 100644
--- a/testsuite/tests/polykinds/all.T
+++ b/testsuite/tests/polykinds/all.T
@@ -83,3 +83,5 @@ test('T7404', normal, compile_fail,[''])
 test('T7502', normal, compile,[''])
 test('T7488', normal, compile,[''])
 test('T7594', normal, compile_fail,[''])
+test('T7524', normal, compile_fail,[''])
+test('T7601', normal, compile,[''])
diff --git a/testsuite/tests/profiling/should_compile/2410.hs b/testsuite/tests/profiling/should_compile/T2410.hs
index 5c56e82992..5c56e82992 100644
--- a/testsuite/tests/profiling/should_compile/2410.hs
+++ b/testsuite/tests/profiling/should_compile/T2410.hs
diff --git a/testsuite/tests/profiling/should_compile/all.T b/testsuite/tests/profiling/should_compile/all.T
index b9539038b1..cf7d48dadc 100644
--- a/testsuite/tests/profiling/should_compile/all.T
+++ b/testsuite/tests/profiling/should_compile/all.T
@@ -4,5 +4,5 @@
 test('prof001', compose(only_ways(['normal']), req_profiling), compile_and_run, ['-prof -caf-all'])
 test('prof002', compose(only_ways(['normal']), req_profiling), compile_and_run, ['-prof -caf-all'])
 
-test('2410', compose(only_ways(['normal']), req_profiling), compile, ['-O2 -prof -caf-all'])
+test('T2410', compose(only_ways(['normal']), req_profiling), compile, ['-O2 -prof -caf-all'])
 
diff --git a/testsuite/tests/profiling/should_run/2592.hs b/testsuite/tests/profiling/should_run/T2592.hs
index 3674a4001b..3674a4001b 100644
--- a/testsuite/tests/profiling/should_run/2592.hs
+++ b/testsuite/tests/profiling/should_run/T2592.hs
diff --git a/testsuite/tests/profiling/should_run/2592.stderr b/testsuite/tests/profiling/should_run/T2592.stderr
index 478676340a..724ef0ec6e 100644
--- a/testsuite/tests/profiling/should_run/2592.stderr
+++ b/testsuite/tests/profiling/should_run/T2592.stderr
@@ -1,3 +1,3 @@
-2592: Heap exhausted;
+T2592: Heap exhausted;
 Current maximum heap size is 1048576 bytes (1 MB);
 use `+RTS -M<size>' to increase it.
diff --git a/testsuite/tests/profiling/should_run/5314.hs b/testsuite/tests/profiling/should_run/T5314.hs
index 681eb9586e..681eb9586e 100644
--- a/testsuite/tests/profiling/should_run/5314.hs
+++ b/testsuite/tests/profiling/should_run/T5314.hs
diff --git a/testsuite/tests/profiling/should_run/5314.stdout b/testsuite/tests/profiling/should_run/T5314.stdout
index b9d569380c..b9d569380c 100644
--- a/testsuite/tests/profiling/should_run/5314.stdout
+++ b/testsuite/tests/profiling/should_run/T5314.stdout
diff --git a/testsuite/tests/profiling/should_run/all.T b/testsuite/tests/profiling/should_run/all.T
index 539e0e7872..3722209d9a 100644
--- a/testsuite/tests/profiling/should_run/all.T
+++ b/testsuite/tests/profiling/should_run/all.T
@@ -9,7 +9,7 @@ test('heapprof001',
                extra_run_opts('7')]),
      compile_and_run, [''])
 
-test('2592',
+test('T2592',
      [only_ways(['profasm']), req_profiling,
       extra_run_opts('+RTS -M1m -RTS'), exit_code(251)],
      compile_and_run, [''])
@@ -43,7 +43,7 @@ test('scc004', [req_profiling,
      compile_and_run,
      [''])
 
-test('5314',
+test('T5314',
      [ only_ways(prof_ways),
        extra_ways(extra_prof_ways),
        req_profiling ],
diff --git a/testsuite/tests/rename/should_compile/2334.hs b/testsuite/tests/rename/should_compile/T2334.hs
index 6c1cd80e1f..6c1cd80e1f 100644
--- a/testsuite/tests/rename/should_compile/2334.hs
+++ b/testsuite/tests/rename/should_compile/T2334.hs
diff --git a/testsuite/tests/rename/should_compile/T2435.hs b/testsuite/tests/rename/should_compile/T2435.hs
new file mode 100644
index 0000000000..ab58f2bb73
--- /dev/null
+++ b/testsuite/tests/rename/should_compile/T2435.hs
@@ -0,0 +1,4 @@
+{-# LANGUAGE TypeFamilies #-}
+module Bar where
+import qualified T2435Foo as Foo
+instance Foo.C Int where type T Int = Int
diff --git a/testsuite/tests/rename/should_compile/T2435Foo.hs b/testsuite/tests/rename/should_compile/T2435Foo.hs
new file mode 100644
index 0000000000..47fba68e63
--- /dev/null
+++ b/testsuite/tests/rename/should_compile/T2435Foo.hs
@@ -0,0 +1,3 @@
+{-# LANGUAGE TypeFamilies #-}
+module T2435Foo where
+class C a where type T a
diff --git a/testsuite/tests/rename/should_compile/all.T b/testsuite/tests/rename/should_compile/all.T
index 0a51cd71d8..a1f1965bd1 100644
--- a/testsuite/tests/rename/should_compile/all.T
+++ b/testsuite/tests/rename/should_compile/all.T
@@ -113,7 +113,7 @@ test('rn067',
 test('T1972', normal, compile, [''])
 test('T2205', normal, compile, [''])
 
-test('2334', normal, compile, [''])
+test('T2334', normal, compile, [''])
 test('T2506', normal, compile, [''])
 test('T2914', normal, compile, [''])
 test('T3221', normal, compile, [''])
@@ -202,3 +202,5 @@ test('dodgy',
      ['dodgy', '-v0'])
 test('T7167', normal, compile, [''])
 test('T7336', normal, compile, ['-Wall'])
+
+test('T2435', normal, multimod_compile, ['T2435','-v0'])
diff --git a/testsuite/tests/rename/should_fail/rnfail055.stderr b/testsuite/tests/rename/should_fail/rnfail055.stderr
index a468cc063e..cd559cca95 100644
--- a/testsuite/tests/rename/should_fail/rnfail055.stderr
+++ b/testsuite/tests/rename/should_fail/rnfail055.stderr
@@ -1,109 +1,109 @@
-

-RnFail055.hs:1:73: Warning:

-    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.

-

-RnFail055.hs-boot:1:73: Warning:

-    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.

-

-RnFail055.hs-boot:4:1:

-    Identifier `f1' has conflicting definitions in the module and its hs-boot file

-    Main module: f1 :: Int -> Float

-    Boot file:   f1 :: Float -> Int

-

-RnFail055.hs-boot:6:6:

-    Type constructor `S1' has conflicting definitions in the module and its hs-boot file

-    Main module: type S1 a b = (a, b)

-    Boot file:   type S1 a b c = (a, b)

-

-RnFail055.hs-boot:8:6:

-    Type constructor `S2' has conflicting definitions in the module and its hs-boot file

-    Main module: type S2 a b = forall a1. (a1, b)

-    Boot file:   type S2 a b = forall b1. (a, b1)

-

-RnFail055.hs-boot:12:6:

-    Type constructor `T1' has conflicting definitions in the module and its hs-boot file

-    Main module: data T1 a b

-                     No C type associated

-                     RecFlag Recursive

-                     = T1 :: forall a b. [b] -> [a] -> T1 a b Stricts: _ _

-                     FamilyInstance: none

-    Boot file:   data T1 a b

-                     No C type associated

-                     RecFlag NonRecursive

-                     = T1 :: forall a b. [a] -> [b] -> T1 a b Stricts: _ _

-                     FamilyInstance: none

-

-RnFail055.hs-boot:14:16:

-    Type constructor `T2' has conflicting definitions in the module and its hs-boot file

-    Main module: data Eq b => T2 a b

-                     No C type associated

-                     RecFlag Recursive

-                     = T2 :: forall a b. a -> T2 a b Stricts: _

-                     FamilyInstance: none

-    Boot file:   data Eq a => T2 a b

-                     No C type associated

-                     RecFlag NonRecursive

-                     = T2 :: forall a b. a -> T2 a b Stricts: _

-                     FamilyInstance: none

-

-RnFail055.hs-boot:16:11:

-    T3 is exported by the hs-boot file, but not exported by the module

-

-RnFail055.hs-boot:17:12:

-    T3' is exported by the hs-boot file, but not exported by the module

-

-RnFail055.hs-boot:21:6:

-    Type constructor `T5' has conflicting definitions in the module and its hs-boot file

-    Main module: data T5 a

-                     No C type associated

-                     RecFlag Recursive

-                     = T5 :: forall a. a -> T5 a Stricts: _ Fields: field5

-                     FamilyInstance: none

-    Boot file:   data T5 a

-                     No C type associated

-                     RecFlag NonRecursive

-                     = T5 :: forall a. a -> T5 a Stricts: _

-                     FamilyInstance: none

-

-RnFail055.hs-boot:23:6:

-    Type constructor `T6' has conflicting definitions in the module and its hs-boot file

-    Main module: data T6

-                     No C type associated

-                     RecFlag Recursive

-                     = T6 :: Int -> T6 Stricts: _

-                     FamilyInstance: none

-    Boot file:   data T6

-                     No C type associated

-                     RecFlag NonRecursive

-                     = T6 :: Int -> T6 HasWrapper Stricts: !

-                     FamilyInstance: none

-

-RnFail055.hs-boot:25:6:

-    Type constructor `T7' has conflicting definitions in the module and its hs-boot file

-    Main module: data T7 a

-                     No C type associated

-                     RecFlag Recursive

-                     = T7 :: forall a a1. a1 -> T7 a Stricts: _

-                     FamilyInstance: none

-    Boot file:   data T7 a

-                     No C type associated

-                     RecFlag NonRecursive

-                     = T7 :: forall a b. a -> T7 a Stricts: _

-                     FamilyInstance: none

-

-RnFail055.hs-boot:27:22:

-    RnFail055.m1 is exported by the hs-boot file, but not exported by the module

-

-RnFail055.hs-boot:28:7:

-    Class `C2' has conflicting definitions in the module and its hs-boot file

-    Main module: class C2 a b

-                     RecFlag Recursive

-                     m2 :: a -> b m2' :: a -> b

-    Boot file:   class C2 a b

-                     RecFlag NonRecursive

-                     m2 :: a -> b

-

-RnFail055.hs-boot:29:24:

-    Class `C3' has conflicting definitions in the module and its hs-boot file

-    Main module: class (Eq a, Ord a) => C3 a RecFlag Recursive

-    Boot file:   class (Ord a, Eq a) => C3 a RecFlag NonRecursive

+
+RnFail055.hs:1:73: Warning:
+    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
+
+RnFail055.hs-boot:1:73: Warning:
+    -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
+
+RnFail055.hs-boot:4:1:
+    Identifier `f1' has conflicting definitions in the module and its hs-boot file
+    Main module: f1 :: Int -> Float
+    Boot file:   f1 :: Float -> Int
+
+RnFail055.hs-boot:6:6:
+    Type constructor `S1' has conflicting definitions in the module and its hs-boot file
+    Main module: type S1 a b = (a, b)
+    Boot file:   type S1 a b c = (a, b)
+
+RnFail055.hs-boot:8:6:
+    Type constructor `S2' has conflicting definitions in the module and its hs-boot file
+    Main module: type S2 a b = forall a1. (a1, b)
+    Boot file:   type S2 a b = forall b1. (a, b1)
+
+RnFail055.hs-boot:12:6:
+    Type constructor `T1' has conflicting definitions in the module and its hs-boot file
+    Main module: data T1 a b
+                     No C type associated
+                     RecFlag Recursive, Promotable
+                     = T1 :: forall a b. [b] -> [a] -> T1 a b Stricts: _ _
+                     FamilyInstance: none
+    Boot file:   data T1 a b
+                     No C type associated
+                     RecFlag NonRecursive, Promotable
+                     = T1 :: forall a b. [a] -> [b] -> T1 a b Stricts: _ _
+                     FamilyInstance: none
+
+RnFail055.hs-boot:14:16:
+    Type constructor `T2' has conflicting definitions in the module and its hs-boot file
+    Main module: data Eq b => T2 a b
+                     No C type associated
+                     RecFlag Recursive, Promotable
+                     = T2 :: forall a b. a -> T2 a b Stricts: _
+                     FamilyInstance: none
+    Boot file:   data Eq a => T2 a b
+                     No C type associated
+                     RecFlag NonRecursive, Promotable
+                     = T2 :: forall a b. a -> T2 a b Stricts: _
+                     FamilyInstance: none
+
+RnFail055.hs-boot:16:11:
+    T3 is exported by the hs-boot file, but not exported by the module
+
+RnFail055.hs-boot:17:12:
+    T3' is exported by the hs-boot file, but not exported by the module
+
+RnFail055.hs-boot:21:6:
+    Type constructor `T5' has conflicting definitions in the module and its hs-boot file
+    Main module: data T5 a
+                     No C type associated
+                     RecFlag Recursive, Promotable
+                     = T5 :: forall a. a -> T5 a Stricts: _ Fields: field5
+                     FamilyInstance: none
+    Boot file:   data T5 a
+                     No C type associated
+                     RecFlag NonRecursive, Promotable
+                     = T5 :: forall a. a -> T5 a Stricts: _
+                     FamilyInstance: none
+
+RnFail055.hs-boot:23:6:
+    Type constructor `T6' has conflicting definitions in the module and its hs-boot file
+    Main module: data T6
+                     No C type associated
+                     RecFlag Recursive, Not promotable
+                     = T6 :: Int -> T6 Stricts: _
+                     FamilyInstance: none
+    Boot file:   data T6
+                     No C type associated
+                     RecFlag NonRecursive, Not promotable
+                     = T6 :: Int -> T6 HasWrapper Stricts: !
+                     FamilyInstance: none
+
+RnFail055.hs-boot:25:6:
+    Type constructor `T7' has conflicting definitions in the module and its hs-boot file
+    Main module: data T7 a
+                     No C type associated
+                     RecFlag Recursive, Promotable
+                     = T7 :: forall a a1. a1 -> T7 a Stricts: _
+                     FamilyInstance: none
+    Boot file:   data T7 a
+                     No C type associated
+                     RecFlag NonRecursive, Promotable
+                     = T7 :: forall a b. a -> T7 a Stricts: _
+                     FamilyInstance: none
+
+RnFail055.hs-boot:27:22:
+    RnFail055.m1 is exported by the hs-boot file, but not exported by the module
+
+RnFail055.hs-boot:28:7:
+    Class `C2' has conflicting definitions in the module and its hs-boot file
+    Main module: class C2 a b
+                     RecFlag Recursive
+                     m2 :: a -> b m2' :: a -> b
+    Boot file:   class C2 a b
+                     RecFlag NonRecursive
+                     m2 :: a -> b
+
+RnFail055.hs-boot:29:24:
+    Class `C3' has conflicting definitions in the module and its hs-boot file
+    Main module: class (Eq a, Ord a) => C3 a RecFlag Recursive
+    Boot file:   class (Ord a, Eq a) => C3 a RecFlag NonRecursive
diff --git a/testsuite/tests/rts/2783.stderr b/testsuite/tests/rts/2783.stderr
deleted file mode 100644
index 86d45f2a1a..0000000000
--- a/testsuite/tests/rts/2783.stderr
+++ /dev/null
@@ -1 +0,0 @@
-2783: <<loop>>
diff --git a/testsuite/tests/rts/5644/all.T b/testsuite/tests/rts/5644/all.T
deleted file mode 100644
index bd820d5f7a..0000000000
--- a/testsuite/tests/rts/5644/all.T
+++ /dev/null
@@ -1,7 +0,0 @@
-test('5644', [
-               only_ways(['optasm','threaded1','threaded2']),
-               extra_run_opts('+RTS -M20m -RTS'),
-               exit_code(251) # RTS exit code for "out of memory"
-             ],
-             multimod_compile_and_run,
-             ['heap-overflow.hs','-O'])
diff --git a/testsuite/tests/rts/7087.stderr b/testsuite/tests/rts/7087.stderr
deleted file mode 100644
index d3a25047e3..0000000000
--- a/testsuite/tests/rts/7087.stderr
+++ /dev/null
@@ -1 +0,0 @@
-7087: thread killed
diff --git a/testsuite/tests/rts/Makefile b/testsuite/tests/rts/Makefile
index 7f7781f31a..2eb952df25 100644
--- a/testsuite/tests/rts/Makefile
+++ b/testsuite/tests/rts/Makefile
@@ -31,11 +31,11 @@ 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 TASKS | sed 's/^ *TASKS: *\([0-9]*\).*$$/\1/'
+.PHONY: T4850
+T4850:
+	$(RM) T4850.o T4850.hi T4850$(exeext)
+	"$(TEST_HC)" $(TEST_HC_OPTS) -v0 -rtsopts -debug -threaded --make T4850
+	./T4850 +RTS -s 2>&1 | grep TASKS | sed 's/^ *TASKS: *\([0-9]*\).*$$/\1/'
 
 .PHONY: T5423
 T5423:
diff --git a/testsuite/tests/rts/2047.hs b/testsuite/tests/rts/T2047.hs
index 08b72664a9..08b72664a9 100644
--- a/testsuite/tests/rts/2047.hs
+++ b/testsuite/tests/rts/T2047.hs
diff --git a/testsuite/tests/rts/2783.hs b/testsuite/tests/rts/T2783.hs
index 5edca4e7cd..5edca4e7cd 100644
--- a/testsuite/tests/rts/2783.hs
+++ b/testsuite/tests/rts/T2783.hs
diff --git a/testsuite/tests/rts/T2783.stderr b/testsuite/tests/rts/T2783.stderr
new file mode 100644
index 0000000000..4ea4fc816f
--- /dev/null
+++ b/testsuite/tests/rts/T2783.stderr
@@ -0,0 +1 @@
+T2783: <<loop>>
diff --git a/testsuite/tests/rts/3236.c b/testsuite/tests/rts/T3236.c
index 92d4c12dcd..92d4c12dcd 100644
--- a/testsuite/tests/rts/3236.c
+++ b/testsuite/tests/rts/T3236.c
diff --git a/testsuite/tests/rts/3236.stderr b/testsuite/tests/rts/T3236.stderr
index c1f0511021..c1f0511021 100644
--- a/testsuite/tests/rts/3236.stderr
+++ b/testsuite/tests/rts/T3236.stderr
diff --git a/testsuite/tests/rts/3424.hs b/testsuite/tests/rts/T3424.hs
index e168df49c0..e168df49c0 100644
--- a/testsuite/tests/rts/3424.hs
+++ b/testsuite/tests/rts/T3424.hs
diff --git a/testsuite/tests/rts/3424.stdout b/testsuite/tests/rts/T3424.stdout
index e905960197..e905960197 100644
--- a/testsuite/tests/rts/3424.stdout
+++ b/testsuite/tests/rts/T3424.stdout
diff --git a/testsuite/tests/rts/4850.hs b/testsuite/tests/rts/T4850.hs
index 72616d97eb..72616d97eb 100644
--- a/testsuite/tests/rts/4850.hs
+++ b/testsuite/tests/rts/T4850.hs
diff --git a/testsuite/tests/rts/4850.stdout b/testsuite/tests/rts/T4850.stdout
index b8626c4cff..b8626c4cff 100644
--- a/testsuite/tests/rts/4850.stdout
+++ b/testsuite/tests/rts/T4850.stdout
diff --git a/testsuite/tests/rts/5250.hs b/testsuite/tests/rts/T5250.hs
index f10c2e7c47..f10c2e7c47 100644
--- a/testsuite/tests/rts/5250.hs
+++ b/testsuite/tests/rts/T5250.hs
diff --git a/testsuite/tests/rts/5644/Conf.hs b/testsuite/tests/rts/T5644/Conf.hs
index 595f7b5abf..595f7b5abf 100644
--- a/testsuite/tests/rts/5644/Conf.hs
+++ b/testsuite/tests/rts/T5644/Conf.hs
diff --git a/testsuite/tests/rts/5644/Makefile b/testsuite/tests/rts/T5644/Makefile
index 9101fbd40a..9101fbd40a 100644
--- a/testsuite/tests/rts/5644/Makefile
+++ b/testsuite/tests/rts/T5644/Makefile
diff --git a/testsuite/tests/rts/5644/ManyQueue.hs b/testsuite/tests/rts/T5644/ManyQueue.hs
index d2a6882d6c..d2a6882d6c 100644
--- a/testsuite/tests/rts/5644/ManyQueue.hs
+++ b/testsuite/tests/rts/T5644/ManyQueue.hs
diff --git a/testsuite/tests/rts/5644/5644.stderr b/testsuite/tests/rts/T5644/T5644.stderr
index c0e6e69be1..198dceb2bb 100644
--- a/testsuite/tests/rts/5644/5644.stderr
+++ b/testsuite/tests/rts/T5644/T5644.stderr
@@ -1,3 +1,3 @@
-5644: Heap exhausted;
+T5644: Heap exhausted;
 Current maximum heap size is 20971520 bytes (20 MB);
 use `+RTS -M<size>' to increase it.
diff --git a/testsuite/tests/rts/5644/Util.hs b/testsuite/tests/rts/T5644/Util.hs
index b97e55c255..b97e55c255 100644
--- a/testsuite/tests/rts/5644/Util.hs
+++ b/testsuite/tests/rts/T5644/Util.hs
diff --git a/testsuite/tests/rts/T5644/all.T b/testsuite/tests/rts/T5644/all.T
new file mode 100644
index 0000000000..4b2332bbc6
--- /dev/null
+++ b/testsuite/tests/rts/T5644/all.T
@@ -0,0 +1,7 @@
+test('T5644', [
+                only_ways(['optasm','threaded1','threaded2']),
+                extra_run_opts('+RTS -M20m -RTS'),
+                exit_code(251) # RTS exit code for "out of memory"
+              ],
+              multimod_compile_and_run,
+              ['heap-overflow.hs','-O'])
diff --git a/testsuite/tests/rts/5644/heap-overflow.hs b/testsuite/tests/rts/T5644/heap-overflow.hs
index 1dedc72e2b..1dedc72e2b 100644
--- a/testsuite/tests/rts/5644/heap-overflow.hs
+++ b/testsuite/tests/rts/T5644/heap-overflow.hs
diff --git a/testsuite/tests/rts/5993.hs b/testsuite/tests/rts/T5993.hs
index 25626ffa74..25626ffa74 100644
--- a/testsuite/tests/rts/5993.hs
+++ b/testsuite/tests/rts/T5993.hs
diff --git a/testsuite/tests/rts/5993.stdout b/testsuite/tests/rts/T5993.stdout
index 980a0d5f19..980a0d5f19 100644
--- a/testsuite/tests/rts/5993.stdout
+++ b/testsuite/tests/rts/T5993.stdout
diff --git a/testsuite/tests/rts/T7037_main.c b/testsuite/tests/rts/T7037_main.c
index 91f3130a43..c195834650 100644
--- a/testsuite/tests/rts/T7037_main.c
+++ b/testsuite/tests/rts/T7037_main.c
@@ -1,6 +1,10 @@
+#include <stddef.h>
 #include <unistd.h>
 
 int main(int argc, char *argv[]) {
-    char *args[1] = {NULL};
+#ifdef __MINGW32__
+    const
+#endif
+    char * args[2] = {"T7037", NULL};
     execv("./T7037", args);
 }
diff --git a/testsuite/tests/rts/7087.hs b/testsuite/tests/rts/T7087.hs
index bf9a8fdb73..bf9a8fdb73 100644
--- a/testsuite/tests/rts/7087.hs
+++ b/testsuite/tests/rts/T7087.hs
diff --git a/testsuite/tests/rts/T7087.stderr b/testsuite/tests/rts/T7087.stderr
new file mode 100644
index 0000000000..5754987f4b
--- /dev/null
+++ b/testsuite/tests/rts/T7087.stderr
@@ -0,0 +1 @@
+T7087: thread killed
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index d69d211edd..50c6b3b003 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -42,12 +42,12 @@ test('outofmem', if_os('darwin', skip),
 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'])
+test('T2047', 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('T2783', [ 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.
@@ -55,7 +55,7 @@ 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('T3236', [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, [''])
@@ -68,9 +68,9 @@ test('stack003', [ omit_ways('ghci'), # uses unboxed tuples
 
 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('T3424', # 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, [''])
@@ -112,28 +112,27 @@ test('exec_signals', [
 
 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'])
+test('T4850', normal, run_command, ['$MAKE -s --no-print-directory T4850'])
 
-def config_5250(opts):
+def config_T5250(opts):
     if not (config.arch in ['i386','x86_64']):
         opts.skip = 1;
 
-test('5250', [ config_5250,
-               # stack ptr is not 16-byte aligned on 32-bit Windows
-               if_platform('i386-unknown-mingw32', expect_fail),
-               if_platform('i386-unknown-linux',
-                           expect_broken_for(4211,['llvm'])),
-               extra_clean(['spalign.o']),
-               omit_ways(['ghci']) ],
-             compile_and_run, ['spalign.c'])
+test('T5250', [ config_T5250,
+                # stack ptr is not 16-byte aligned on 32-bit Windows
+                if_platform('i386-unknown-mingw32', expect_fail),
+                if_platform('i386-unknown-linux',
+                            expect_broken_for(4211,['llvm'])),
+                extra_clean(['spalign.o']),
+                omit_ways(['ghci']) ],
+              compile_and_run, ['spalign.c'])
 
 test('T5423',
      extra_clean(['T5423_cmm.o']),
      run_command,
      ['$MAKE -s --no-print-directory T5423'])
 
-test('5993', extra_run_opts('+RTS -k8 -RTS'), compile_and_run, [''])
+test('T5993', extra_run_opts('+RTS -k8 -RTS'), compile_and_run, [''])
 
 test('T6006', [ omit_ways(prof_ways + ['ghci']),
                  extra_clean(['T6006_c.o']),
@@ -148,7 +147,7 @@ test('T7037',
      run_command,
      ['$MAKE -s --no-print-directory T7037'])
 
-test('7087', exit_code(1), compile_and_run, [''])
+test('T7087', exit_code(1), compile_and_run, [''])
 test('T7160', normal, compile_and_run, [''])
 
 test('T7040', [ extra_clean(['T7040_c.o']), omit_ways(['ghci']) ],
diff --git a/testsuite/tests/th/2014/A.hs b/testsuite/tests/th/T2014/A.hs
index d843c00b78..d843c00b78 100644
--- a/testsuite/tests/th/2014/A.hs
+++ b/testsuite/tests/th/T2014/A.hs
diff --git a/testsuite/tests/th/2014/A.hs-boot b/testsuite/tests/th/T2014/A.hs-boot
index d843c00b78..d843c00b78 100644
--- a/testsuite/tests/th/2014/A.hs-boot
+++ b/testsuite/tests/th/T2014/A.hs-boot
diff --git a/testsuite/tests/th/2014/B.hs b/testsuite/tests/th/T2014/B.hs
index 0233a40209..0233a40209 100644
--- a/testsuite/tests/th/2014/B.hs
+++ b/testsuite/tests/th/T2014/B.hs
diff --git a/testsuite/tests/th/2014/C.hs b/testsuite/tests/th/T2014/C.hs
index 5ddff11497..5ddff11497 100644
--- a/testsuite/tests/th/2014/C.hs
+++ b/testsuite/tests/th/T2014/C.hs
diff --git a/testsuite/tests/th/2014/Makefile b/testsuite/tests/th/T2014/Makefile
index eafbcfb7e0..72607a5886 100644
--- a/testsuite/tests/th/2014/Makefile
+++ b/testsuite/tests/th/T2014/Makefile
@@ -2,7 +2,7 @@ TOP=../../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/test.mk
 
-2014 :
+T2014 :
 	'$(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
diff --git a/testsuite/tests/th/2014/all.T b/testsuite/tests/th/T2014/all.T
index c6792677d9..212690d6fe 100644
--- a/testsuite/tests/th/2014/all.T
+++ b/testsuite/tests/th/T2014/all.T
@@ -1,8 +1,8 @@
 setTestOpts(if_compiler_profiled(skip))
 
-test('2014',
+test('T2014',
      [req_interp,
       extra_clean(['A.hi-boot','A.hi','A.o','A.o-boot',
                    'B.hi', 'B.o', 'C.hi', 'C.o'])],
      run_command,
-     ['$MAKE -s --no-print-directory 2014'])
+     ['$MAKE -s --no-print-directory T2014'])
diff --git a/testsuite/tests/typecheck/should_compile/tc231.stderr b/testsuite/tests/typecheck/should_compile/tc231.stderr
index 99f7dfdb2b..e8ebcc7ba8 100644
--- a/testsuite/tests/typecheck/should_compile/tc231.stderr
+++ b/testsuite/tests/typecheck/should_compile/tc231.stderr
@@ -24,6 +24,6 @@ TYPE CONSTRUCTORS
       huh :: forall chain. Q s a chain -> ST s ()

 COERCION AXIOMS

   axiom ShouldCompile.NTCo:Zork ::

-    forall s a b. Zork s a b ~# (forall chain. Q s a chain -> ST s ())

+    Zork s a b = forall chain. Q s a chain -> ST s ()

 Dependent modules: []

 Dependent packages: [base, ghc-prim, integer-gmp]

diff --git a/testsuite/tests/typecheck/should_fail/T7609.hs b/testsuite/tests/typecheck/should_fail/T7609.hs
new file mode 100644
index 0000000000..9e9ebe1a59
--- /dev/null
+++ b/testsuite/tests/typecheck/should_fail/T7609.hs
@@ -0,0 +1,11 @@
+{-# LANGUAGE TypeOperators #-}
+
+module T7609 where
+
+data X a b
+
+f :: (a `X` a, Maybe)
+f = undefined
+
+g :: (a `X` a) => Maybe
+g = undefined
\ No newline at end of file
diff --git a/testsuite/tests/typecheck/should_fail/T7609.stderr b/testsuite/tests/typecheck/should_fail/T7609.stderr
new file mode 100644
index 0000000000..1431bcb7c2
--- /dev/null
+++ b/testsuite/tests/typecheck/should_fail/T7609.stderr
@@ -0,0 +1,11 @@
+
+T7609.hs:7:16:
+    Expecting one more argument to `Maybe'
+    The second argument of a tuple should have kind `*',
+      but `Maybe' has kind `* -> *'
+    In the type signature for `f': f :: (a `X` a, Maybe)
+
+T7609.hs:10:19:
+    Expecting one more argument to `Maybe'
+    Expected a type, but `Maybe' has kind `* -> *'
+    In the type signature for `g': g :: a `X` a => Maybe
diff --git a/testsuite/tests/typecheck/should_fail/all.T b/testsuite/tests/typecheck/should_fail/all.T
index ad62ce75f0..1241e587f7 100644
--- a/testsuite/tests/typecheck/should_fail/all.T
+++ b/testsuite/tests/typecheck/should_fail/all.T
@@ -294,3 +294,4 @@ test('T7368a', normal, compile_fail, [''])
 test('T7545', normal, compile_fail, [''])
 test('T7279', normal, compile_fail, [''])
 test('T2247', normal, compile_fail, [''])
+test('T7609', normal, compile_fail, [''])