11 files changed, 17 insertions, 8 deletions
diff --git a/testsuite/tests/rename/should_compile/T1972.hs b/testsuite/tests/rename/should_compile/T1972.hs
index d4da5f41aa..7b6d7387c7 100644
--- a/testsuite/tests/rename/should_compile/T1972.hs
+++ b/testsuite/tests/rename/should_compile/T1972.hs
@@ -4,7 +4,7 @@
 
 module Temp where
 
-import Data.List
+import Data.List (mapAccumL)
 
 data Data = Data {name :: String}
 
@@ -17,4 +17,4 @@ mapAccumL y = y
 
 test x = a+b 
   where
-    (a,b,c) = x
-\ No newline at end of file
+    (a,b,c) = x
diff --git a/testsuite/tests/rename/should_compile/T1972.stderr b/testsuite/tests/rename/should_compile/T1972.stderr
index 439684a20c..78f58b5415 100644
--- a/testsuite/tests/rename/should_compile/T1972.stderr
+++ b/testsuite/tests/rename/should_compile/T1972.stderr
@@ -5,7 +5,7 @@ T1972.hs:12:3: warning: [-Wname-shadowing (in -Wall)]
 
 T1972.hs:14:3: warning: [-Wname-shadowing (in -Wall)]
     This binding for ‘mapAccumL’ shadows the existing bindings
-      imported from ‘Data.List’ at T1972.hs:7:1-16
+      imported from ‘Data.List’ at T1972.hs:7:19-27
       (and originally defined in ‘Data.Traversable’)
       defined at T1972.hs:16:1
 
diff --git a/testsuite/tests/rename/should_compile/T4478.hs b/testsuite/tests/rename/should_compile/T4478.hs
index 0d6a5e1ea6..9e3fcee81a 100644
--- a/testsuite/tests/rename/should_compile/T4478.hs
+++ b/testsuite/tests/rename/should_compile/T4478.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -Wno-compat-unqualified-imports #-}
 
 -- We don't want to warn about duplicate exports for things exported
 -- by both "module" exports
diff --git a/testsuite/tests/rename/should_compile/T7167.hs b/testsuite/tests/rename/should_compile/T7167.hs
index 78e6938ef5..3fa28d2173 100644
--- a/testsuite/tests/rename/should_compile/T7167.hs
+++ b/testsuite/tests/rename/should_compile/T7167.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -Wno-compat-unqualified-imports #-}
 {-# OPTIONS_GHC -fwarn-dodgy-imports #-}
 
 module T7167 where
diff --git a/testsuite/tests/rename/should_compile/T7167.stderr b/testsuite/tests/rename/should_compile/T7167.stderr
index 22aaf640eb..4da1c5283e 100644
--- a/testsuite/tests/rename/should_compile/T7167.stderr
+++ b/testsuite/tests/rename/should_compile/T7167.stderr
@@ -1,3 +1,3 @@
 
-T7167.hs:5:1: warning: [-Wdodgy-imports (in -Wextra)]
+T7167.hs:6:1: warning: [-Wdodgy-imports (in -Wextra)]
     Module ‘Data.List’ does not export ‘foo’
diff --git a/testsuite/tests/rename/should_compile/rn025.hs b/testsuite/tests/rename/should_compile/rn025.hs
index b8bf1ffe94..141d105f2d 100644
--- a/testsuite/tests/rename/should_compile/rn025.hs
+++ b/testsuite/tests/rename/should_compile/rn025.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -Wno-compat-unqualified-imports #-}
+
 -- !!! Re-exporting a module whose contents is partially hidden.
 module ShouldCompile ( module Data.List ) where
 
diff --git a/testsuite/tests/rename/should_compile/rn027.hs b/testsuite/tests/rename/should_compile/rn027.hs
index 76cefe9310..fb5bbdf529 100644
--- a/testsuite/tests/rename/should_compile/rn027.hs
+++ b/testsuite/tests/rename/should_compile/rn027.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -Wno-compat-unqualified-imports #-}
+
 -- !!! Checking that an imported module may still have
 -- !!! a local alias without having used 'qualified'.
 module ShouldCompile where
diff --git a/testsuite/tests/rename/should_compile/rn031.hs b/testsuite/tests/rename/should_compile/rn031.hs
index 7b4a07d626..f84c793956 100644
--- a/testsuite/tests/rename/should_compile/rn031.hs
+++ b/testsuite/tests/rename/should_compile/rn031.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS_GHC -Wno-compat-unqualified-imports #-}
+
 -- !!! Checking that an imported module may still have
 -- !!! a local alias without having used 'qualified'.
 module ShouldCompile where
diff --git a/testsuite/tests/rename/should_compile/rn037.hs b/testsuite/tests/rename/should_compile/rn037.hs
index 46de96fae5..cd03c42056 100644
--- a/testsuite/tests/rename/should_compile/rn037.hs
+++ b/testsuite/tests/rename/should_compile/rn037.hs
@@ -1,4 +1,4 @@
 {-# OPTIONS -fwarn-unused-imports #-}
 -- !!! test unused import warning
-import Data.List
+import Data.Tuple
 main = return () :: IO ()
diff --git a/testsuite/tests/rename/should_compile/rn037.stderr b/testsuite/tests/rename/should_compile/rn037.stderr
index eaf268f6ca..c386e896de 100644
--- a/testsuite/tests/rename/should_compile/rn037.stderr
+++ b/testsuite/tests/rename/should_compile/rn037.stderr
@@ -1,5 +1,5 @@
 
 rn037.hs:3:1: warning: [-Wunused-imports (in -Wextra)]
-    The import of ‘Data.List’ is redundant
-      except perhaps to import instances from ‘Data.List’
-    To import instances alone, use: import Data.List()
+    The import of ‘Data.Tuple’ is redundant
+      except perhaps to import instances from ‘Data.Tuple’
+    To import instances alone, use: import Data.Tuple()
diff --git a/testsuite/tests/rename/should_compile/rn060.hs b/testsuite/tests/rename/should_compile/rn060.hs
index aa6ff02191..ae5bbeeb68 100644
--- a/testsuite/tests/rename/should_compile/rn060.hs
+++ b/testsuite/tests/rename/should_compile/rn060.hs
@@ -1,3 +1,4 @@
+{-# OPTIONS_GHC -Wno-compat-unqualified-imports #-}
 
 module Foo (module Data.List) where