diff --git a/ghc/tests/lib/should_run/Makefile b/ghc/tests/lib/should_run/Makefile
index 72874113d654474d4a166e4fc66e6f5a84bcf2a9..cfe788041eb7ed8dd14c01014ddc3d16ef84dd6c 100644
--- a/ghc/tests/lib/should_run/Makefile
+++ b/ghc/tests/lib/should_run/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.8 1998/11/25 16:44:05 simonm Exp $
+# $Id: Makefile,v 1.9 1999/01/18 15:44:44 simonm Exp $
 
 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
@@ -8,7 +8,7 @@ include $(TOP)/mk/should_run.mk
 SRC_HC_OPTS += -dcore-lint
 
 packedstring001_HC_OPTS = -syslib misc
-exceptions001_HC_OPTS   = -fglasgow-exts
+exceptions001_HC_OPTS   = -fglasgow-exts -fno-warn-missing-methods
 stableptr002_HC_OPTS    = -fglasgow-exts
 list001_HC_OPTS         = -fglasgow-exts
 
diff --git a/ghc/tests/lib/should_run/list001.hs b/ghc/tests/lib/should_run/list001.hs
index a1ea6502168625733ae96c9a817a6747ac7fc23c..ca82d351a2f8cc1ca48d95af3011b0ae76fed155 100644
--- a/ghc/tests/lib/should_run/list001.hs
+++ b/ghc/tests/lib/should_run/list001.hs
@@ -13,19 +13,19 @@ main = do
 
   -- head
   print (head [1,2,3,4], head "a")
-  catch (print (head [] :: String)) (\_ -> putStr "head []\n")
+  catchAllIO (print (head [] :: String)) (\_ -> putStr "head []\n")
 
   -- tail
   print (tail [1,2,3,4], tail "a")
-  catch (print (tail [] :: String)) (\_ -> putStr "tail []\n")
+  catchAllIO (print (tail [] :: String)) (\_ -> putStr "tail []\n")
 
   -- init
   print (init [1,2,3,4], init "a")
-  catch (print (init [] :: String)) (\_ -> putStr "init []\n")
+  catchAllIO (print (init [] :: String)) (\_ -> putStr "init []\n")
 
   -- last
   print (last [1,2,3,4], last "a")
-  catch (print (last [] :: String)) (\_ -> putStr "last []\n")
+  catchAllIO (print (last [] :: String)) (\_ -> putStr "last []\n")
 
   -- null
   print [null [], null "abc"]
@@ -38,43 +38,43 @@ main = do
 
   -- foldl1
   print (foldl1 (+) [1..10])
-  catch (print (foldl1 (+) [] :: Int)) (\_ -> putStr "foldl1 []\n")
+  catchAllIO (print (foldl1 (+) [] :: Int)) (\_ -> putStr "foldl1 []\n")
 
   -- scanl
   print (scanl  (+) 1 [1..10])
 
   -- scanl1
   print (scanl1 (+) [1..10])
-  catch (print (scanl1 (+) [] :: [Int])) (\_ -> putStr "scanl1 []\n")
+  catchAllIO (print (scanl1 (+) [] :: [Int])) (\_ -> putStr "scanl1 []\n")
 
   -- foldr1
   print (foldr1 (+) [1..10])
-  catch (print (foldr1 (+) [] :: Int)) (\_ -> putStr "foldr1 []\n")
+  catchAllIO (print (foldr1 (+) [] :: Int)) (\_ -> putStr "foldr1 []\n")
 
   -- scanr
   print (scanr  (+) 1 [1..10])
 
   -- scanr1
   print (scanr1 (+) [1..10])
-  catch (print (scanr1 (+) [] :: [Int])) (\_ -> putStr "scanr1 []\n")
+  catchAllIO (print (scanr1 (+) [] :: [Int])) (\_ -> putStr "scanr1 []\n")
 
   -- iterate
   print (take 10 (cycle (take 4 (iterate (+1) 1))))
 
   -- take
   print (take 4 (repeat "x"), take 0 (repeat "x"), take 5 [1..4])
-  catch (print (take (-1) [1..10])) (\_ -> putStr "take (-1)\n")
+  catchAllIO (print (take (-1) [1..10])) (\_ -> putStr "take (-1)\n")
 
   -- replicate
   print [replicate 2 "abc", replicate 0 "abc", replicate 3 []]
 
   -- drop
   print [drop 5 [1..10], drop 0 [1..10], drop 5 [1..4]]
-  catch (print (drop (-1) [1..10])) (\_ -> putStr "drop (-1)\n")
+  catchAllIO (print (drop (-1) [1..10])) (\_ -> putStr "drop (-1)\n")
 
   -- splitAt
   print [splitAt 5 [1..10], splitAt 5 [1..4]]
-  catch (print (splitAt (-1) [1..10])) (\_ -> putStr "splitAt (-1)\n")
+  catchAllIO (print (splitAt (-1) [1..10])) (\_ -> putStr "splitAt (-1)\n")
 
   -- scan
   print (span (<5) [1..10])
@@ -108,11 +108,11 @@ main = do
 
   -- maximum
   print (maximum [1..10])
-  catch (print (maximum [] :: Int)) (\_ -> putStr "maximum []\n")
+  catchAllIO (print (maximum [] :: Int)) (\_ -> putStr "maximum []\n")
 
   -- minimum
   print (minimum [1..10])
-  catch (print (minimum [] :: Int)) (\_ -> putStr "minimum []\n")
+  catchAllIO (print (minimum [] :: Int)) (\_ -> putStr "minimum []\n")
 
   -- concatMap
   print (concatMap (:[]) [(1::Int)..10])