Update Trac ticket URLs to point to GitLab

This moves all URL references to Trac tickets to their corresponding
GitLab counterparts.

247 files changed, 256 insertions, 256 deletions

diff --git a/testsuite/tests/annotations/should_fail/T10826.stderr b/testsuite/tests/annotations/should_fail/T10826.stderr
index 0e2bed5d8b..465715ad3e 100644
--- a/testsuite/tests/annotations/should_fail/T10826.stderr
+++ b/testsuite/tests/annotations/should_fail/T10826.stderr
@@ -1,6 +1,6 @@
 
 T10826.hs:6:1: error:
     Annotations are not compatible with Safe Haskell.
-    See https://ghc.haskell.org/trac/ghc/ticket/10826
+    See https://gitlab.haskell.org/ghc/ghc/issues/10826
     In the annotation:
       {-# ANN hook (unsafePerformIO (putStrLn "Woops.")) #-}
diff --git a/testsuite/tests/arrows/should_compile/arrowpat.hs b/testsuite/tests/arrows/should_compile/arrowpat.hs
index dda06cfedf..7e117f9c86 100644
--- a/testsuite/tests/arrows/should_compile/arrowpat.hs
+++ b/testsuite/tests/arrows/should_compile/arrowpat.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE Arrows #-}
 {-# OPTIONS -fno-warn-redundant-constraints #-}
 
--- Test for Trac #1662
+-- Test for #1662
 
 module Arrow where
 
diff --git a/testsuite/tests/arrows/should_fail/T2111.hs b/testsuite/tests/arrows/should_fail/T2111.hs
index 352afe2abe..2123773a35 100644
--- a/testsuite/tests/arrows/should_fail/T2111.hs
+++ b/testsuite/tests/arrows/should_fail/T2111.hs
@@ -1,5 +1,5 @@
 {-# OPTIONS_GHC -XArrows -XRecursiveDo#-}
--- Test Trac #2111
+-- Test #2111
 
 module Foo where
 
diff --git a/testsuite/tests/arrows/should_fail/all.T b/testsuite/tests/arrows/should_fail/all.T
index cc3d7d5369..4445ecd165 100644
--- a/testsuite/tests/arrows/should_fail/all.T
+++ b/testsuite/tests/arrows/should_fail/all.T
@@ -4,7 +4,7 @@ test('arrowfail001',
      [''])
  # arrowfail001 got an ASSERT error in the stage1 compiler
  # because we simply are not typechecking arrow commands
- # correctly.  See Trac #5267, #5609, #5605
+ # correctly.  See #5267, #5609, #5605
  # The fix is patch 'Fix the scope-nesting for arrows' Dec 2014
 
 test('arrowfail002', normal, compile_fail, [''])
diff --git a/testsuite/tests/arrows/should_fail/arrowfail004.hs b/testsuite/tests/arrows/should_fail/arrowfail004.hs
index 3e0835a0e4..dafe087cda 100644
--- a/testsuite/tests/arrows/should_fail/arrowfail004.hs
+++ b/testsuite/tests/arrows/should_fail/arrowfail004.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE Arrows, ExistentialQuantification #-}
 
--- Trac #1662
+-- #1662
 
 module ShouldFail where
 
diff --git a/testsuite/tests/boxy/Compose.hs b/testsuite/tests/boxy/Compose.hs
index 0caa84cbe1..f3d3a10b28 100644
--- a/testsuite/tests/boxy/Compose.hs
+++ b/testsuite/tests/boxy/Compose.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -XImpredicativeTypes -fno-warn-deprecated-flags -XEmptyDataDecls -XGADTs #-}
 
--- Trac #1118
+-- #1118
 
 module Compose where
 
diff --git a/testsuite/tests/codeGen/should_run/cgrun058.hs b/testsuite/tests/codeGen/should_run/cgrun058.hs
index 9bdd551acf..164fa8a850 100644
--- a/testsuite/tests/codeGen/should_run/cgrun058.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun058.hs
@@ -1,5 +1,5 @@
 -- Not really a code-gen test, but this program gave
--- incorrect results in Hugs (Hugs Trac #37), so I
+-- incorrect results in Hugs (Hugs #37), so I
 -- thought I'd add it to GHC's test suite.
 
 module Main where
diff --git a/testsuite/tests/codeGen/should_run/cgrun063.hs b/testsuite/tests/codeGen/should_run/cgrun063.hs
index 14f3cb8d14..8439d3abf0 100644
--- a/testsuite/tests/codeGen/should_run/cgrun063.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun063.hs
@@ -1,7 +1,7 @@
 
 {-
 Check that we aren't making gcc misinterpret our strings as trigraphs.
-Trac #2968.
+#2968.
 http://gcc.gnu.org/onlinedocs/cpp/Initial-processing.html
 -}
 
diff --git a/testsuite/tests/codeGen/should_run/cgrun071.hs b/testsuite/tests/codeGen/should_run/cgrun071.hs
index d55ee65e01..c8ee2d17f9 100644
--- a/testsuite/tests/codeGen/should_run/cgrun071.hs
+++ b/testsuite/tests/codeGen/should_run/cgrun071.hs
@@ -37,7 +37,7 @@ popcnt64 (W64# w#) =
     W# (popCnt# w#)
 #endif
 
--- Cribbed from http://ghc.haskell.org/trac/ghc/ticket/3563
+-- Cribbed from https://gitlab.haskell.org/ghc/ghc/issues/3563
 slowPopcnt :: Word -> Word
 slowPopcnt x = count' (bitSize x) x 0
   where
diff --git a/testsuite/tests/deSugar/should_compile/T2409.hs b/testsuite/tests/deSugar/should_compile/T2409.hs
index 163786bb58..bde05cd3e1 100644
--- a/testsuite/tests/deSugar/should_compile/T2409.hs
+++ b/testsuite/tests/deSugar/should_compile/T2409.hs
@@ -1,4 +1,4 @@
--- Trac #2409
+-- #2409
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/deSugar/should_compile/T3263-1.hs b/testsuite/tests/deSugar/should_compile/T3263-1.hs
index 74249cd663..42ae811084 100644
--- a/testsuite/tests/deSugar/should_compile/T3263-1.hs
+++ b/testsuite/tests/deSugar/should_compile/T3263-1.hs
@@ -1,4 +1,4 @@
--- Trac #3263.  New kind of warning on ignored monadic bindings
+-- #3263.  New kind of warning on ignored monadic bindings
 
 module T3263 where
 
diff --git a/testsuite/tests/deSugar/should_compile/T3263-2.hs b/testsuite/tests/deSugar/should_compile/T3263-2.hs
index 71288062c5..f018ddb4d9 100644
--- a/testsuite/tests/deSugar/should_compile/T3263-2.hs
+++ b/testsuite/tests/deSugar/should_compile/T3263-2.hs
@@ -1,4 +1,4 @@
--- Trac #3263.  New kind of warning on monadic bindings that discard a monadic result
+-- #3263.  New kind of warning on monadic bindings that discard a monadic result
 
 module T3263 where
 
diff --git a/testsuite/tests/deSugar/should_compile/T5252.hs b/testsuite/tests/deSugar/should_compile/T5252.hs
index 70a4531688..ec7399d3cf 100644
--- a/testsuite/tests/deSugar/should_compile/T5252.hs
+++ b/testsuite/tests/deSugar/should_compile/T5252.hs
@@ -1,4 +1,4 @@
--- Trac #5252
+-- #5252
 -- Killed 7.03 when compiled witout -O,
 -- because it could not see that x had a product type
 -- but MkS still unpacked it
diff --git a/testsuite/tests/deSugar/should_compile/ds062.hs b/testsuite/tests/deSugar/should_compile/ds062.hs
index 18bd5d53e5..724c1bf768 100644
--- a/testsuite/tests/deSugar/should_compile/ds062.hs
+++ b/testsuite/tests/deSugar/should_compile/ds062.hs
@@ -7,5 +7,5 @@ f x | null x    = 1
     | otherwise = 2
 
 -- Should not give a non-exhaustive-patterns error
--- See Trac #1759
+-- See #1759
 
diff --git a/testsuite/tests/deSugar/should_compile/ds063.hs b/testsuite/tests/deSugar/should_compile/ds063.hs
index 74bde90887..9c39bd6d4c 100644
--- a/testsuite/tests/deSugar/should_compile/ds063.hs
+++ b/testsuite/tests/deSugar/should_compile/ds063.hs
@@ -8,4 +8,4 @@ f ((+1) -> 1) = 5
 f _           = 3
 
 -- Should not give an overlapping-patterns or non-exhaustive-patterns error
--- See Trac #2395
+-- See #2395
diff --git a/testsuite/tests/deSugar/should_run/T12595.hs b/testsuite/tests/deSugar/should_run/T12595.hs
index 86e0419f65..7adb07cb00 100644
--- a/testsuite/tests/deSugar/should_run/T12595.hs
+++ b/testsuite/tests/deSugar/should_run/T12595.hs
@@ -3,7 +3,7 @@ module Main where
 
 import GHC.Base
 
--- In Trac #12595 a bogus desugaring led (bizarrely)
+-- In #12595 a bogus desugaring led (bizarrely)
 -- to a top-level binding maxInt = maxInt
 -- This test just checks that doesn't happen again
 
diff --git a/testsuite/tests/deSugar/should_run/T246.hs b/testsuite/tests/deSugar/should_run/T246.hs
index 448141cd65..2845db3ab0 100644
--- a/testsuite/tests/deSugar/should_run/T246.hs
+++ b/testsuite/tests/deSugar/should_run/T246.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE ScopedTypeVariables #-}
--- Test Trac #246
+-- Test #246
 
 module Main where
 
diff --git a/testsuite/tests/dependent/should_compile/T16326_Compile1.hs b/testsuite/tests/dependent/should_compile/T16326_Compile1.hs
index 789798b370..138ab486ca 100644
--- a/testsuite/tests/dependent/should_compile/T16326_Compile1.hs
+++ b/testsuite/tests/dependent/should_compile/T16326_Compile1.hs
@@ -21,7 +21,7 @@ type DComp a
   f (g x)
 
 -- Ensure that ElimList has a CUSK, beuas it is
--- is used polymorphically its RHS (c.f. Trac #16344)
+-- is used polymorphically its RHS (c.f. #16344)
 type family ElimList (a :: Type)
                      (p :: [a] -> Type)
                      (s :: [a])
diff --git a/testsuite/tests/deriving/should_compile/T2378.hs b/testsuite/tests/deriving/should_compile/T2378.hs
index 4f12313fc0..cd5d35128e 100644
--- a/testsuite/tests/deriving/should_compile/T2378.hs
+++ b/testsuite/tests/deriving/should_compile/T2378.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE StandaloneDeriving, DeriveDataTypeable #-}
 module Foo( T ) where
 
--- Trac 2378
+-- #2378
 
 import Data.Data
 
diff --git a/testsuite/tests/deriving/should_compile/T2721.hs b/testsuite/tests/deriving/should_compile/T2721.hs
index 916916d250..53a51d3c06 100644
--- a/testsuite/tests/deriving/should_compile/T2721.hs
+++ b/testsuite/tests/deriving/should_compile/T2721.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TypeFamilies, GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE UndecidableInstances #-}
--- Trac #2721
+-- #2721
 
 module T2721 where
 
diff --git a/testsuite/tests/deriving/should_compile/T2856.hs b/testsuite/tests/deriving/should_compile/T2856.hs
index fc309585fe..0e91e4e747 100644
--- a/testsuite/tests/deriving/should_compile/T2856.hs
+++ b/testsuite/tests/deriving/should_compile/T2856.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -fno-warn-redundant-constraints #-}
 {-# LANGUAGE TypeFamilies, GeneralizedNewtypeDeriving, StandaloneDeriving, FlexibleInstances #-}
 
--- Test Trac #2856
+-- Test #2856
 
 module T2856 where
 
diff --git a/testsuite/tests/deriving/should_compile/all.T b/testsuite/tests/deriving/should_compile/all.T
index 5aa102b871..23f152e195 100644
--- a/testsuite/tests/deriving/should_compile/all.T
+++ b/testsuite/tests/deriving/should_compile/all.T
@@ -39,7 +39,7 @@ test('drv-foldable-traversable1', normal, compile, [''])
 test('deriving-via-compile', normal, compile, [''])
 test('deriving-via-standalone', normal, compile, [''])
 test('T6031', [], multimod_compile, ['T6031', '-v0 -O'])
-# Adding -O on T6031 to expose Trac #11245 regardless of way
+# Adding -O on T6031 to expose #11245 regardless of way
 test('T1133', [], makefile_test, [])
 test('T7704', normal, compile, [''])
 test('T7710', normal, compile, [''])
diff --git a/testsuite/tests/deriving/should_compile/deriving-1935.hs b/testsuite/tests/deriving/should_compile/deriving-1935.hs
index 8bccd58182..add1f73590 100644
--- a/testsuite/tests/deriving/should_compile/deriving-1935.hs
+++ b/testsuite/tests/deriving/should_compile/deriving-1935.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -XDeriveDataTypeable #-}
 
--- Trac #1935
+-- #1935
 -- See Note [Superclasses of derived instance] in TcDeriv
 
 {-# OPTIONS -fno-warn-redundant-constraints #-}
diff --git a/testsuite/tests/deriving/should_compile/drv012.hs b/testsuite/tests/deriving/should_compile/drv012.hs
index 1d07a4ee96..c7e696fa49 100644
--- a/testsuite/tests/deriving/should_compile/drv012.hs
+++ b/testsuite/tests/deriving/should_compile/drv012.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE GADTs #-}
 
 -- !!! deriving for GADTs which declare Haskell98 data types.
--- bug reported as http://ghc.haskell.org/trac/ghc/ticket/902
+-- bug reported as https://gitlab.haskell.org/ghc/ghc/issues/902
 module ShouldSucceed where
 
 data Maybe1 a where {
diff --git a/testsuite/tests/deriving/should_fail/T2394.hs b/testsuite/tests/deriving/should_fail/T2394.hs
index 6e62bc364e..32cbe0edcc 100644
--- a/testsuite/tests/deriving/should_fail/T2394.hs
+++ b/testsuite/tests/deriving/should_fail/T2394.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -XDeriveDataTypeable -XStandaloneDeriving #-}
 
--- Test Trac #2394
+-- Test #2394
 
 module Foo where
 
diff --git a/testsuite/tests/deriving/should_fail/T2851.hs b/testsuite/tests/deriving/should_fail/T2851.hs
index bc7239af0a..9973780760 100644
--- a/testsuite/tests/deriving/should_fail/T2851.hs
+++ b/testsuite/tests/deriving/should_fail/T2851.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE TypeFamilies #-}
--- Test Trac #2851
+-- Test #2851
 
 module T2851 where
 
diff --git a/testsuite/tests/deriving/should_fail/drvfail012.hs b/testsuite/tests/deriving/should_fail/drvfail012.hs
index 4a073bbed1..e2bedc7abf 100644
--- a/testsuite/tests/deriving/should_fail/drvfail012.hs
+++ b/testsuite/tests/deriving/should_fail/drvfail012.hs
@@ -1,4 +1,4 @@
--- Trac #1608
+-- #1608
 
 module ShouldFail where
 
diff --git a/testsuite/tests/deriving/should_run/T2529.hs b/testsuite/tests/deriving/should_run/T2529.hs
index d3c3a4b0a3..c818c3697c 100644
--- a/testsuite/tests/deriving/should_run/T2529.hs
+++ b/testsuite/tests/deriving/should_run/T2529.hs
@@ -1,4 +1,4 @@
--- Trac #2529
+-- #2529
 -- The example below successfully performed the {{{show}}}, but {{{reads}}}
 -- returns an empty list. It fails in both GHCi and GHC. It succeeds if you
 -- replaces the infix symbol with a name.
diff --git a/testsuite/tests/eyeball/T3116.hs b/testsuite/tests/eyeball/T3116.hs
index ba2439c897..b193715dbd 100644
--- a/testsuite/tests/eyeball/T3116.hs
+++ b/testsuite/tests/eyeball/T3116.hs
@@ -3,7 +3,7 @@
 -- The thing to look for here is that the implementation
 -- of 'length' does not allocate in the inner loop
 --
--- See Trac #3116
+-- See #3116
 
 module T3116 where
 
diff --git a/testsuite/tests/eyeball/record1.hs b/testsuite/tests/eyeball/record1.hs
index dde6f5ee25..8e3bd92471 100644
--- a/testsuite/tests/eyeball/record1.hs
+++ b/testsuite/tests/eyeball/record1.hs
@@ -1,7 +1,7 @@
 -- Check that the record selector for maskMB unfolds in the body of f
 -- At one stage it didn't because the implicit unfolding looked too big
 
--- Trac #2581
+-- #2581
 
 module ShouldCompile where
 import Data.Array.Base
diff --git a/testsuite/tests/ffi/should_fail/ccfail001.hs b/testsuite/tests/ffi/should_fail/ccfail001.hs
index cd8eb83665..0b7d5e8c7f 100644
--- a/testsuite/tests/ffi/should_fail/ccfail001.hs
+++ b/testsuite/tests/ffi/should_fail/ccfail001.hs
@@ -1,7 +1,7 @@
 
 {-# LANGUAGE ForeignFunctionInterface, MagicHash #-}
 
--- Trac #1037 
+-- #1037 
 
 module Foo where
 
diff --git a/testsuite/tests/ffi/should_fail/ccfail002.hs b/testsuite/tests/ffi/should_fail/ccfail002.hs
index 86d5e9a1ba..bb089b2106 100644
--- a/testsuite/tests/ffi/should_fail/ccfail002.hs
+++ b/testsuite/tests/ffi/should_fail/ccfail002.hs
@@ -1,7 +1,7 @@
 
 {-# LANGUAGE ForeignFunctionInterface, UnboxedTuples, MagicHash, UnliftedFFITypes #-}
 
--- Test for Trac #1680
+-- Test for #1680
 
 module ShouldFail where
 
diff --git a/testsuite/tests/gadt/CasePrune.hs b/testsuite/tests/gadt/CasePrune.hs
index 4048c94c5f..8055bdd8ff 100644
--- a/testsuite/tests/gadt/CasePrune.hs
+++ b/testsuite/tests/gadt/CasePrune.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE GADTs, GeneralizedNewtypeDeriving #-}
 
--- See Trac #1251 and the comments
+-- See #1251 and the comments
 -- Note [Pruning dead case alternatives] in types/Unify.lhs
 
 module Main( main ) where
diff --git a/testsuite/tests/gadt/Session.hs b/testsuite/tests/gadt/Session.hs
index 2a9b3da6ef..bf50115d77 100644
--- a/testsuite/tests/gadt/Session.hs
+++ b/testsuite/tests/gadt/Session.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE GADTs, KindSignatures #-}
 
--- See Trac #1323; crashed GHC 6.6
+-- See #1323; crashed GHC 6.6
 
 module Main where
 
diff --git a/testsuite/tests/gadt/T1999a.hs b/testsuite/tests/gadt/T1999a.hs
index d8dbc077b9..494812ca29 100644
--- a/testsuite/tests/gadt/T1999a.hs
+++ b/testsuite/tests/gadt/T1999a.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE GADTs #-}
--- Trac #1999
+-- #1999
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/gadt/T2587.hs b/testsuite/tests/gadt/T2587.hs
index cea1c092d3..e6424d6228 100644
--- a/testsuite/tests/gadt/T2587.hs
+++ b/testsuite/tests/gadt/T2587.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE GADTs, ExistentialQuantification #-}
 {-# OPTIONS_GHC -O -fno-warn-overlapping-patterns #-}
 
--- Trac #2587
+-- #2587
 -- Actually this bug related to free variables and
 -- type lets, but ostensibly it has a GADT flavour
 -- Hence being in the GADT directory.
diff --git a/testsuite/tests/gadt/T3013.hs b/testsuite/tests/gadt/T3013.hs
index 3b123a0d80..4aaf452464 100644
--- a/testsuite/tests/gadt/T3013.hs
+++ b/testsuite/tests/gadt/T3013.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE GADTs #-}
--- Trac 3013. 
+-- #3013.
 -- This isn't strictly a GADT test, but it uses GADT syntax
 
 module T3013 where
diff --git a/testsuite/tests/gadt/T3163.hs b/testsuite/tests/gadt/T3163.hs
index 13e5ff7de6..985ef9b110 100644
--- a/testsuite/tests/gadt/T3163.hs
+++ b/testsuite/tests/gadt/T3163.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE GADTs, RankNTypes, ImpredicativeTypes #-}
 
--- Test Trac #3163
+-- Test #3163
 
 module Report where
 
diff --git a/testsuite/tests/gadt/data1.hs b/testsuite/tests/gadt/data1.hs
index b9c6ffe19c..7b999c4e80 100644
--- a/testsuite/tests/gadt/data1.hs
+++ b/testsuite/tests/gadt/data1.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE GADTs #-}
 
--- Trac #289
+-- #289
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/gadt/data2.hs b/testsuite/tests/gadt/data2.hs
index fcac05880b..29579a89c3 100644
--- a/testsuite/tests/gadt/data2.hs
+++ b/testsuite/tests/gadt/data2.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE GADTs, ExistentialQuantification #-}
 
--- Trac #289
+-- #289
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/gadt/gadt-fd.hs b/testsuite/tests/gadt/gadt-fd.hs
index 7d966c35eb..0899e3ba74 100644
--- a/testsuite/tests/gadt/gadt-fd.hs
+++ b/testsuite/tests/gadt/gadt-fd.hs
@@ -5,7 +5,7 @@
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE UndecidableInstances #-}
 
--- Trac #345
+-- #345
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/gadt/gadt17.hs b/testsuite/tests/gadt/gadt17.hs
index 26eeda9b2a..de99d3888e 100644
--- a/testsuite/tests/gadt/gadt17.hs
+++ b/testsuite/tests/gadt/gadt17.hs
@@ -4,7 +4,7 @@
 -- This one showed up a bug that required type refinement in TcIface
 -- See the call to coreRefineTys in TcIface
 --
--- Tests for bug: http://ghc.haskell.org/trac/ghc/ticket/685
+-- Tests for bug: https://gitlab.haskell.org/ghc/ghc/issues/685
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/gadt/gadt24.hs b/testsuite/tests/gadt/gadt24.hs
index 86cece09dd..748b2f19c3 100644
--- a/testsuite/tests/gadt/gadt24.hs
+++ b/testsuite/tests/gadt/gadt24.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE GADTs #-}
 
--- Test for Trac #1396
+-- Test for #1396
 -- Panics in GHC 6.6.1
 
 module ShouldCompile where
diff --git a/testsuite/tests/gadt/karl1.hs b/testsuite/tests/gadt/karl1.hs
index e201a711f6..8080381b18 100644
--- a/testsuite/tests/gadt/karl1.hs
+++ b/testsuite/tests/gadt/karl1.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE GADTs, KindSignatures #-}
 
--- See Trac #301
+-- See #301
 -- This particular one doesn't use GADTs per se,
 -- but it does use dictionaries in constructors
 
diff --git a/testsuite/tests/gadt/karl2.hs b/testsuite/tests/gadt/karl2.hs
index 1f46df37ee..de8390f042 100644
--- a/testsuite/tests/gadt/karl2.hs
+++ b/testsuite/tests/gadt/karl2.hs
@@ -2,7 +2,7 @@
 
 module Expr0 where
 
--- See Trac #301
+-- See #301
 -- This one *does* use GADTs (Fct)
 
 import Data.Kind (Type)
diff --git a/testsuite/tests/gadt/records-fail1.hs b/testsuite/tests/gadt/records-fail1.hs
index 12bb3e0cd3..23f9189090 100644
--- a/testsuite/tests/gadt/records-fail1.hs
+++ b/testsuite/tests/gadt/records-fail1.hs
@@ -5,7 +5,7 @@
 -- Record syntax in GADTs has been deprecated since July 2009
 -- see commit 432b9c9322181a3644083e3c19b7e240d90659e7 by simonpj:
 -- "New syntax for GADT-style record declarations, and associated refactoring"
--- and Trac #3306
+-- and #3306
 
 -- It's been removed in August 2015
 -- see Phab D1118
diff --git a/testsuite/tests/ghci/prog003/prog003.T b/testsuite/tests/ghci/prog003/prog003.T
index d649f34e80..b824445a96 100644
--- a/testsuite/tests/ghci/prog003/prog003.T
+++ b/testsuite/tests/ghci/prog003/prog003.T
@@ -1,7 +1,7 @@
 # This test is very flaky on Windows.
 # It is a genuine bug that should be looked at, but
 # for the sake of stability of the build bot we disable it for now.
-# See Trac 11317.
+# See #11317.
 test('prog003',
      [extra_files(['../shell.hs', 'A.hs', 'B.hs', 'C.hs', 'D1.hs', 'D2.hs']),
       when(opsys('mingw32'), skip),
diff --git a/testsuite/tests/ghci/scripts/T11098.script b/testsuite/tests/ghci/scripts/T11098.script
index fc0fbe8c9e..dadfac74ef 100644
--- a/testsuite/tests/ghci/scripts/T11098.script
+++ b/testsuite/tests/ghci/scripts/T11098.script
@@ -1,4 +1,4 @@
--- See Trac #11098
+-- See #11098
 
 :set -XTemplateHaskell
 :set -XNamedWildCards
diff --git a/testsuite/tests/ghci/scripts/T2766.script b/testsuite/tests/ghci/scripts/T2766.script
index 84b83461b7..9d86258f02 100644
--- a/testsuite/tests/ghci/scripts/T2766.script
+++ b/testsuite/tests/ghci/scripts/T2766.script
@@ -1,4 +1,4 @@
--- Test Trac #2766
+-- Test #2766
 :set -XTypeOperators
 :m Control.Arrow
 :t first :: Arrow to => b `to` c -> (b, d) `to` (c, d)
diff --git a/testsuite/tests/ghci/scripts/T3263.hs b/testsuite/tests/ghci/scripts/T3263.hs
index 237cf42c6d..1b1d5df082 100644
--- a/testsuite/tests/ghci/scripts/T3263.hs
+++ b/testsuite/tests/ghci/scripts/T3263.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -Wall #-}
 
--- Test Trac #3263
+-- Test #3263
 
 module T3263 where
 
diff --git a/testsuite/tests/ghci/scripts/ghci019.hs b/testsuite/tests/ghci/scripts/ghci019.hs
index 1cb9fef1a2..14cf726c86 100644
--- a/testsuite/tests/ghci/scripts/ghci019.hs
+++ b/testsuite/tests/ghci/scripts/ghci019.hs
@@ -1,4 +1,4 @@
--- Trac #1581
+-- #1581
 -- Even though Eq is not in scope unqualified, we want to
 -- see the Eq instance of Foo when we say :i Foo
 
diff --git a/testsuite/tests/ghci/scripts/ghci030.hs b/testsuite/tests/ghci/scripts/ghci030.hs
index ed95ea9661..743aa986ea 100644
--- a/testsuite/tests/ghci/scripts/ghci030.hs
+++ b/testsuite/tests/ghci/scripts/ghci030.hs
@@ -1,4 +1,4 @@
--- Trac #2082
+-- #2082
 -- If we :i D or C, we should see parentheses around (Int -> a)
 
 {-# LANGUAGE ExistentialQuantification #-}
diff --git a/testsuite/tests/ghci/scripts/ghci031.hs b/testsuite/tests/ghci/scripts/ghci031.hs
index ef5d985f75..f6c6699a24 100644
--- a/testsuite/tests/ghci/scripts/ghci031.hs
+++ b/testsuite/tests/ghci/scripts/ghci031.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE DatatypeContexts #-}
--- Trac #2138
+-- #2138
 -- If we :i D, we should see the Eq constraint
 
 module Foo where
diff --git a/testsuite/tests/ghci/scripts/ghci033.hs b/testsuite/tests/ghci/scripts/ghci033.hs
index b67960068d..7f047cda05 100644
--- a/testsuite/tests/ghci/scripts/ghci033.hs
+++ b/testsuite/tests/ghci/scripts/ghci033.hs
@@ -1,4 +1,4 @@
--- Test Trac #1930: display of infix constructors
+-- Test #1930: display of infix constructors
 module Test where
 
 data Foo = Foo1 Int 
diff --git a/testsuite/tests/ghci/scripts/ghci063.script b/testsuite/tests/ghci/scripts/ghci063.script
index 377f65934c..6cba37b9ab 100644
--- a/testsuite/tests/ghci/scripts/ghci063.script
+++ b/testsuite/tests/ghci/scripts/ghci063.script
@@ -1,7 +1,7 @@
 :! echo module A where {} >A.hs
 :! echo module B where { import A } >B.hs
 
--- Workaround for Trac #16201. We use "touch -r" to set modification
+-- Workaround for #16201. We use "touch -r" to set modification
 -- timestamps, which leads to precision loss on Darwin. For example,
 --
 --    before: 2019-02-25 01:11:23.807627350 +0300
diff --git a/testsuite/tests/indexed-types/should_compile/IndTypesPerfMerge.hs b/testsuite/tests/indexed-types/should_compile/IndTypesPerfMerge.hs
index 743a41145c..a022c36a85 100644
--- a/testsuite/tests/indexed-types/should_compile/IndTypesPerfMerge.hs
+++ b/testsuite/tests/indexed-types/should_compile/IndTypesPerfMerge.hs
@@ -53,7 +53,7 @@ merge x y = mkMerge (merger x y) x y
 
 
 {- ------------- NASTY TYPE FOR merge -----------------
-   -- See Trac #11408
+   -- See #11408
 
    x:tx, y:ty
    mkMerge @ gamma
diff --git a/testsuite/tests/indexed-types/should_compile/PushedInAsGivens.hs b/testsuite/tests/indexed-types/should_compile/PushedInAsGivens.hs
index 4537d3a21c..844b6ef5c1 100644
--- a/testsuite/tests/indexed-types/should_compile/PushedInAsGivens.hs
+++ b/testsuite/tests/indexed-types/should_compile/PushedInAsGivens.hs
@@ -21,7 +21,7 @@ bar y = let foo :: (F Int ~ [a]) => a -> Int
 -- we will not be able to solve the implication constraint.
 
 -- Oct 14: actually this example is _really_ strange, and doesn't illustrate
--- the real issue in Trac #4935, for which there is a separate test
+-- the real issue in #4935, for which there is a separate test
 --
 -- The example here requires us to infer a type
 --   bar :: F Int ~ [a] => ...
diff --git a/testsuite/tests/indexed-types/should_compile/Records.hs b/testsuite/tests/indexed-types/should_compile/Records.hs
index 8508c66f65..adcc72a459 100644
--- a/testsuite/tests/indexed-types/should_compile/Records.hs
+++ b/testsuite/tests/indexed-types/should_compile/Records.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TypeFamilies #-}
 
--- See Trac #1204
+-- See #1204
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/indexed-types/should_compile/T2238.hs b/testsuite/tests/indexed-types/should_compile/T2238.hs
index 8e77283d77..f2407ac623 100644
--- a/testsuite/tests/indexed-types/should_compile/T2238.hs
+++ b/testsuite/tests/indexed-types/should_compile/T2238.hs
@@ -5,7 +5,7 @@
 {-# LANGUAGE FunctionalDependencies #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 
--- Trac #2238
+-- #2238
 -- Notice that class CTF has just one value field, but
 -- it also has an equality predicate. 
 -- See Note [Class newtypes and equality predicates] in BuildTyCl
diff --git a/testsuite/tests/indexed-types/should_compile/T2944.hs b/testsuite/tests/indexed-types/should_compile/T2944.hs
index 8470a9dc95..81eb00d51b 100644
--- a/testsuite/tests/indexed-types/should_compile/T2944.hs
+++ b/testsuite/tests/indexed-types/should_compile/T2944.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE TypeFamilies #-}
--- Test Trac #2944
+-- Test #2944
 
 module T2944 where
 
diff --git a/testsuite/tests/indexed-types/should_compile/T3017.hs b/testsuite/tests/indexed-types/should_compile/T3017.hs
index 8e4e5bd999..cc9fbc9ee8 100644
--- a/testsuite/tests/indexed-types/should_compile/T3017.hs
+++ b/testsuite/tests/indexed-types/should_compile/T3017.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TypeFamilies #-}
 
--- Trac #3017
+-- #3017
 
 module Foo where
  class Coll c where
diff --git a/testsuite/tests/indexed-types/should_compile/T3590.hs b/testsuite/tests/indexed-types/should_compile/T3590.hs
index 6cc79a6f02..ec2caf9564 100644
--- a/testsuite/tests/indexed-types/should_compile/T3590.hs
+++ b/testsuite/tests/indexed-types/should_compile/T3590.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TypeFamilies, FlexibleContexts #-}
 
--- Trac #3590: a bug in typechecking of sections
+-- #3590: a bug in typechecking of sections
 
 module T3590 where
 
diff --git a/testsuite/tests/indexed-types/should_compile/T4178.hs b/testsuite/tests/indexed-types/should_compile/T4178.hs
index 96d339dc68..e5bbccc6ee 100644
--- a/testsuite/tests/indexed-types/should_compile/T4178.hs
+++ b/testsuite/tests/indexed-types/should_compile/T4178.hs
@@ -5,7 +5,7 @@
         MultiParamTypeClasses,
         FlexibleInstances #-}
 
--- See Trac #4178
+-- See #4178
 
 module T4178 where
 
diff --git a/testsuite/tests/indexed-types/should_compile/UnusedTyVarWarnings.hs b/testsuite/tests/indexed-types/should_compile/UnusedTyVarWarnings.hs
index e286f76e3f..bbd0ba922a 100644
--- a/testsuite/tests/indexed-types/should_compile/UnusedTyVarWarnings.hs
+++ b/testsuite/tests/indexed-types/should_compile/UnusedTyVarWarnings.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TypeFamilies, PolyKinds #-}
 
--- See Trac #10982
+-- See #10982
 
 module UnusedTyVarWarnings where
 
diff --git a/testsuite/tests/indexed-types/should_compile/UnusedTyVarWarningsNamedWCs.hs b/testsuite/tests/indexed-types/should_compile/UnusedTyVarWarningsNamedWCs.hs
index 6d3a48e746..b78626f402 100644
--- a/testsuite/tests/indexed-types/should_compile/UnusedTyVarWarningsNamedWCs.hs
+++ b/testsuite/tests/indexed-types/should_compile/UnusedTyVarWarningsNamedWCs.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TypeFamilies, PolyKinds, NamedWildCards #-}
 
--- See Trac #10982
+-- See #10982
 
 module UnusedTyVarWarningsNamedWCs where
 
diff --git a/testsuite/tests/indexed-types/should_fail/T2334A.hs b/testsuite/tests/indexed-types/should_fail/T2334A.hs
index c73402e2d5..79d4c7c890 100644
--- a/testsuite/tests/indexed-types/should_fail/T2334A.hs
+++ b/testsuite/tests/indexed-types/should_fail/T2334A.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TypeFamilies #-}
 
--- Trac #2334
+-- #2334
 
 module Test where
 
diff --git a/testsuite/tests/indexed-types/should_fail/T4272.hs b/testsuite/tests/indexed-types/should_fail/T4272.hs
index bc5922b062..d3f1c54581 100644
--- a/testsuite/tests/indexed-types/should_fail/T4272.hs
+++ b/testsuite/tests/indexed-types/should_fail/T4272.hs
@@ -1,6 +1,6 @@
  {-# LANGUAGE TypeFamilies, ScopedTypeVariables, FlexibleContexts #-}  
 
--- See also Trac #5763 for why we don't really want to see
+-- See also #5763 for why we don't really want to see
 -- an occurs-check error from this program
 
 module T4272 where
diff --git a/testsuite/tests/indexed-types/should_fail/T9357.hs b/testsuite/tests/indexed-types/should_fail/T9357.hs
index 9365663523..c03254484f 100644
--- a/testsuite/tests/indexed-types/should_fail/T9357.hs
+++ b/testsuite/tests/indexed-types/should_fail/T9357.hs
@@ -7,7 +7,7 @@ type family F (a :: k1) :: k2
 
 type instance F Int# = Int
  -- This one is actually OK (F is poly-kinded;
- -- c.f. Trac #11120 comment:19
+ -- c.f. #11120 comment:19
 
 type instance F (forall a. a->a) = Int
  -- But this one is not (impredicative)
diff --git a/testsuite/tests/indexed-types/should_run/T2985.hs b/testsuite/tests/indexed-types/should_run/T2985.hs
index 6ae6e12c50..161021c6df 100644
--- a/testsuite/tests/indexed-types/should_run/T2985.hs
+++ b/testsuite/tests/indexed-types/should_run/T2985.hs
@@ -4,7 +4,7 @@
 module Main where
 
 -- See http://article.gmane.org/gmane.comp.lang.haskell.general/16796
--- and Trac #2985
+-- and #2985
 
 instance (Num a, Num b, a ~ b) => Num (a,b) where
     (x,y) * (u,v) = (x*u-y*v, x*v+y*u)
diff --git a/testsuite/tests/lib/integer/integerGmpInternals.hs b/testsuite/tests/lib/integer/integerGmpInternals.hs
index e45c6f4a48..24780cc2ac 100644
--- a/testsuite/tests/lib/integer/integerGmpInternals.hs
+++ b/testsuite/tests/lib/integer/integerGmpInternals.hs
@@ -89,7 +89,7 @@ main = do
     print $ gcdExtInteger (-x) y
     print $ gcdExtInteger (-x) (-y)
 
-    -- see Trac #15350
+    -- see #15350
     do
         let a = 2
             b = 2^65 + 1
diff --git a/testsuite/tests/llvm/should_compile/T5486.hs b/testsuite/tests/llvm/should_compile/T5486.hs
index 730a7c2854..ff5d24ca16 100644
--- a/testsuite/tests/llvm/should_compile/T5486.hs
+++ b/testsuite/tests/llvm/should_compile/T5486.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE ForeignFunctionInterface, UnliftedFFITypes, UnboxedTuples,
              BangPatterns, MagicHash #-}
 
--- | Test case for Trac #5486
+-- | Test case for #5486
 -- Test case reduced from HsOpenSSL package BN module
 module Bad where
 
diff --git a/testsuite/tests/llvm/should_compile/T5681.hs b/testsuite/tests/llvm/should_compile/T5681.hs
index 8a94fb44ce..1ce84b6ccb 100644
--- a/testsuite/tests/llvm/should_compile/T5681.hs
+++ b/testsuite/tests/llvm/should_compile/T5681.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE MagicHash, UnboxedTuples #-}
--- Test case for Trac #5681
+-- Test case for #5681
 module Main where
 
 import GHC.Prim
diff --git a/testsuite/tests/llvm/should_run/subsections_via_symbols/all.T b/testsuite/tests/llvm/should_run/subsections_via_symbols/all.T
index ef586bc6a0..68ade25e99 100644
--- a/testsuite/tests/llvm/should_run/subsections_via_symbols/all.T
+++ b/testsuite/tests/llvm/should_run/subsections_via_symbols/all.T
@@ -10,7 +10,7 @@ setTestOpts(f)
 
 # Note [_ffi_call_unix64]
 #
-# Please refer to https://ghc.haskell.org/trac/ghc/ticket/5019
+# Please refer to https://gitlab.haskell.org/ghc/ghc/issues/5019
 # for the subsections_via_symbols.stderr
 
 test('subsections_via_symbols', [only_darwin], makefile_test, [])
diff --git a/testsuite/tests/module/T3776.hs b/testsuite/tests/module/T3776.hs
index b522cfe0e0..195fc8ac04 100644
--- a/testsuite/tests/module/T3776.hs
+++ b/testsuite/tests/module/T3776.hs
@@ -2,7 +2,7 @@
 
 -- Check that although 'index' is apparently only used
 -- unqualified, we nevertheless do not get a redundant-import warning
---   Trac #3776
+--   #3776
 
 module T3776 where
 
diff --git a/testsuite/tests/parser/should_compile/read066.hs b/testsuite/tests/parser/should_compile/read066.hs
index 374f76126c..d4adec88ae 100644
--- a/testsuite/tests/parser/should_compile/read066.hs
+++ b/testsuite/tests/parser/should_compile/read066.hs
@@ -2,7 +2,7 @@
 {-# OPTIONS_NO_SUCH_PRAGMA --no-such-flag #-}
 
 -- We should parse the above as an unrecognised pragma, not as an OPTIONS
--- pragma containing "_NO_SUCH_PRAGMA -wibble". Trac #2847.
+-- pragma containing "_NO_SUCH_PRAGMA -wibble". #2847.
 
 module Test where
 
diff --git a/testsuite/tests/parser/should_compile/read_1821.hs b/testsuite/tests/parser/should_compile/read_1821.hs
index f9669ab053..8cf39b87e7 100644
--- a/testsuite/tests/parser/should_compile/read_1821.hs
+++ b/testsuite/tests/parser/should_compile/read_1821.hs
@@ -1,5 +1,5 @@
 
--- Trac #1821
+-- #1821
 
 module Par where
 
diff --git a/testsuite/tests/parser/should_fail/NoNumericUnderscores0.hs b/testsuite/tests/parser/should_fail/NoNumericUnderscores0.hs
index 5e6821124a..0c5ddd5723 100644
--- a/testsuite/tests/parser/should_fail/NoNumericUnderscores0.hs
+++ b/testsuite/tests/parser/should_fail/NoNumericUnderscores0.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE NoNumericUnderscores #-}
 
 -- Test for NumericUnderscores extension.
--- See Trac #14473
+-- See #14473
 -- This is a testcase for integer literal
 -- in NO NumericUnderscores extension.
 
diff --git a/testsuite/tests/parser/should_fail/NoNumericUnderscores1.hs b/testsuite/tests/parser/should_fail/NoNumericUnderscores1.hs
index 017f20528b..62594a24a6 100644
--- a/testsuite/tests/parser/should_fail/NoNumericUnderscores1.hs
+++ b/testsuite/tests/parser/should_fail/NoNumericUnderscores1.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE NoNumericUnderscores #-}
 
 -- Test for NumericUnderscores extension.
--- See Trac #14473
+-- See #14473
 -- This is a testcase for floating literal
 -- in NO NumericUnderscores extension.
 
diff --git a/testsuite/tests/parser/should_fail/NumericUnderscoresFail0.hs b/testsuite/tests/parser/should_fail/NumericUnderscoresFail0.hs
index 1f04184365..734e07b146 100644
--- a/testsuite/tests/parser/should_fail/NumericUnderscoresFail0.hs
+++ b/testsuite/tests/parser/should_fail/NumericUnderscoresFail0.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE NumericUnderscores #-}
 
 -- Test for NumericUnderscores extension.
--- See Trac #14473
+-- See #14473
 -- This is a testcase for invalid case of NumericUnderscores.
 
 main :: IO ()
diff --git a/testsuite/tests/parser/should_fail/NumericUnderscoresFail1.hs b/testsuite/tests/parser/should_fail/NumericUnderscoresFail1.hs
index 0a6a3051d6..dc4e8bc854 100644
--- a/testsuite/tests/parser/should_fail/NumericUnderscoresFail1.hs
+++ b/testsuite/tests/parser/should_fail/NumericUnderscoresFail1.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE NumericUnderscores #-}
 
 -- Test for NumericUnderscores extension.
--- See Trac #14473
+-- See #14473
 -- This is a testcase for invalid case of NumericUnderscores.
 
 main :: IO ()
diff --git a/testsuite/tests/parser/should_fail/T3095.hs b/testsuite/tests/parser/should_fail/T3095.hs
index fc7889f7bf..9c508eb81b 100644
--- a/testsuite/tests/parser/should_fail/T3095.hs
+++ b/testsuite/tests/parser/should_fail/T3095.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE KindSignatures #-}
--- Trac #3095
+-- #3095
 module T3095 where
 
 import Data.Kind (Type)
diff --git a/testsuite/tests/parser/should_run/NumericUnderscores0.hs b/testsuite/tests/parser/should_run/NumericUnderscores0.hs
index 7aefce95c6..0bc5ee03ec 100644
--- a/testsuite/tests/parser/should_run/NumericUnderscores0.hs
+++ b/testsuite/tests/parser/should_run/NumericUnderscores0.hs
@@ -4,7 +4,7 @@
 {-# LANGUAGE NegativeLiterals #-}
 
 -- Test for NumericUnderscores extension.
--- See Trac #14473
+-- See #14473
 -- This is a testcase for boxed literals.
 
 main :: IO ()
diff --git a/testsuite/tests/parser/should_run/NumericUnderscores1.hs b/testsuite/tests/parser/should_run/NumericUnderscores1.hs
index b9d0dca725..638e5353a6 100644
--- a/testsuite/tests/parser/should_run/NumericUnderscores1.hs
+++ b/testsuite/tests/parser/should_run/NumericUnderscores1.hs
@@ -4,7 +4,7 @@
 {-# LANGUAGE NegativeLiterals #-}
 
 -- Test for NumericUnderscores extension.
--- See Trac #14473
+-- See #14473
 -- This is a testcase for unboxed literals.
 
 import GHC.Types
diff --git a/testsuite/tests/parser/should_run/readRun004.hs b/testsuite/tests/parser/should_run/readRun004.hs
index 5e6545adb1..698aa151af 100644
--- a/testsuite/tests/parser/should_run/readRun004.hs
+++ b/testsuite/tests/parser/should_run/readRun004.hs
@@ -3,7 +3,7 @@
 -- should_run to make sure linking succeeds
 -- (curried unboxed tuples with both boxed
 --  and unboxed components).
--- See Trac #1509; also Note [Primop wrappers] in Id.lhs
+-- See #1509; also Note [Primop wrappers] in Id.lhs
 
 import GHC.Exts
 
diff --git a/testsuite/tests/parser/unicode/brackets.hs b/testsuite/tests/parser/unicode/brackets.hs
index 33c8e3f44f..72c41524d5 100644
--- a/testsuite/tests/parser/unicode/brackets.hs
+++ b/testsuite/tests/parser/unicode/brackets.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE UnicodeSyntax   #-}
 
--- See Trac #10162 and #11743 for details
+-- See #10162 and #11743 for details
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/partial-sigs/should_compile/NamedWildcardsAsTyVars.hs b/testsuite/tests/partial-sigs/should_compile/NamedWildcardsAsTyVars.hs
index 8d824f5fec..fdd79394e2 100644
--- a/testsuite/tests/partial-sigs/should_compile/NamedWildcardsAsTyVars.hs
+++ b/testsuite/tests/partial-sigs/should_compile/NamedWildcardsAsTyVars.hs
@@ -4,7 +4,7 @@
 -- enabled and the identifiers starting with _ are parsed as type variables.
 -- They should remain valid when the extension is on.
 --
--- See Trac #11098 and comments in #10982
+-- See #11098 and comments in #10982
 
 module NamedWildcardsAsTyVars where
 
diff --git a/testsuite/tests/partial-sigs/should_compile/T12033.hs b/testsuite/tests/partial-sigs/should_compile/T12033.hs
index 9d47ec6541..f426b9cdd5 100644
--- a/testsuite/tests/partial-sigs/should_compile/T12033.hs
+++ b/testsuite/tests/partial-sigs/should_compile/T12033.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TypeFamilies, PartialTypeSignatures #-}
 
--- In Trac #12033 this was called HsakellBug.hs
+-- In #12033 this was called HsakellBug.hs
 
 module T12033 where
 tripleStoreToRuleSet :: v -> v
diff --git a/testsuite/tests/partial-sigs/should_fail/NamedWildcardExplicitForall.hs b/testsuite/tests/partial-sigs/should_fail/NamedWildcardExplicitForall.hs
index d0e6e8a14d..4c3852e72c 100644
--- a/testsuite/tests/partial-sigs/should_fail/NamedWildcardExplicitForall.hs
+++ b/testsuite/tests/partial-sigs/should_fail/NamedWildcardExplicitForall.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE RankNTypes, NamedWildCards #-}
 
--- See Trac #11098
+-- See #11098
 
 module NamedWildcardExplicitForall where
 
diff --git a/testsuite/tests/patsyn/should_fail/T14380.stderr b/testsuite/tests/patsyn/should_fail/T14380.stderr
index 4228d2955c..47dcc93d81 100644
--- a/testsuite/tests/patsyn/should_fail/T14380.stderr
+++ b/testsuite/tests/patsyn/should_fail/T14380.stderr
@@ -5,5 +5,5 @@ T14380.hs:8:15: error:
       Suggestion: instead use an explicitly bidirectional pattern synonym, e.g.
         pattern Bar <- Foo [] where Bar = ...
       Reason: rebindable syntax is on.
-      This is fixable: add use-case to Trac #14380
+      This is fixable: add use-case to #14380
     RHS pattern: Foo []
diff --git a/testsuite/tests/perf/compiler/T9872d.hs b/testsuite/tests/perf/compiler/T9872d.hs
index 5c859eefdc..22d6912aef 100644
--- a/testsuite/tests/perf/compiler/T9872d.hs
+++ b/testsuite/tests/perf/compiler/T9872d.hs
@@ -8,7 +8,7 @@
 {-# OPTIONS_GHC -freduction-depth=0 #-}   -- this should terminate!
 
 module T9872d where
--- Code from Jan Stolarek, labelled "exp-tyfams.hs" on Trac #9872,
+-- Code from Jan Stolarek, labelled "exp-tyfams.hs" on #9872,
 -- generated by a Template Haskell program
 
 
diff --git a/testsuite/tests/perf/should_run/T14936.hs b/testsuite/tests/perf/should_run/T14936.hs
index 187404cc56..90a4412e54 100644
--- a/testsuite/tests/perf/should_run/T14936.hs
+++ b/testsuite/tests/perf/should_run/T14936.hs
@@ -16,7 +16,7 @@ intSize :: Int
 intSize = Storable.sizeOf (undefined :: Int)
 
 -- This 'go' loop should allocate nothing, because it specialises
--- for the shape of the state.  But in 8.4 it did (Trac #14936)
+-- for the shape of the state.  But in 8.4 it did (#14936)
 
 slow :: Int -> IO ()
 slow i = do let go 0 = pure ()
diff --git a/testsuite/tests/perf/should_run/T149_A.hs b/testsuite/tests/perf/should_run/T149_A.hs
index 22ec276ebc..8065fb1139 100644
--- a/testsuite/tests/perf/should_run/T149_A.hs
+++ b/testsuite/tests/perf/should_run/T149_A.hs
@@ -1,6 +1,6 @@
 module Main (main) where
 
--- See Trac #149
+-- See #149
 
 -- Currently (with GHC 7.0) the CSE works, just,
 -- but it's delicate.
diff --git a/testsuite/tests/perf/should_run/T149_B.hs b/testsuite/tests/perf/should_run/T149_B.hs
index 514fd16a9c..2439efbe4f 100644
--- a/testsuite/tests/perf/should_run/T149_B.hs
+++ b/testsuite/tests/perf/should_run/T149_B.hs
@@ -1,6 +1,6 @@
 module Main (main) where
 
--- See Trac #149
+-- See #149
 
 -- Currently (with GHC 7.0) the CSE works, just,
 -- but it's delicate.
diff --git a/testsuite/tests/perf/should_run/T5549.hs b/testsuite/tests/perf/should_run/T5549.hs
index cab0dc0226..9109318056 100644
--- a/testsuite/tests/perf/should_run/T5549.hs
+++ b/testsuite/tests/perf/should_run/T5549.hs
@@ -1,5 +1,5 @@
 module Main where
--- See Trac #5549
+-- See #5549
 -- The issue here is allocating integer constants inside a loop
 
 
diff --git a/testsuite/tests/pmcheck/should_compile/T12957a.hs b/testsuite/tests/pmcheck/should_compile/T12957a.hs
index 72330e98e0..d804548480 100644
--- a/testsuite/tests/pmcheck/should_compile/T12957a.hs
+++ b/testsuite/tests/pmcheck/should_compile/T12957a.hs
@@ -3,7 +3,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE KindSignatures #-}
 
--- The original test case for Trac #12957
+-- The original test case for #12957
 
 module T12957a where
 
diff --git a/testsuite/tests/polykinds/T11248.hs b/testsuite/tests/polykinds/T11248.hs
index b3a32e3097..cd780d1211 100644
--- a/testsuite/tests/polykinds/T11248.hs
+++ b/testsuite/tests/polykinds/T11248.hs
@@ -1,5 +1,5 @@
 {-# OPTIONS_GHC -O #-}
-  -- Trac #11248, comment:6 showed that this tests failed with -O
+  -- #11248, comment:6 showed that this tests failed with -O
 
 {-# LANGUAGE DataKinds, TypeOperators, TypeFamilies,
              KindSignatures, ConstraintKinds #-}
diff --git a/testsuite/tests/polykinds/T11480b.hs b/testsuite/tests/polykinds/T11480b.hs
index 2684c6de4e..0ec19753a0 100644
--- a/testsuite/tests/polykinds/T11480b.hs
+++ b/testsuite/tests/polykinds/T11480b.hs
@@ -17,7 +17,7 @@
 
 -- This code, supplied by Edward Kmett, uses UndecidableSuperClasses along
 -- with a bunch of other stuff, so it's a useful stress test.
--- See Trac #11480 comment:12.
+-- See #11480 comment:12.
 
 module T11480b where
 
diff --git a/testsuite/tests/polykinds/T7594.hs b/testsuite/tests/polykinds/T7594.hs
index 925b3f9ace..3b941151e5 100644
--- a/testsuite/tests/polykinds/T7594.hs
+++ b/testsuite/tests/polykinds/T7594.hs
@@ -27,7 +27,7 @@ q :: ColD (Show :&: Real)
 q = ColD (1.2 :: Double)
 
 bar = app print q
--- This one works, as a result of fixing Trac #8644,
+-- This one works, as a result of fixing #8644,
 -- because the given constraint is
 --   (Show :&: Real) a, which has no equality superclasses
 
diff --git a/testsuite/tests/polykinds/T8566a.hs b/testsuite/tests/polykinds/T8566a.hs
index 22b628553f..7a4c658ffb 100644
--- a/testsuite/tests/polykinds/T8566a.hs
+++ b/testsuite/tests/polykinds/T8566a.hs
@@ -17,7 +17,7 @@ type family ExpandField (args :: [Field]) :: [Type]
 type family AppVars (t :: k) (vs :: [Type]) :: Type
 
 -- This function fails to compile, because we discard
--- 'given' kind equalities.  See comment 7 in Trac #8566
+-- 'given' kind equalities.  See comment 7 in #8566
 -- This is really a bug, I claim
 unA :: InField (APP t args) -> AppVars t (ExpandField args)
 unA (A x) = x
diff --git a/testsuite/tests/quotes/T2931.hs b/testsuite/tests/quotes/T2931.hs
index 43aeda0ece..9ad6825929 100644
--- a/testsuite/tests/quotes/T2931.hs
+++ b/testsuite/tests/quotes/T2931.hs
@@ -1,4 +1,4 @@
--- Trac #2931
+-- #2931
 
 module Foo where
 a = 1
diff --git a/testsuite/tests/quotes/T3572.hs b/testsuite/tests/quotes/T3572.hs
index 4717fd2735..d2a2c67838 100644
--- a/testsuite/tests/quotes/T3572.hs
+++ b/testsuite/tests/quotes/T3572.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE EmptyDataDecls #-}
 
--- Trac #3572
+-- #3572
 
 module Main where
 
diff --git a/testsuite/tests/quotes/TH_scope.hs b/testsuite/tests/quotes/TH_scope.hs
index 7674a5d1c0..34caa586ff 100644
--- a/testsuite/tests/quotes/TH_scope.hs
+++ b/testsuite/tests/quotes/TH_scope.hs
@@ -1,4 +1,4 @@
--- Test for Trac #2188
+-- Test for #2188
 
 module TH_scope where
 
diff --git a/testsuite/tests/rebindable/T303.hs b/testsuite/tests/rebindable/T303.hs
index c9be12469c..23772efeef 100644
--- a/testsuite/tests/rebindable/T303.hs
+++ b/testsuite/tests/rebindable/T303.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE RebindableSyntax #-}
 
--- Trac #303
+-- #303
 
 module T where
 import qualified Prelude as P
diff --git a/testsuite/tests/rebindable/all.T b/testsuite/tests/rebindable/all.T
index 1484dd73d9..7c8caea438 100644
--- a/testsuite/tests/rebindable/all.T
+++ b/testsuite/tests/rebindable/all.T
@@ -13,7 +13,7 @@ test('rebindable4', normal, compile_and_run, [''])
 test('rebindable5', normal, compile_and_run, [''])
 
 # rebindable6 has become expected failures
-# following Trac #1537
+# following #1537
 test('rebindable6', normal, compile_fail, [''])
 
 test('rebindable7', normal, compile_and_run, [''])
diff --git a/testsuite/tests/rebindable/rebindable8.hs b/testsuite/tests/rebindable/rebindable8.hs
index 2c1f484f47..f78479202d 100644
--- a/testsuite/tests/rebindable/rebindable8.hs
+++ b/testsuite/tests/rebindable/rebindable8.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE RebindableSyntax, MultiParamTypeClasses #-}
 
--- Trac #1537
+-- #1537
 
 module Foo where
 import Prelude hiding (Monad(..))
diff --git a/testsuite/tests/rebindable/rebindable9.hs b/testsuite/tests/rebindable/rebindable9.hs
index cd3c95ab62..53f408223f 100644
--- a/testsuite/tests/rebindable/rebindable9.hs
+++ b/testsuite/tests/rebindable/rebindable9.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE RebindableSyntax, FlexibleInstances,
              MultiParamTypeClasses, FunctionalDependencies #-}
 
--- Trac #1537
+-- #1537
 
 module Foo where
 import qualified Prelude
diff --git a/testsuite/tests/rename/should_compile/T1789.hs b/testsuite/tests/rename/should_compile/T1789.hs
index efe3840e4f..d33ab40c82 100644
--- a/testsuite/tests/rename/should_compile/T1789.hs
+++ b/testsuite/tests/rename/should_compile/T1789.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -fwarn-missing-import-lists #-}
 
--- Test Trac #1789
+-- Test #1789
 module T1789 where
 
 import Prelude
diff --git a/testsuite/tests/rename/should_compile/T1789_2.hs b/testsuite/tests/rename/should_compile/T1789_2.hs
index 2ac2a509fe..5fb3c92cfd 100644
--- a/testsuite/tests/rename/should_compile/T1789_2.hs
+++ b/testsuite/tests/rename/should_compile/T1789_2.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -fwarn-missing-import-lists #-}
 
--- Test Trac #1789
+-- Test #1789
 module T1789_2 where
 
 import Data.Map (size)
diff --git a/testsuite/tests/rename/should_compile/T17a.hs b/testsuite/tests/rename/should_compile/T17a.hs
index a58a766340..998be111dc 100644
--- a/testsuite/tests/rename/should_compile/T17a.hs
+++ b/testsuite/tests/rename/should_compile/T17a.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -fwarn-unused-top-binds #-}
 
--- Trac #17
+-- #17
 
 module Temp (foo, bar, quux) where
 
diff --git a/testsuite/tests/rename/should_compile/T17b.hs b/testsuite/tests/rename/should_compile/T17b.hs
index 7946f16deb..d3983fd25d 100644
--- a/testsuite/tests/rename/should_compile/T17b.hs
+++ b/testsuite/tests/rename/should_compile/T17b.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -fwarn-unused-local-binds #-}
 
--- Trac #17
+-- #17
 
 module Temp (foo, bar, quux) where
 
diff --git a/testsuite/tests/rename/should_compile/T17c.hs b/testsuite/tests/rename/should_compile/T17c.hs
index 091524c95a..85ad72e4dd 100644
--- a/testsuite/tests/rename/should_compile/T17c.hs
+++ b/testsuite/tests/rename/should_compile/T17c.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -fwarn-unused-pattern-binds #-}
 
--- Trac #17
+-- #17
 
 module Temp (foo, bar, quux) where
 
diff --git a/testsuite/tests/rename/should_compile/T17d.hs b/testsuite/tests/rename/should_compile/T17d.hs
index 1a4b44d717..5e43c58e47 100644
--- a/testsuite/tests/rename/should_compile/T17d.hs
+++ b/testsuite/tests/rename/should_compile/T17d.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -fwarn-unused-matches #-}
 
--- Trac #17
+-- #17
 
 module Temp (foo, bar, quux) where
 
diff --git a/testsuite/tests/rename/should_compile/T17e.hs b/testsuite/tests/rename/should_compile/T17e.hs
index 93ed1f7344..c64f008f89 100644
--- a/testsuite/tests/rename/should_compile/T17e.hs
+++ b/testsuite/tests/rename/should_compile/T17e.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -fwarn-unused-binds #-}
 
--- Trac #17
+-- #17
 
 module Temp (foo, bar, quux) where
 
diff --git a/testsuite/tests/rename/should_compile/T1972.hs b/testsuite/tests/rename/should_compile/T1972.hs
index 09dd8acaf4..d4da5f41aa 100644
--- a/testsuite/tests/rename/should_compile/T1972.hs
+++ b/testsuite/tests/rename/should_compile/T1972.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -fwarn-name-shadowing -fwarn-unused-binds #-}
 
--- Trac #1972
+-- #1972
 
 module Temp where
 
diff --git a/testsuite/tests/rename/should_compile/T2205.hs b/testsuite/tests/rename/should_compile/T2205.hs
index 580dea247a..c35c13d9d6 100644
--- a/testsuite/tests/rename/should_compile/T2205.hs
+++ b/testsuite/tests/rename/should_compile/T2205.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -XTypeOperators #-}
 
 -- Test fixity of type operators
--- Trac #2205
+-- #2205
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/rename/should_compile/T2506.hs b/testsuite/tests/rename/should_compile/T2506.hs
index 1e31a12c12..e12ebe3822 100644
--- a/testsuite/tests/rename/should_compile/T2506.hs
+++ b/testsuite/tests/rename/should_compile/T2506.hs
@@ -1,4 +1,4 @@
--- Trac #2506
+-- #2506
 
 module ShouldCompile where
 import Control.Exception (assert)
diff --git a/testsuite/tests/rename/should_compile/T3221.hs b/testsuite/tests/rename/should_compile/T3221.hs
index 970abfb403..83b7a72bef 100644
--- a/testsuite/tests/rename/should_compile/T3221.hs
+++ b/testsuite/tests/rename/should_compile/T3221.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -Werror -fwarn-unused-binds #-}
 
--- Test Trac #3221: the constructors are used by the deriving
+-- Test #3221: the constructors are used by the deriving
 --                  clause, even though they are not exported
 
 module T3221( Foo ) where
diff --git a/testsuite/tests/rename/should_compile/T3262.hs b/testsuite/tests/rename/should_compile/T3262.hs
index 01437d8d2f..b56226c846 100644
--- a/testsuite/tests/rename/should_compile/T3262.hs
+++ b/testsuite/tests/rename/should_compile/T3262.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS -fwarn-name-shadowing #-}
 
--- Trac #3262: report shadowing in g but not f
+-- #3262: report shadowing in g but not f
  
 module T3262 where
 
diff --git a/testsuite/tests/rename/should_compile/rn051.hs b/testsuite/tests/rename/should_compile/rn051.hs
index ee5b53ee8e..ff326e26ef 100644
--- a/testsuite/tests/rename/should_compile/rn051.hs
+++ b/testsuite/tests/rename/should_compile/rn051.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -XNoImplicitPrelude #-}
 
 -- This one crashed GHC 6.6 in lookupDeprec
--- See Trac #1128
+-- See #1128
 -- and Note [Used names with interface not loaded]
 -- in RnNames
 
diff --git a/testsuite/tests/rename/should_compile/rn058.hs b/testsuite/tests/rename/should_compile/rn058.hs
index 838f58b1c7..4d6576b094 100644
--- a/testsuite/tests/rename/should_compile/rn058.hs
+++ b/testsuite/tests/rename/should_compile/rn058.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE ForeignFunctionInterface #-}
 {-# OPTIONS_GHC -fwarn-unused-imports #-}
 
--- Trac #1386
+-- #1386
 -- We do not want a warning about unused imports
 
 module Foo () where
diff --git a/testsuite/tests/rename/should_compile/rn062.hs b/testsuite/tests/rename/should_compile/rn062.hs
index dbb5493fb9..92fd480345 100644
--- a/testsuite/tests/rename/should_compile/rn062.hs
+++ b/testsuite/tests/rename/should_compile/rn062.hs
@@ -1,4 +1,4 @@
--- Trac #2055
+-- #2055
 
 module Foo where
 
diff --git a/testsuite/tests/rename/should_fail/T12146.hs b/testsuite/tests/rename/should_fail/T12146.hs
index e44be13f04..f9161606f3 100644
--- a/testsuite/tests/rename/should_fail/T12146.hs
+++ b/testsuite/tests/rename/should_fail/T12146.hs
@@ -1,4 +1,4 @@
--- Test Trac #12146
+-- Test #12146
 
 module T12146 where
 
diff --git a/testsuite/tests/rename/should_fail/T2490.hs b/testsuite/tests/rename/should_fail/T2490.hs
index 31afc0987a..052ee5c859 100644
--- a/testsuite/tests/rename/should_fail/T2490.hs
+++ b/testsuite/tests/rename/should_fail/T2490.hs
@@ -1,4 +1,4 @@
--- Trac #2490
+-- #2490
 module ShouldFail where
 
 -- All these sections are illegal
diff --git a/testsuite/tests/rename/should_fail/T2901.hs b/testsuite/tests/rename/should_fail/T2901.hs
index a703a5e53d..ca9730a0d1 100644
--- a/testsuite/tests/rename/should_fail/T2901.hs
+++ b/testsuite/tests/rename/should_fail/T2901.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE DisambiguateRecordFields #-}
--- Trac #2901
+-- #2901
 
 module T2901 where
 
diff --git a/testsuite/tests/rename/should_fail/T2993.hs b/testsuite/tests/rename/should_fail/T2993.hs
index d5de095461..f8c7488812 100644
--- a/testsuite/tests/rename/should_fail/T2993.hs
+++ b/testsuite/tests/rename/should_fail/T2993.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TypeOperators #-}
 
--- Trac #2993
+-- #2993
 
 module T2993 where
 
diff --git a/testsuite/tests/rename/should_fail/T3265.hs b/testsuite/tests/rename/should_fail/T3265.hs
index e938bbc34d..8e34fc2849 100644
--- a/testsuite/tests/rename/should_fail/T3265.hs
+++ b/testsuite/tests/rename/should_fail/T3265.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 
--- Test Trac #3265
+-- Test #3265
 
 module T3265 where
 
diff --git a/testsuite/tests/rename/should_fail/T4042.hs b/testsuite/tests/rename/should_fail/T4042.hs
index 6f920edd6e..fec8282788 100644
--- a/testsuite/tests/rename/should_fail/T4042.hs
+++ b/testsuite/tests/rename/should_fail/T4042.hs
@@ -1,4 +1,4 @@
--- Test Trac #4042
+-- Test #4042
 
 module T4042 where
 
diff --git a/testsuite/tests/rename/should_fail/rnfail048.hs b/testsuite/tests/rename/should_fail/rnfail048.hs
index d1c8d73eb0..9d1c4d4e0f 100644
--- a/testsuite/tests/rename/should_fail/rnfail048.hs
+++ b/testsuite/tests/rename/should_fail/rnfail048.hs
@@ -1,4 +1,4 @@
--- Trac #1888 
+-- #1888 
 -- Pretty printing for pragmas
 
 module ShouldFail where
diff --git a/testsuite/tests/rename/should_fail/rnfail052.hs b/testsuite/tests/rename/should_fail/rnfail052.hs
index 63a0dfd6d1..bffb7e0d96 100644
--- a/testsuite/tests/rename/should_fail/rnfail052.hs
+++ b/testsuite/tests/rename/should_fail/rnfail052.hs
@@ -1,5 +1,5 @@
 -- Error messages when you use 'forall' *without* the RankN flags
--- Test cases similar to Trac #2114
+-- Test cases similar to #2114
 
 module ShouldFail where
 
diff --git a/testsuite/tests/rename/should_fail/rnfail053.hs b/testsuite/tests/rename/should_fail/rnfail053.hs
index dbc219271b..1135f42b8a 100644
--- a/testsuite/tests/rename/should_fail/rnfail053.hs
+++ b/testsuite/tests/rename/should_fail/rnfail053.hs
@@ -1,4 +1,4 @@
--- Test Trac #2114 (error message)
+-- Test #2114 (error message)
 
 module ShouldFail where
 
diff --git a/testsuite/tests/rts/T10590.hs b/testsuite/tests/rts/T10590.hs
index 24198abb30..96309efff0 100644
--- a/testsuite/tests/rts/T10590.hs
+++ b/testsuite/tests/rts/T10590.hs
@@ -30,7 +30,7 @@ main = do
     yield -- kick RTS IO manager
 
 {-
- Trac #10590 exposed a bug as:
+ #10590 exposed a bug as:
    T10590: internal error: removeThreadFromDeQueue: not found
     (GHC version 7.11.20150702 for x86_64_unknown_linux)
     Please report this as a GHC bug:  http://www.haskell.org/ghc/reportabug
diff --git a/testsuite/tests/simplCore/T9646/readme.txt b/testsuite/tests/simplCore/T9646/readme.txt
index 3109c17b6d..3dd6b6fcba 100644
--- a/testsuite/tests/simplCore/T9646/readme.txt
+++ b/testsuite/tests/simplCore/T9646/readme.txt
@@ -1,4 +1,4 @@
-This is a test for https://ghc.haskell.org/trac/ghc/ticket/9646
+This is a test for https://gitlab.haskell.org/ghc/ghc/issues/9646
 
 The problem addressed in that ticket was that under some circumstances,
 GHC < 7.10.3 was failing to perform eta reduction deterministically.
diff --git a/testsuite/tests/simplCore/should_compile/Makefile b/testsuite/tests/simplCore/should_compile/Makefile
index e9f00a526f..edb74eed24 100644
--- a/testsuite/tests/simplCore/should_compile/Makefile
+++ b/testsuite/tests/simplCore/should_compile/Makefile
@@ -75,7 +75,7 @@ T3055:
 T5658b:
 	$(RM) -f T5658b.o T5658b.hi
 	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c T5658b.hs -ddump-simpl | grep -c indexIntArray
-# Trac 5658 meant that there were three calls to indexIntArray instead of two
+# #5658 meant that there were three calls to indexIntArray instead of two
 # (now four due to join-point discount causing W/W to stabilize unfolding)
 
 T5776:
@@ -255,4 +255,4 @@ T14140:
 T15631:
 	$(RM) -f T15631.o T15631.hi
 	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-uniques -dsuppress-ticks T15631.hs | grep 'case'
-# Expecting one fewwer case expressions after fixing Trac #15631
+# Expecting one fewwer case expressions after fixing #15631
diff --git a/testsuite/tests/simplCore/should_compile/T11562.hs b/testsuite/tests/simplCore/should_compile/T11562.hs
index e273f6002e..72093a7180 100644
--- a/testsuite/tests/simplCore/should_compile/T11562.hs
+++ b/testsuite/tests/simplCore/should_compile/T11562.hs
@@ -4,7 +4,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE NoImplicitPrelude #-}
 
--- Trac #11562 reported an ASSERT error
+-- #11562 reported an ASSERT error
 -- It only showed up /without/ -O, and obviously
 -- with a compiler built with -DDEBUG
 
diff --git a/testsuite/tests/simplCore/should_compile/T2520.hs b/testsuite/tests/simplCore/should_compile/T2520.hs
index f0115474ea..a081c42988 100644
--- a/testsuite/tests/simplCore/should_compile/T2520.hs
+++ b/testsuite/tests/simplCore/should_compile/T2520.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE GADTs #-}
 
--- Trac #2520: a bug in the specialiser when we tried to
+-- #2520: a bug in the specialiser when we tried to
 -- quantify over an Internal Name
 
 module Types where
diff --git a/testsuite/tests/simplCore/should_compile/T3016.hs b/testsuite/tests/simplCore/should_compile/T3016.hs
index bfe11a80a0..aeb43ad87e 100644
--- a/testsuite/tests/simplCore/should_compile/T3016.hs
+++ b/testsuite/tests/simplCore/should_compile/T3016.hs
@@ -1,9 +1,9 @@
--- Test Trac #3016.
+-- Test #3016.
 -- The issue here is whether it compiles in a reasonable time
 -- With GHC 6.10 it took hours!  After fixing the bug (which
 -- was too much inlining) it went down to 30s.
 
--- This also tests Trac #5652, a complexity issue with the LLVM
+-- This also tests #5652, a complexity issue with the LLVM
 -- backend for this module. Compile time down from 10 min to
 -- 12 seconds.
 
diff --git a/testsuite/tests/simplCore/should_compile/T3118.hs b/testsuite/tests/simplCore/should_compile/T3118.hs
index 8ee50b342a..4193e7db4c 100644
--- a/testsuite/tests/simplCore/should_compile/T3118.hs
+++ b/testsuite/tests/simplCore/should_compile/T3118.hs
@@ -1,4 +1,4 @@
--- Test Trac #3118
+-- Test #3118
 
 -- The test is quite delicate.  It aims to get 'f' to look like
 --   f y = case x of
diff --git a/testsuite/tests/simplCore/should_compile/T3234.hs b/testsuite/tests/simplCore/should_compile/T3234.hs
index 7969bf60fa..ce215ec4d7 100644
--- a/testsuite/tests/simplCore/should_compile/T3234.hs
+++ b/testsuite/tests/simplCore/should_compile/T3234.hs
@@ -1,4 +1,4 @@
--- Trac #3234
+-- #3234
 -- Should give a use of foldr/single
 
 module Foo where 
diff --git a/testsuite/tests/simplCore/should_compile/T4306.hs b/testsuite/tests/simplCore/should_compile/T4306.hs
index ba32981f61..548e132497 100644
--- a/testsuite/tests/simplCore/should_compile/T4306.hs
+++ b/testsuite/tests/simplCore/should_compile/T4306.hs
@@ -1,4 +1,4 @@
--- Trac #4306
+-- #4306
 -- Check that the worker for 'upd' has only one argument
 
 module T4306 where
diff --git a/testsuite/tests/simplCore/should_compile/T7702.hs b/testsuite/tests/simplCore/should_compile/T7702.hs
index 771ace0202..761463f381 100644
--- a/testsuite/tests/simplCore/should_compile/T7702.hs
+++ b/testsuite/tests/simplCore/should_compile/T7702.hs
@@ -1,6 +1,6 @@
 -- The contents of this file are irrelevant. It is merely
 -- the target for compilation by the T7702Plugin, which
--- exhibits the space leak in Trac #7702
+-- exhibits the space leak in #7702
 module Main where
 
 main :: IO ()
diff --git a/testsuite/tests/simplCore/should_compile/T7702plugin/T7702plugin.cabal b/testsuite/tests/simplCore/should_compile/T7702plugin/T7702plugin.cabal
index 953ba3c5d3..36be93149f 100644
--- a/testsuite/tests/simplCore/should_compile/T7702plugin/T7702plugin.cabal
+++ b/testsuite/tests/simplCore/should_compile/T7702plugin/T7702plugin.cabal
@@ -1,6 +1,6 @@
 Name:           T7702plugin
 Version:        0.1
-Synopsis:       Plugin which tests space leak fix in Trac #7702
+Synopsis:       Plugin which tests space leak fix in #7702
 Cabal-Version:  >= 1.2
 Build-Type:     Simple
 Author:         Andrew Farmer
diff --git a/testsuite/tests/simplCore/should_compile/rule1.hs b/testsuite/tests/simplCore/should_compile/rule1.hs
index 6894f827c9..47b21c9681 100644
--- a/testsuite/tests/simplCore/should_compile/rule1.hs
+++ b/testsuite/tests/simplCore/should_compile/rule1.hs
@@ -1,5 +1,5 @@
 
--- This one triggers the bug reported in Trac #1092
+-- This one triggers the bug reported in #1092
 -- The problem is that the rule
 --      forall w. f (\v->w) = w
 -- erroneously matches the call
diff --git a/testsuite/tests/simplCore/should_compile/simpl-T1370.hs b/testsuite/tests/simplCore/should_compile/simpl-T1370.hs
index 7524f13bac..a0a75e0dee 100644
--- a/testsuite/tests/simplCore/should_compile/simpl-T1370.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl-T1370.hs
@@ -1,5 +1,5 @@
 
--- See Trac #1370
+-- See #1370
 -- THis made GHC 6.6 diverge!
 
 module ShouldCompile where
diff --git a/testsuite/tests/simplCore/should_compile/simpl014.hs b/testsuite/tests/simplCore/should_compile/simpl014.hs
index 4e03b401a8..34aba15a95 100644
--- a/testsuite/tests/simplCore/should_compile/simpl014.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl014.hs
@@ -4,7 +4,7 @@
 
 -- This one make SpecConstr generate bogus code (hence -O2),
 -- with a lint error, in GHC 6.4.1
--- C.f. http://ghc.haskell.org/trac/ghc/ticket/737
+-- C.f. https://gitlab.haskell.org/ghc/ghc/issues/737
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/simplCore/should_compile/simpl017.hs b/testsuite/tests/simplCore/should_compile/simpl017.hs
index ecb48cce14..9a9da06263 100644
--- a/testsuite/tests/simplCore/should_compile/simpl017.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl017.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS -XImpredicativeTypes -fno-warn-deprecated-flags -XEmptyDataDecls -XGADTs -XLiberalTypeSynonyms -XFlexibleInstances -XScopedTypeVariables #-}
 
--- See Trac #1627.  The point is that we should get nice
+-- See #1627.  The point is that we should get nice
 --                  compact code for Foo
 
 -- In GHC 7.0 this fails, and rightly so.
diff --git a/testsuite/tests/simplCore/should_compile/simpl018.hs b/testsuite/tests/simplCore/should_compile/simpl018.hs
index a4cb6a80b8..613c612c25 100644
--- a/testsuite/tests/simplCore/should_compile/simpl018.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl018.hs
@@ -3,7 +3,7 @@
 -- See Note [Float coercions (unlifted)] in Simplify
 -- This one gave a CoreLint error when compiled optimised
 --
--- See also Trac #1718, of which this is a simplified version
+-- See also #1718, of which this is a simplified version
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/simplCore/should_compile/simpl019.hs b/testsuite/tests/simplCore/should_compile/simpl019.hs
index 66b8fc4764..cdac0cfaf2 100644
--- a/testsuite/tests/simplCore/should_compile/simpl019.hs
+++ b/testsuite/tests/simplCore/should_compile/simpl019.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE GADTs, FlexibleInstances #-}
 {-# OPTIONS_GHC -O2 #-}
 
--- See Trac #1746
+-- See #1746
 
 module Foo where
 
diff --git a/testsuite/tests/simplCore/should_compile/spec003.hs b/testsuite/tests/simplCore/should_compile/spec003.hs
index 5ea6d33283..15f6bd7b20 100644
--- a/testsuite/tests/simplCore/should_compile/spec003.hs
+++ b/testsuite/tests/simplCore/should_compile/spec003.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
 
--- Trac #1402
+-- #1402
 -- Broke the specialiser
 
 module ShouldCompile where
diff --git a/testsuite/tests/simplCore/should_run/T13429_2.hs b/testsuite/tests/simplCore/should_run/T13429_2.hs
index 45b3e9c34d..585c059250 100644
--- a/testsuite/tests/simplCore/should_run/T13429_2.hs
+++ b/testsuite/tests/simplCore/should_run/T13429_2.hs
@@ -1,4 +1,4 @@
--- This one come from lehins, between comment:22 and 23 of Trac #13429
+-- This one come from lehins, between comment:22 and 23 of #13429
 module Main where
 
 import T13429_2a as Array
diff --git a/testsuite/tests/simplCore/should_run/T2486.hs b/testsuite/tests/simplCore/should_run/T2486.hs
index 2f5df48532..a6d5112d7b 100644
--- a/testsuite/tests/simplCore/should_run/T2486.hs
+++ b/testsuite/tests/simplCore/should_run/T2486.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -O -ddump-rules #-}
 
--- Trac #2486
+-- #2486
 --
 -- The thing to look for here is that specialisations for fib and tak 
 -- at both Int and Double are indeed generated; hence -ddump-rules
diff --git a/testsuite/tests/simplCore/should_run/T3403.hs b/testsuite/tests/simplCore/should_run/T3403.hs
index 276aae88b2..21c30f2d33 100644
--- a/testsuite/tests/simplCore/should_run/T3403.hs
+++ b/testsuite/tests/simplCore/should_run/T3403.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE BangPatterns #-}
 
 
--- See Trac #3403: interaction of pattern match failure and CPR
+-- See #3403: interaction of pattern match failure and CPR
 -- The point is that this should run in constant space, with no
 -- stack growth.  In GHC 6.10 the tail call optimisation didn't work.
 
diff --git a/testsuite/tests/simplCore/should_run/T3437.hs b/testsuite/tests/simplCore/should_run/T3437.hs
index 9ef6ee8b82..6875bebd55 100644
--- a/testsuite/tests/simplCore/should_run/T3437.hs
+++ b/testsuite/tests/simplCore/should_run/T3437.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE BangPatterns #-}
 {-# OPTIONS_GHC -O2 #-}
 
--- Trac #3437
+-- #3437
 -- When we do SpecConstr on 'go', we want the specialised
 -- function to *still* be strict in k.  Otherwise we get
 -- a bad space leak!
diff --git a/testsuite/tests/simplCore/should_run/T5587.hs b/testsuite/tests/simplCore/should_run/T5587.hs
index 4909154dab..8dc74604e3 100644
--- a/testsuite/tests/simplCore/should_run/T5587.hs
+++ b/testsuite/tests/simplCore/should_run/T5587.hs
@@ -8,7 +8,7 @@ hiddenError = error "hidden error"
 
 main = print $ seq (head (map (\a -> \b -> hiddenError) (hiddenError::[] Bool))) id [1]
 
-{-  See notes in Trac #5587
+{-  See notes in #5587
 f a b =  a
 he = hiddenError::[Bool]
 main = print $ seq (head (map f he)) id [1]
diff --git a/testsuite/tests/simplCore/should_run/T9128.hs b/testsuite/tests/simplCore/should_run/T9128.hs
index 73aa39b31b..cccda53c41 100644
--- a/testsuite/tests/simplCore/should_run/T9128.hs
+++ b/testsuite/tests/simplCore/should_run/T9128.hs
@@ -2,7 +2,7 @@ module Main where
 
 newtype T a = MkT a
 
--- Trac #9128: we treated x as absent!!!!
+-- #9128: we treated x as absent!!!!
 
 f x = let {-# NOINLINE h #-}
           h = case x of MkT g -> g
diff --git a/testsuite/tests/stage1/T2632.hs b/testsuite/tests/stage1/T2632.hs
index 71f6350cc2..64349c926d 100644
--- a/testsuite/tests/stage1/T2632.hs
+++ b/testsuite/tests/stage1/T2632.hs
@@ -1,4 +1,4 @@
--- Trac #2632
+-- #2632
 
 module MkData where
 
diff --git a/testsuite/tests/stranal/should_compile/T10482a.hs b/testsuite/tests/stranal/should_compile/T10482a.hs
index e633ebe6b7..2f5a0e0665 100644
--- a/testsuite/tests/stranal/should_compile/T10482a.hs
+++ b/testsuite/tests/stranal/should_compile/T10482a.hs
@@ -2,7 +2,7 @@
 {-# OPTIONS_GHC -fno-unbox-small-strict-fields #-}
                 -- Makes f2 a bit more challenging
 
--- Tests inspired by Note [CPR examples] in DmdAnal, and Trac #10482
+-- Tests inspired by Note [CPR examples] in DmdAnal, and #10482
 
 module Foo where
 
diff --git a/testsuite/tests/stranal/should_compile/T1988.hs b/testsuite/tests/stranal/should_compile/T1988.hs
index a27fdd8da5..c6c498b710 100644
--- a/testsuite/tests/stranal/should_compile/T1988.hs
+++ b/testsuite/tests/stranal/should_compile/T1988.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -O2 #-}
 
--- Trac #1988: this one killed GHC 6.8.2
+-- #1988: this one killed GHC 6.8.2
 --              at least with -O2
 
 module ShouldCompile where
diff --git a/testsuite/tests/stranal/should_compile/T9208.hs b/testsuite/tests/stranal/should_compile/T9208.hs
index 5243445c96..2a4f5b40ad 100644
--- a/testsuite/tests/stranal/should_compile/T9208.hs
+++ b/testsuite/tests/stranal/should_compile/T9208.hs
@@ -7,7 +7,7 @@
 -- and unsafe-coerces it to a function, and applies it.
 -- This is caught by an ASSERT with a debug compiler.
 --
--- See Trac #9208 for discussion
+-- See #9208 for discussion
 --
 --------------------------------------------
 
diff --git a/testsuite/tests/stranal/should_compile/all.T b/testsuite/tests/stranal/should_compile/all.T
index 3cff3c7888..970417e11c 100644
--- a/testsuite/tests/stranal/should_compile/all.T
+++ b/testsuite/tests/stranal/should_compile/all.T
@@ -23,7 +23,7 @@ test('T8743', [], multimod_compile, ['T8743', '-v0'])
 # T10482
 #   The intent here is to check that $wfoo has type
 #         $wfoo :: Int# -> Int# -> Int
-#   with two unboxed args.  See Trac #10482 for background
+#   with two unboxed args.  See #10482 for background
 #
 # Set -dppr-cols to ensure output doesn't wrap
 test('T10482',  [ grep_errmsg(r'wfoo.*Int#') ], compile, ['-dppr-cols=200 -ddump-simpl'])
@@ -31,7 +31,7 @@ test('T10482a', [ grep_errmsg(r'wf.*Int#') ],   compile, ['-dppr-cols=200 -ddump
 
 test('T9208', when(compiler_debugged(), expect_broken(9208)), compile, [''])
 # T9208 fails (and should do so) if you have assertion checking on in the compiler
-# Hence the above expect_broken.  See comments in the Trac ticket
+# Hence the above expect_broken.  See comments in the ticket
 
 test('T10694', [ grep_errmsg(r'Str=') ],   compile, ['-dppr-cols=200 -ddump-simpl'])
 test('T11770', [ check_errmsg('OneShot') ], compile, ['-ddump-simpl'])
diff --git a/testsuite/tests/stranal/should_run/T11555a.hs b/testsuite/tests/stranal/should_run/T11555a.hs
index 29f2a49680..fc2e8b83ba 100644
--- a/testsuite/tests/stranal/should_run/T11555a.hs
+++ b/testsuite/tests/stranal/should_run/T11555a.hs
@@ -8,7 +8,7 @@ import GHC.Exts
 
 type RAW a = ContT () IO a
 
--- See https://ghc.haskell.org/trac/ghc/ticket/11555
+-- See https://gitlab.haskell.org/ghc/ghc/issues/11555
 catchSafe1, catchSafe2 :: IO a -> (SomeException -> IO a) -> IO a
 catchSafe1 a b = lazy a `catch` b
 catchSafe2 a b = join (evaluate a) `catch` b
diff --git a/testsuite/tests/th/Makefile b/testsuite/tests/th/Makefile
index 87a6738160..2962327c3f 100644
--- a/testsuite/tests/th/Makefile
+++ b/testsuite/tests/th/Makefile
@@ -2,8 +2,8 @@ TOP=../..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/test.mk
 
-# Trac 2386 requires batch-compile not --make
-# Very important: without -O 
+# #2386 requires batch-compile not --make
+# Very important: without -O
 T2386:
 	'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -v0 -c T2386_Lib.hs
 	'$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) -v0 -c T2386.hs
diff --git a/testsuite/tests/th/T11629.hs b/testsuite/tests/th/T11629.hs
index b22365fe60..4fcc093823 100644
--- a/testsuite/tests/th/T11629.hs
+++ b/testsuite/tests/th/T11629.hs
@@ -50,7 +50,7 @@ do
   let [ty3', ty4'] = map (withoutSig . getType) insts
 
   when (ty3 /= ty3') $ failMsg "C" ty3 ty3'
-  -- The following won't work. See https://ghc.haskell.org/trac/ghc/ticket/12853
+  -- The following won't work. See https://gitlab.haskell.org/ghc/ghc/issues/12853
   -- when (ty4 /= ty4') $ failMsg "D" ty4 ty4'
 
   -- test #3: type quotations and reified types should agree wrt to
diff --git a/testsuite/tests/th/T2386.hs b/testsuite/tests/th/T2386.hs
index b7a03469cf..a52df28513 100644
--- a/testsuite/tests/th/T2386.hs
+++ b/testsuite/tests/th/T2386.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TemplateHaskell #-}
 
--- Test Trac #2386
+-- Test #2386
 
 module T2386 where
 
diff --git a/testsuite/tests/th/T2597a.hs b/testsuite/tests/th/T2597a.hs
index d403723e43..b279f04bb2 100644
--- a/testsuite/tests/th/T2597a.hs
+++ b/testsuite/tests/th/T2597a.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TemplateHaskell #-}
 
--- Test Trac #2597 (first bug)
+-- Test #2597 (first bug)
 
 module ShouldCompile where
 import T2597a_Lib
diff --git a/testsuite/tests/th/T2597b.hs b/testsuite/tests/th/T2597b.hs
index 0e1551ea22..ac04207436 100644
--- a/testsuite/tests/th/T2597b.hs
+++ b/testsuite/tests/th/T2597b.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TemplateHaskell #-}
 
--- Test Trac #2597 (second bug)
+-- Test #2597 (second bug)
 
 module ShouldCompile where
 import T2597b_Lib
diff --git a/testsuite/tests/th/T2674.hs b/testsuite/tests/th/T2674.hs
index 3413193343..7687bad4da 100644
--- a/testsuite/tests/th/T2674.hs
+++ b/testsuite/tests/th/T2674.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TemplateHaskell #-}
 
--- Trac #2674
+-- #2674
 
 module ShouldFail where
 
diff --git a/testsuite/tests/th/T3100.hs b/testsuite/tests/th/T3100.hs
index 40adf6a7b6..0f211e3b13 100644
--- a/testsuite/tests/th/T3100.hs
+++ b/testsuite/tests/th/T3100.hs
@@ -5,7 +5,7 @@
 -- there is a predicate but no 'forall'
 --
 -- There are two tests in here; both should be fine
--- Trac ticket: #3100
+-- Ticket: #3100
 
 module T3100 where
 
diff --git a/testsuite/tests/th/T3467.hs b/testsuite/tests/th/T3467.hs
index cf495b9673..f2c72c46a4 100644
--- a/testsuite/tests/th/T3467.hs
+++ b/testsuite/tests/th/T3467.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TemplateHaskell #-}
 
--- Test Trac #3467
+-- Test #3467
 
 module T3467 where
 
diff --git a/testsuite/tests/th/TH_1tuple.hs b/testsuite/tests/th/TH_1tuple.hs
index ea1a1195ab..c1314b0bb9 100644
--- a/testsuite/tests/th/TH_1tuple.hs
+++ b/testsuite/tests/th/TH_1tuple.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TemplateHaskell #-}
 
--- Trac #2358
+-- #2358
 
 module ShouldFail where
 import Language.Haskell.TH
diff --git a/testsuite/tests/th/TH_emptycase.hs b/testsuite/tests/th/TH_emptycase.hs
index fc75cfe5b0..cf947d827d 100644
--- a/testsuite/tests/th/TH_emptycase.hs
+++ b/testsuite/tests/th/TH_emptycase.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE TemplateHaskell, EmptyCase #-}
--- Trac #2431: empty case expression
+-- #2431: empty case expression
 --             now accepted
 
 module Main where
diff --git a/testsuite/tests/th/TH_reifyMkName.hs b/testsuite/tests/th/TH_reifyMkName.hs
index 7c4d7196e0..5fed9b44f2 100644
--- a/testsuite/tests/th/TH_reifyMkName.hs
+++ b/testsuite/tests/th/TH_reifyMkName.hs
@@ -1,4 +1,4 @@
--- Trac #2339
+-- #2339
 
 module Foo where
 
diff --git a/testsuite/tests/th/TH_runIO.hs b/testsuite/tests/th/TH_runIO.hs
index 7a1f4c3d70..9d9b485113 100644
--- a/testsuite/tests/th/TH_runIO.hs
+++ b/testsuite/tests/th/TH_runIO.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TemplateHaskell #-}
 
--- See Trac #1678
+-- See #1678
 
 module TH where 
 
diff --git a/testsuite/tests/th/TH_spliceGuard.hs b/testsuite/tests/th/TH_spliceGuard.hs
index 4c220e85b5..c349150c20 100644
--- a/testsuite/tests/th/TH_spliceGuard.hs
+++ b/testsuite/tests/th/TH_spliceGuard.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -XTemplateHaskell #-}
 
--- Trac #2017
+-- #2017
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/typecheck/should_compile/FD1.hs b/testsuite/tests/typecheck/should_compile/FD1.hs
index 0c8942ad95..ef458e1ff5 100644
--- a/testsuite/tests/typecheck/should_compile/FD1.hs
+++ b/testsuite/tests/typecheck/should_compile/FD1.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies #-}
 {-# LANGUAGE FlexibleInstances, FlexibleContexts #-}
 
--- Trac #1781
+-- #1781
 -- This one should really succeed, because 'plus' can only
 -- be called with a = Int->Int, but the old fundep story
 -- certainly made it fail, and so that's what we expect for now
diff --git a/testsuite/tests/typecheck/should_compile/FD2.hs b/testsuite/tests/typecheck/should_compile/FD2.hs
index 571d2daece..f8732c846d 100644
--- a/testsuite/tests/typecheck/should_compile/FD2.hs
+++ b/testsuite/tests/typecheck/should_compile/FD2.hs
@@ -1,8 +1,8 @@
 {-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies #-}
 {-# LANGUAGE ScopedTypeVariables, FlexibleContexts #-}
 
--- Trac #1783
--- Like Trac #1781 you could argue that this one should succeed
+-- #1783
+-- Like #1781 you could argue that this one should succeed
 -- but we stick with the old behaviour for now.  When we do
 -- fundeps properly it'll probably start to work
 
diff --git a/testsuite/tests/typecheck/should_compile/FD3.hs b/testsuite/tests/typecheck/should_compile/FD3.hs
index a2f7d003a7..475e379c10 100644
--- a/testsuite/tests/typecheck/should_compile/FD3.hs
+++ b/testsuite/tests/typecheck/should_compile/FD3.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleInstances #-}
 
--- Trac #1795
+-- #1795
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/typecheck/should_compile/FD4.hs b/testsuite/tests/typecheck/should_compile/FD4.hs
index 51650324ca..88444772ec 100644
--- a/testsuite/tests/typecheck/should_compile/FD4.hs
+++ b/testsuite/tests/typecheck/should_compile/FD4.hs
@@ -5,7 +5,7 @@
     FlexibleInstances,
     EmptyDataDecls #-}
 
--- Trac #1797
+-- #1797
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/typecheck/should_compile/Makefile b/testsuite/tests/typecheck/should_compile/Makefile
index ac18b2f4b3..5255485601 100644
--- a/testsuite/tests/typecheck/should_compile/Makefile
+++ b/testsuite/tests/typecheck/should_compile/Makefile
@@ -32,7 +32,7 @@ tc245:
 	$(RM) -f tc245.hi tc245.o
 	'$(TEST_HC)' $(TEST_HC_OPTS) --make tc245
 
-# Trac #5792 gave an error on the second compilation,
+# #5792 gave an error on the second compilation,
 # presumably because of the .hi file
 T5792:
 	$(RM) -f T5792.o T5792.hi
diff --git a/testsuite/tests/typecheck/should_compile/T12734a.hs b/testsuite/tests/typecheck/should_compile/T12734a.hs
index 5f1da8b818..d535300994 100644
--- a/testsuite/tests/typecheck/should_compile/T12734a.hs
+++ b/testsuite/tests/typecheck/should_compile/T12734a.hs
@@ -78,7 +78,7 @@ test_ghc_err = test_gr @(KT A '[Ty] IO)
                        @(Expr Net '[Ty])
 -}
 
-{-  Some notes.  See comment:10 on Trac #12734
+{-  Some notes.  See comment:10 on #12734
 
 [W] Con m (TStk t lrs)
 [W] Inferable A lrs m
diff --git a/testsuite/tests/typecheck/should_compile/T13651.hs b/testsuite/tests/typecheck/should_compile/T13651.hs
index 63bd88eb5c..57e627aa71 100644
--- a/testsuite/tests/typecheck/should_compile/T13651.hs
+++ b/testsuite/tests/typecheck/should_compile/T13651.hs
@@ -14,7 +14,7 @@ foo :: (F cr cu ~ Bar h (Bar r u),
 foo = undefined
 
 {-  Typechecking this program used to /just/ succeed in GHC 8.2,
-    (see Trac #14745 for why), but doesn't in 8.4.
+    (see #14745 for why), but doesn't in 8.4.
 
 [G]  F cr cu ~ Bar h (Bar r u),
      F cu cs ~ Bar (Foo h) (Bar u s))
diff --git a/testsuite/tests/typecheck/should_compile/T1470.hs b/testsuite/tests/typecheck/should_compile/T1470.hs
index b8009f2bc3..c19a520bf4 100644
--- a/testsuite/tests/typecheck/should_compile/T1470.hs
+++ b/testsuite/tests/typecheck/should_compile/T1470.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
 {-# LANGUAGE MultiParamTypeClasses, FlexibleContexts, FlexibleInstances, UndecidableInstances, KindSignatures #-}
 
--- Trac #1470
+-- #1470
 
 module Foo where
 
diff --git a/testsuite/tests/typecheck/should_compile/T1495.hs b/testsuite/tests/typecheck/should_compile/T1495.hs
index 0de4e456de..7865ee6543 100644
--- a/testsuite/tests/typecheck/should_compile/T1495.hs
+++ b/testsuite/tests/typecheck/should_compile/T1495.hs
@@ -1,4 +1,4 @@
--- Test Trac #1495
+-- Test #1495
 
 module CompilerBug where
 
diff --git a/testsuite/tests/typecheck/should_compile/T2045.hs b/testsuite/tests/typecheck/should_compile/T2045.hs
index 78b924a6ea..00e17edfa2 100644
--- a/testsuite/tests/typecheck/should_compile/T2045.hs
+++ b/testsuite/tests/typecheck/should_compile/T2045.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE EmptyDataDecls #-}
 {-# OPTIONS_GHC -fno-warn-type-defaults #-}
 
--- Trac #2045
+-- #2045
 -- ghc -fhpc --make Vhdl.hs -o gencirc -Wall
 
 module ShouleCompile where
diff --git a/testsuite/tests/typecheck/should_compile/T2433.hs b/testsuite/tests/typecheck/should_compile/T2433.hs
index 727ec6bb9b..e916e91b07 100644
--- a/testsuite/tests/typecheck/should_compile/T2433.hs
+++ b/testsuite/tests/typecheck/should_compile/T2433.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 
--- Test Trac #2433
+-- Test #2433
 
 module T2433 where
 
diff --git a/testsuite/tests/typecheck/should_compile/T2494-2.hs b/testsuite/tests/typecheck/should_compile/T2494-2.hs
index 543f8f47fe..094cd10fb6 100644
--- a/testsuite/tests/typecheck/should_compile/T2494-2.hs
+++ b/testsuite/tests/typecheck/should_compile/T2494-2.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
--- Trac #2494, should compile ok
+-- #2494, should compile ok
 
 module Foo where
 
diff --git a/testsuite/tests/typecheck/should_compile/T2494.hs b/testsuite/tests/typecheck/should_compile/T2494.hs
index 3e6c09c39c..cbcc5352b0 100644
--- a/testsuite/tests/typecheck/should_compile/T2494.hs
+++ b/testsuite/tests/typecheck/should_compile/T2494.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
--- Trac #2494, should generate an error message
+-- #2494, should generate an error message
 
 module Foo where
 
diff --git a/testsuite/tests/typecheck/should_compile/T2497.hs b/testsuite/tests/typecheck/should_compile/T2497.hs
index 55c390dbed..12abe8e798 100644
--- a/testsuite/tests/typecheck/should_compile/T2497.hs
+++ b/testsuite/tests/typecheck/should_compile/T2497.hs
@@ -5,13 +5,13 @@ module ShouldCompile() where
 foo x = x
 {-# NOINLINE [1] foo #-}
 
--- Trac #2497; test should compile without language
+-- #2497; test should compile without language
 --             pragmas to switch on the forall
 {-# RULES "id" forall (x :: a). foo x = x #-}
 
 
 
--- Trac #2213; eq should not be reported as unused
+-- #2213; eq should not be reported as unused
 
 eq,beq :: Eq a => a -> a -> Bool
 {-# NOINLINE [0] eq #-}
diff --git a/testsuite/tests/typecheck/should_compile/T2572.hs b/testsuite/tests/typecheck/should_compile/T2572.hs
index 0360749c2c..7856890f06 100644
--- a/testsuite/tests/typecheck/should_compile/T2572.hs
+++ b/testsuite/tests/typecheck/should_compile/T2572.hs
@@ -1,6 +1,6 @@
  {-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 
--- Trac #2572
+-- #2572
 
 module Foo where
 
diff --git a/testsuite/tests/typecheck/should_compile/T2735.hs b/testsuite/tests/typecheck/should_compile/T2735.hs
index 81deb7dda4..f9bc784a7b 100644
--- a/testsuite/tests/typecheck/should_compile/T2735.hs
+++ b/testsuite/tests/typecheck/should_compile/T2735.hs
@@ -1,4 +1,4 @@
--- Trac #2735
+-- #2735
 
 module Bug where
 
diff --git a/testsuite/tests/typecheck/should_compile/T3018.hs b/testsuite/tests/typecheck/should_compile/T3018.hs
index f584f1bacc..77b656af17 100644
--- a/testsuite/tests/typecheck/should_compile/T3018.hs
+++ b/testsuite/tests/typecheck/should_compile/T3018.hs
@@ -48,7 +48,7 @@ instance Data (SubstD_B a t) t' => Subst_B a t t' where
     subst_B = undefined
 
 
-{- Commentary from Trac #3018
+{- Commentary from #3018
 
 Here are the key lines of code:
 
diff --git a/testsuite/tests/typecheck/should_compile/T3219.hs b/testsuite/tests/typecheck/should_compile/T3219.hs
index 5c23c1727d..52182c6d3b 100644
--- a/testsuite/tests/typecheck/should_compile/T3219.hs
+++ b/testsuite/tests/typecheck/should_compile/T3219.hs
@@ -1,4 +1,4 @@
--- Trac #3219.  Lint error in GHC 6.10
+-- #3219.  Lint error in GHC 6.10
 
 module T3219 where
 
diff --git a/testsuite/tests/typecheck/should_compile/T3346.hs b/testsuite/tests/typecheck/should_compile/T3346.hs
index c163cecd09..30b49f731d 100644
--- a/testsuite/tests/typecheck/should_compile/T3346.hs
+++ b/testsuite/tests/typecheck/should_compile/T3346.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TypeFamilies  #-}
 
--- Trac #3346
+-- #3346
 
 module Foo where
 
diff --git a/testsuite/tests/typecheck/should_compile/T3391.hs b/testsuite/tests/typecheck/should_compile/T3391.hs
index eb569366b5..f773af32ac 100644
--- a/testsuite/tests/typecheck/should_compile/T3391.hs
+++ b/testsuite/tests/typecheck/should_compile/T3391.hs
@@ -3,7 +3,7 @@
 
 -- We should only generate one set of generic to/from functions
 -- for T, despite the multiple chunks caused by the TH splices
--- See Trac #3391
+-- See #3391
 
 module T3391 where
 
diff --git a/testsuite/tests/typecheck/should_compile/T3955.hs b/testsuite/tests/typecheck/should_compile/T3955.hs
index 220c4e7c25..dc594c1b7b 100644
--- a/testsuite/tests/typecheck/should_compile/T3955.hs
+++ b/testsuite/tests/typecheck/should_compile/T3955.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE MultiParamTypeClasses, FlexibleInstances #-}
 
--- Test for Trac #3955
+-- Test for #3955
 
 module T3955 where
 
diff --git a/testsuite/tests/typecheck/should_compile/T9708.hs b/testsuite/tests/typecheck/should_compile/T9708.hs
index 38788574fc..e87b8e8094 100644
--- a/testsuite/tests/typecheck/should_compile/T9708.hs
+++ b/testsuite/tests/typecheck/should_compile/T9708.hs
@@ -7,7 +7,7 @@ import Data.Proxy
 
 type family SomeFun (n :: Nat)
 
--- See the Trac ticket; whether this succeeds or fails is distinctly random
+-- See the ticket; whether this succeeds or fails is distinctly random
 
 -- upon creation, commit f861fc6ad8e5504a4fecfc9bb0945fe2d313687c, this failed
 
diff --git a/testsuite/tests/typecheck/should_compile/T9971.hs b/testsuite/tests/typecheck/should_compile/T9971.hs
index e02b21e398..57f8d3bc5b 100644
--- a/testsuite/tests/typecheck/should_compile/T9971.hs
+++ b/testsuite/tests/typecheck/should_compile/T9971.hs
@@ -11,5 +11,5 @@ foo = error "urk"
 
 bar x = [op foo, op foo]
  -- This gives rise to a [D] Vertex a1 ~ Vertex a2
- -- And that made the canonicaliser go into a loop (Trac #9971)
+ -- And that made the canonicaliser go into a loop (#9971)
 
diff --git a/testsuite/tests/typecheck/should_compile/T9973.hs b/testsuite/tests/typecheck/should_compile/T9973.hs
index 1a2148f4fa..4639a6c768 100644
--- a/testsuite/tests/typecheck/should_compile/T9973.hs
+++ b/testsuite/tests/typecheck/should_compile/T9973.hs
@@ -3,7 +3,7 @@
 module T9973 where
 
 duplicateDecl :: (Eq t) => t -> IO ()
--- Trac #9973 was a bogus "redundant constraint" here
+-- #9973 was a bogus "redundant constraint" here
 duplicateDecl sigs
  = do { newSpan <- return typeSig
 
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index 81a63c594f..9d8f905bf3 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -368,7 +368,7 @@ test('PolytypeDecomp', normal, compile, [''])
 test('T6011', normal, compile, [''])
 test('T6055', normal, compile, [''])
 test('DfltProb1', normal, compile, ['-O'])
-# Add -O for DfltProb1 to expose Trac #11291
+# Add -O for DfltProb1 to expose #11291
 test('DfltProb2', normal, compile, [''])
 test('T6134', normal, compile, [''])
 test('T6018', [], multimod_compile, ['T6018', ''])
diff --git a/testsuite/tests/typecheck/should_compile/syn-perf2.hs b/testsuite/tests/typecheck/should_compile/syn-perf2.hs
index 7a07bfa643..6f9a9430ae 100644
--- a/testsuite/tests/typecheck/should_compile/syn-perf2.hs
+++ b/testsuite/tests/typecheck/should_compile/syn-perf2.hs
@@ -1,5 +1,5 @@
 -- Another type-synonym performance test
---      (Trac 323)
+--      (#323)
 -- Fails in GHC up to 6.6
 
 module ShouldCompile where
diff --git a/testsuite/tests/typecheck/should_compile/tc208.hs b/testsuite/tests/typecheck/should_compile/tc208.hs
index 6fad1b21f4..8d9bb3636e 100644
--- a/testsuite/tests/typecheck/should_compile/tc208.hs
+++ b/testsuite/tests/typecheck/should_compile/tc208.hs
@@ -4,11 +4,11 @@
 -- This program failed to typecheck in an early version of
 -- GHC with impredicative polymorphism, but it was fixed by
 -- doing pre-subsumption in the subsumption check.
--- Trac bug #821
+-- bug #821
 
 module ShouldCompile where
 
 type PPDoc = (?env :: Int) => Char
 
 f :: Char -> PPDoc
-f  = succ 
+f  = succ
diff --git a/testsuite/tests/typecheck/should_compile/tc217.hs b/testsuite/tests/typecheck/should_compile/tc217.hs
index c42c1eb33b..9835da8df1 100644
--- a/testsuite/tests/typecheck/should_compile/tc217.hs
+++ b/testsuite/tests/typecheck/should_compile/tc217.hs
@@ -12,9 +12,9 @@ instance Eq (a -> b) where
 instance Show (a -> b) where
      show = const "<fun>"
 
--- This is the example from Trac #179
+-- This is the example from #179
 foo x = show (\_ -> True)
 
--- This is the example from Trac #963
+-- This is the example from #963
 instance (Num a, Monad m, Eq (m a), Show (m a)) => Num (m a) where
 test = 1 True
diff --git a/testsuite/tests/typecheck/should_compile/tc220.hs b/testsuite/tests/typecheck/should_compile/tc220.hs
index f9f5443bc0..7c87742ba6 100644
--- a/testsuite/tests/typecheck/should_compile/tc220.hs
+++ b/testsuite/tests/typecheck/should_compile/tc220.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE DeriveDataTypeable #-}
 
--- See Trac #1033
+-- See #1033
 
 module Pointful' where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc226.hs b/testsuite/tests/typecheck/should_compile/tc226.hs
index d9c94c2c43..fa67a4525f 100644
--- a/testsuite/tests/typecheck/should_compile/tc226.hs
+++ b/testsuite/tests/typecheck/should_compile/tc226.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -O -funbox-strict-fields #-}
 
 -- The combination of unboxing and a recursive newtype crashed GHC 6.6.1
--- Trac #1255
+-- #1255
 -- Use -O to force the unboxing to happen
 
 module Foo where
diff --git a/testsuite/tests/typecheck/should_compile/tc227.hs b/testsuite/tests/typecheck/should_compile/tc227.hs
index 5a4736eccc..cf439cf49f 100644
--- a/testsuite/tests/typecheck/should_compile/tc227.hs
+++ b/testsuite/tests/typecheck/should_compile/tc227.hs
@@ -1,5 +1,5 @@
 -- Ensure that tuple instances are brought into scope
--- See Trac #1385
+-- See #1385
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc228.hs b/testsuite/tests/typecheck/should_compile/tc228.hs
index a3d1c2f464..7989674847 100644
--- a/testsuite/tests/typecheck/should_compile/tc228.hs
+++ b/testsuite/tests/typecheck/should_compile/tc228.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE ExistentialQuantification #-}
 
 -- Without a type sig this is slightly tricky.
--- See Trac #1430
+-- See #1430
 
 -- Reason: we get an implication constraint (forall a. Typeable a => Typeable b),
 -- when generalising unExTypeable.  We want to infer a context for the 
diff --git a/testsuite/tests/typecheck/should_compile/tc230.hs b/testsuite/tests/typecheck/should_compile/tc230.hs
index 0371ec904f..f6bd86e892 100644
--- a/testsuite/tests/typecheck/should_compile/tc230.hs
+++ b/testsuite/tests/typecheck/should_compile/tc230.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
 {-# LANGUAGE ImplicitParams, RankNTypes #-}
 
--- Trac #1445
+-- #1445
 
 module Bug where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc231.hs b/testsuite/tests/typecheck/should_compile/tc231.hs
index 1c00294009..9d0fc8316b 100644
--- a/testsuite/tests/typecheck/should_compile/tc231.hs
+++ b/testsuite/tests/typecheck/should_compile/tc231.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -ddump-types -dsuppress-module-prefixes #-}
 {-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleContexts #-}
 
--- See Trac #1456
+-- See #1456
 
 -- The key thing here is that foo should get the type
 --     foo :: forall b s t1. (Zork s (Z [Char]) b)
diff --git a/testsuite/tests/typecheck/should_compile/tc232.hs b/testsuite/tests/typecheck/should_compile/tc232.hs
index 2fc8544ab3..0f3294cac7 100644
--- a/testsuite/tests/typecheck/should_compile/tc232.hs
+++ b/testsuite/tests/typecheck/should_compile/tc232.hs
@@ -2,7 +2,7 @@
 {-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
 
 -- This one fixed the constraint solver (Lint error)
--- See Trac #1494
+-- See #1494
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc235.hs b/testsuite/tests/typecheck/should_compile/tc235.hs
index 39bda75168..57381fabea 100644
--- a/testsuite/tests/typecheck/should_compile/tc235.hs
+++ b/testsuite/tests/typecheck/should_compile/tc235.hs
@@ -4,7 +4,7 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
     -- 'x' and 'v' are ambiguous
 
--- Trac #1564
+-- #1564
 
 module Foo where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc239.hs b/testsuite/tests/typecheck/should_compile/tc239.hs
index f3941d3427..fef339c0db 100644
--- a/testsuite/tests/typecheck/should_compile/tc239.hs
+++ b/testsuite/tests/typecheck/should_compile/tc239.hs
@@ -1,5 +1,5 @@
 {-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
--- Trac #1072
+-- #1072
 
 module ShouldCompile where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc241.hs b/testsuite/tests/typecheck/should_compile/tc241.hs
index 8dca34314a..dd986b5c51 100644
--- a/testsuite/tests/typecheck/should_compile/tc241.hs
+++ b/testsuite/tests/typecheck/should_compile/tc241.hs
@@ -1,5 +1,5 @@
 {-# OPTIONS_GHC -XGADTs -XRankNTypes -O1 #-}
--- Trac #2018
+-- #2018
 
 module Bug1 where
 
diff --git a/testsuite/tests/typecheck/should_compile/tc242.hs b/testsuite/tests/typecheck/should_compile/tc242.hs
index eda338bc8a..1faa70734d 100644
--- a/testsuite/tests/typecheck/should_compile/tc242.hs
+++ b/testsuite/tests/typecheck/should_compile/tc242.hs
@@ -7,7 +7,7 @@ f1 (x:xs) = xs ++ [ x :: a ]   -- OK
 f2 :: forall a. [a] -> [a]
 f2 = \(x:xs) -> xs ++ [ x :: a ]   -- OK
 
--- This pair is a cut-down version of Trac #2030
+-- This pair is a cut-down version of #2030
 isSafe alts = isSafeAlts alts
 
 isSafeAlts :: forall m . Int -> m Int
diff --git a/testsuite/tests/typecheck/should_fail/FDsFromGivens.hs b/testsuite/tests/typecheck/should_fail/FDsFromGivens.hs
index 110199b97b..39333f6614 100644
--- a/testsuite/tests/typecheck/should_fail/FDsFromGivens.hs
+++ b/testsuite/tests/typecheck/should_fail/FDsFromGivens.hs
@@ -7,7 +7,7 @@ class C a b | a -> b where
 
 {- Failing, as it righteously should! It's inaccessible code -}
 -- But (c.f. test T5236) we no longer reject this in the
--- typechecker (see Trac #12466)
+-- typechecker (see #12466)
 -- Instead we get a redundant pattern-match warning,
 -- in the post-typechecking pattern-match checks
 g1 :: (C Char [a], C Char Bool) => a -> ()
diff --git a/testsuite/tests/typecheck/should_fail/T10715.hs b/testsuite/tests/typecheck/should_fail/T10715.hs
index 801ec4a5d7..a3d5d261c9 100644
--- a/testsuite/tests/typecheck/should_fail/T10715.hs
+++ b/testsuite/tests/typecheck/should_fail/T10715.hs
@@ -6,10 +6,10 @@ import Data.Ord ( Down )  -- convenient newtype
 
 data X a
 
--- See Trac #10715 for a long discussion about whether
+-- See #10715 for a long discussion about whether
 -- this should be accepted or not.
 --
--- But in Trac #12466 we decided to accept contradictory
+-- But in #12466 we decided to accept contradictory
 -- type signatures, so definition is now accepeted even
 -- though you can never call it.  Instead we get a
 -- redundant pattern-match warning, in the
diff --git a/testsuite/tests/typecheck/should_fail/T11948.hs b/testsuite/tests/typecheck/should_fail/T11948.hs
index 2b737be0ad..13ecce5d8e 100644
--- a/testsuite/tests/typecheck/should_fail/T11948.hs
+++ b/testsuite/tests/typecheck/should_fail/T11948.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE MultiParamTypeClasses, TypeFamilies, NoMonoLocalBinds #-}
 -- The NoMonoLocalBinds is crucial to making inference fail
--- See Trac #11948 comment:2
+-- See #11948 comment:2
 {-# LANGUAGE FlexibleContexts, ScopedTypeVariables #-}
 
 module T11948 where
diff --git a/testsuite/tests/typecheck/should_fail/T1633.hs b/testsuite/tests/typecheck/should_fail/T1633.hs
index fb95956774..d76bd71298 100644
--- a/testsuite/tests/typecheck/should_fail/T1633.hs
+++ b/testsuite/tests/typecheck/should_fail/T1633.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE FlexibleInstances #-}
 
 -- This just tests what the kind error message looks like
--- Trac #1633
+-- #1633
 
 module T1633 where
 
diff --git a/testsuite/tests/typecheck/should_fail/T1899.hs b/testsuite/tests/typecheck/should_fail/T1899.hs
index a49b647be7..835d8f1aa2 100644
--- a/testsuite/tests/typecheck/should_fail/T1899.hs
+++ b/testsuite/tests/typecheck/should_fail/T1899.hs
@@ -1,4 +1,4 @@
--- Test for Trac #1899
+-- Test for #1899
 
 module T1899 where
 
diff --git a/testsuite/tests/typecheck/should_fail/T2126.hs b/testsuite/tests/typecheck/should_fail/T2126.hs
index 0720565b0c..9abfe10a20 100644
--- a/testsuite/tests/typecheck/should_fail/T2126.hs
+++ b/testsuite/tests/typecheck/should_fail/T2126.hs
@@ -1,4 +1,4 @@
--- Trac #2126
+-- #2126
 
 module Foo where
 
diff --git a/testsuite/tests/typecheck/should_fail/T2307.hs b/testsuite/tests/typecheck/should_fail/T2307.hs
index 5bf508679c..6ca238b097 100644
--- a/testsuite/tests/typecheck/should_fail/T2307.hs
+++ b/testsuite/tests/typecheck/should_fail/T2307.hs
@@ -3,7 +3,7 @@
               IncoherentInstances,
               FlexibleInstances #-}
 
--- Trac #2307
+-- #2307
 
 module ShouldFail where
 
diff --git a/testsuite/tests/typecheck/should_fail/T2414.hs b/testsuite/tests/typecheck/should_fail/T2414.hs
index fba628db27..205a525af9 100644
--- a/testsuite/tests/typecheck/should_fail/T2414.hs
+++ b/testsuite/tests/typecheck/should_fail/T2414.hs
@@ -1,4 +1,4 @@
--- Test for Trac #2414
+-- Test for #2414
 -- Should provoke an occurs-check error
 
 module ShouldFail where
diff --git a/testsuite/tests/typecheck/should_fail/T2538.hs b/testsuite/tests/typecheck/should_fail/T2538.hs
index 11d9c479b5..849256ad3a 100644
--- a/testsuite/tests/typecheck/should_fail/T2538.hs
+++ b/testsuite/tests/typecheck/should_fail/T2538.hs
@@ -1,5 +1,5 @@
 
--- Trac #2538
+-- #2538
 module ShouldFail where
 import Data.Ix
 
diff --git a/testsuite/tests/typecheck/should_fail/T2714.hs b/testsuite/tests/typecheck/should_fail/T2714.hs
index b5e8d9c8b9..52d67e38ec 100644
--- a/testsuite/tests/typecheck/should_fail/T2714.hs
+++ b/testsuite/tests/typecheck/should_fail/T2714.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE ScopedTypeVariables, RankNTypes #-}
 
--- Trac #2714
+-- #2714
 
 module T2714 where
 
diff --git a/testsuite/tests/typecheck/should_fail/T2806.hs b/testsuite/tests/typecheck/should_fail/T2806.hs
index ac95542c94..e348d25e9b 100644
--- a/testsuite/tests/typecheck/should_fail/T2806.hs
+++ b/testsuite/tests/typecheck/should_fail/T2806.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE MagicHash #-}
 {-# OPTIONS_GHC -Wunbanged-strict-patterns #-}
 
--- Trac #2806
+-- #2806
 
 module Foo where
 
diff --git a/testsuite/tests/typecheck/should_fail/T2994.hs b/testsuite/tests/typecheck/should_fail/T2994.hs
index cd09745aba..aed2c4aa21 100644
--- a/testsuite/tests/typecheck/should_fail/T2994.hs
+++ b/testsuite/tests/typecheck/should_fail/T2994.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 
--- Trac #2994
+-- #2994
 
 module T2994 where
 
diff --git a/testsuite/tests/typecheck/should_fail/T3155.hs b/testsuite/tests/typecheck/should_fail/T3155.hs
index 3a4c0d2f77..81f8c7d139 100644
--- a/testsuite/tests/typecheck/should_fail/T3155.hs
+++ b/testsuite/tests/typecheck/should_fail/T3155.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE GADTs, TypeOperators #-}
 module T3155 where
 
--- Test Trac #3155
+-- Test #3155
 -- Gave bad error message in GHC 6.10
 
 data Any s where
diff --git a/testsuite/tests/typecheck/should_fail/T3176.hs b/testsuite/tests/typecheck/should_fail/T3176.hs
index 0235ad712f..e87f86b64f 100644
--- a/testsuite/tests/typecheck/should_fail/T3176.hs
+++ b/testsuite/tests/typecheck/should_fail/T3176.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE ExistentialQuantification #-}
 
--- Trac #3176
+-- #3176
 
 module Foo where
 
diff --git a/testsuite/tests/typecheck/should_fail/T3323.hs b/testsuite/tests/typecheck/should_fail/T3323.hs
index 22ed520806..3a5f27eccc 100644
--- a/testsuite/tests/typecheck/should_fail/T3323.hs
+++ b/testsuite/tests/typecheck/should_fail/T3323.hs
@@ -1,4 +1,4 @@
--- Trac #3323
+-- #3323
 module T3323 where
 
 import GHC.IO.Handle.Types
diff --git a/testsuite/tests/typecheck/should_fail/T3406.hs b/testsuite/tests/typecheck/should_fail/T3406.hs
index e31a32a79c..fbc314061c 100644
--- a/testsuite/tests/typecheck/should_fail/T3406.hs
+++ b/testsuite/tests/typecheck/should_fail/T3406.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 
--- Trac #3406
+-- #3406
 -- A pattern signature that discards the bound variables
 
 module T3406 where
diff --git a/testsuite/tests/typecheck/should_fail/T3613.hs b/testsuite/tests/typecheck/should_fail/T3613.hs
index 8b6f745027..fe68db520e 100644
--- a/testsuite/tests/typecheck/should_fail/T3613.hs
+++ b/testsuite/tests/typecheck/should_fail/T3613.hs
@@ -1,4 +1,4 @@
--- c.f Trac #3613
+-- c.f #3613
 
 module T3613 where
 
diff --git a/testsuite/tests/typecheck/should_fail/T5236.hs b/testsuite/tests/typecheck/should_fail/T5236.hs
index f32c06dcdb..9f617826c3 100644
--- a/testsuite/tests/typecheck/should_fail/T5236.hs
+++ b/testsuite/tests/typecheck/should_fail/T5236.hs
@@ -12,7 +12,7 @@ instance Id B B
 
 -- The fundeps mean that this type signature
 -- has a (derived) insoluble Given, A~B, but
--- we now ignore that (Trac #12466)
+-- we now ignore that (#12466)
 loop :: Id A B => Bool
 loop = True
 
diff --git a/testsuite/tests/typecheck/should_fail/T8392a.hs b/testsuite/tests/typecheck/should_fail/T8392a.hs
index 940f8b6a99..40fd339805 100644
--- a/testsuite/tests/typecheck/should_fail/T8392a.hs
+++ b/testsuite/tests/typecheck/should_fail/T8392a.hs
@@ -3,7 +3,7 @@ module T8392a where
 
 -- Should complain even with AllowAmbiguousTypes
 --
--- But (Trac #12466) we now don't complain about
+-- But (#12466) we now don't complain about
 -- contradictory signatures
 -- Instead we get a redundant pattern-match warning,
 -- in the post-typechecking pattern-match checks
diff --git a/testsuite/tests/typecheck/should_fail/T8806.hs b/testsuite/tests/typecheck/should_fail/T8806.hs
index 6b80f15ee1..f2bda3b6ca 100644
--- a/testsuite/tests/typecheck/should_fail/T8806.hs
+++ b/testsuite/tests/typecheck/should_fail/T8806.hs
@@ -1,4 +1,4 @@
--- Trac #8806
+-- #8806
 
 module T8806 where
 
diff --git a/testsuite/tests/typecheck/should_fail/T8883.hs b/testsuite/tests/typecheck/should_fail/T8883.hs
index 5b0fc5922c..c3af3af513 100644
--- a/testsuite/tests/typecheck/should_fail/T8883.hs
+++ b/testsuite/tests/typecheck/should_fail/T8883.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TypeFamilies #-}
 
--- Trac #8883
+-- #8883
 
 module T8883 where
 
diff --git a/testsuite/tests/typecheck/should_fail/T9858a.hs b/testsuite/tests/typecheck/should_fail/T9858a.hs
index fda55c20db..b9cbf8fa1a 100644
--- a/testsuite/tests/typecheck/should_fail/T9858a.hs
+++ b/testsuite/tests/typecheck/should_fail/T9858a.hs
@@ -1,4 +1,4 @@
--- From comment:76 in Trac #9858
+-- From comment:76 in #9858
 -- This exploit still works in GHC 7.10.1.
 -- By Shachaf Ben-Kiki, Ørjan Johansen and Nathan van Doorn
 
diff --git a/testsuite/tests/typecheck/should_fail/TcCoercibleFail.hs b/testsuite/tests/typecheck/should_fail/TcCoercibleFail.hs
index 833609d48a..3967c3c0bd 100644
--- a/testsuite/tests/typecheck/should_fail/TcCoercibleFail.hs
+++ b/testsuite/tests/typecheck/should_fail/TcCoercibleFail.hs
@@ -23,7 +23,7 @@ foo5 = coerce :: Void -> ()
 
 ------------------------------------
 -- This next one generates an exponentally big type as it
--- tries to unwrap.  See comment:15 in Trac #11518
+-- tries to unwrap.  See comment:15 in #11518
 -- Adding asserions that force the types can make us
 -- run out of space.
 newtype VoidBad a = VoidBad (VoidBad (a,a))
diff --git a/testsuite/tests/typecheck/should_fail/all.T b/testsuite/tests/typecheck/should_fail/all.T
index bd13b2f8ce..6344d74c7a 100644
--- a/testsuite/tests/typecheck/should_fail/all.T
+++ b/testsuite/tests/typecheck/should_fail/all.T
@@ -140,7 +140,7 @@ test('tcfail154', normal, compile_fail, [''])
 test('tcfail155', normal, compile_fail, [''])
 test('tcfail156', normal, compile_fail, [''])
 test('tcfail157', normal, compile_fail, [''])
-# Skip tcfail158 until Trac ticket #15899 fixes the broken test
+# Skip tcfail158 until #15899 fixes the broken test
 test('tcfail158', skip, compile_fail, [''])
 test('tcfail159', normal, compile_fail, [''])
 test('tcfail160', normal, compile_fail, [''])
diff --git a/testsuite/tests/typecheck/should_fail/tcfail138.hs b/testsuite/tests/typecheck/should_fail/tcfail138.hs
index 31cde734ec..1c628a1b5b 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail138.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail138.hs
@@ -20,7 +20,7 @@
 -- So, today, this program fails.  It's trivial to fix by adding a fundep for C
 --      class (G a, L a b) => C a b | a -> b
 
--- Note: Sept 08: when fixing Trac #1470, tc138 started working!
+-- Note: Sept 08: when fixing #1470, tc138 started working!
 -- This test is a very strange one (fundeps, undecidable instances),
 -- so I'm just marking it as "should-succeed".  It's not very clear to
 -- me what the "right" answer should be; when we have the type equality
diff --git a/testsuite/tests/typecheck/should_fail/tcfail169.hs b/testsuite/tests/typecheck/should_fail/tcfail169.hs
index 46606a838d..510e61212c 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail169.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail169.hs
@@ -1,5 +1,5 @@
 
--- Trac #958
+-- #958
 
 module ShoulFail where
 
diff --git a/testsuite/tests/typecheck/should_fail/tcfail175.hs b/testsuite/tests/typecheck/should_fail/tcfail175.hs
index 5eacd24291..09e7dc3c9b 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail175.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail175.hs
@@ -1,6 +1,6 @@
 
 -- Crashed GHC 6.6!
--- Trac #1153
+-- #1153
  
 module ShouldFail where
 
diff --git a/testsuite/tests/typecheck/should_fail/tcfail177.hs b/testsuite/tests/typecheck/should_fail/tcfail177.hs
index 8d264db53d..4cbe12bfbc 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail177.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail177.hs
@@ -1,6 +1,6 @@
 module ShouldFail where
 
--- See Trac #1176
+-- See #1176
 -- This is really a pretty-printer test, not a typechecker test
 --
 -- Before ghc-7.2 the error messages looked like this (notice the wrong
diff --git a/testsuite/tests/typecheck/should_fail/tcfail178.hs b/testsuite/tests/typecheck/should_fail/tcfail178.hs
index 8071def02e..74174ce249 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail178.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail178.hs
@@ -1,4 +1,4 @@
--- See Trac #1221
+-- See #1221
 
 module ShouldFail where
 
diff --git a/testsuite/tests/typecheck/should_fail/tcfail185.hs b/testsuite/tests/typecheck/should_fail/tcfail185.hs
index d6026368ec..c717936ce7 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail185.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail185.hs
@@ -1,4 +1,4 @@
--- See Trac #1606
+-- See #1606
 
 module ShouldFail where
 
diff --git a/testsuite/tests/typecheck/should_fail/tcfail186.hs b/testsuite/tests/typecheck/should_fail/tcfail186.hs
index 6148517a6d..647fbe33ae 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail186.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail186.hs
@@ -1,4 +1,4 @@
--- Trac #1814
+-- #1814
 
 module ShouldFail where
 
diff --git a/testsuite/tests/typecheck/should_fail/tcfail187.hs b/testsuite/tests/typecheck/should_fail/tcfail187.hs
index eb508066ec..d863b54e41 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail187.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail187.hs
@@ -1,4 +1,4 @@
--- Trac #1806
+-- #1806
 
 module ShouldFail where
 
diff --git a/testsuite/tests/typecheck/should_fail/tcfail188.hs b/testsuite/tests/typecheck/should_fail/tcfail188.hs
index 821f0c69dc..fef1676e50 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail188.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail188.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE RankNTypes, KindSignatures #-}
 {-# OPTIONS_GHC -Werror #-}
 
--- Trac #959
+-- #959
 
 module ShouldFail where
 
diff --git a/testsuite/tests/typecheck/should_fail/tcfail204.hs b/testsuite/tests/typecheck/should_fail/tcfail204.hs
index ed561c3290..321098cbd0 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail204.hs
+++ b/testsuite/tests/typecheck/should_fail/tcfail204.hs
@@ -2,7 +2,7 @@
 {-# OPTIONS_GHC -Wall #-}
 {-# OPTIONS_GHC -Werror #-}
 
--- Trac #3261
+-- #3261
 
 module Foo where
 
diff --git a/testsuite/tests/typecheck/should_run/Defer01.hs b/testsuite/tests/typecheck/should_run/Defer01.hs
index 135fd837ca..551c626f7c 100644
--- a/testsuite/tests/typecheck/should_run/Defer01.hs
+++ b/testsuite/tests/typecheck/should_run/Defer01.hs
@@ -42,7 +42,7 @@ class MyClass a where myOp :: a -> String
 
 j = myOp 23 -- Two errors, should not combine them
 
--- No longer reported as an error: Trac #12466
+-- No longer reported as an error: #12466
 k :: (Int ~ Bool) => Int -> Bool
 k x = x