diff --git a/HUnit.cabal b/HUnit.cabal
--- a/HUnit.cabal
+++ b/HUnit.cabal
@@ -1,5 +1,5 @@
 Name:                   HUnit
-Version:                1.2.5.1
+Version:                1.2.5.2
 Cabal-Version:          >= 1.8
 License:                BSD3
 License-File:           LICENSE
@@ -13,8 +13,9 @@
     HUnit is a unit testing framework for Haskell, inspired by the
     JUnit tool for Java, see: <http://www.junit.org>.
 Tested-With:
-    GHC == 7.0.4
     GHC == 7.4.1
+    GHC == 7.4.2
+    GHC == 7.7
 Build-Type:             Simple
 Extra-Source-Files:
     HUnit.cabal.hugs
diff --git a/HUnit.cabal.tests b/HUnit.cabal.tests
--- a/HUnit.cabal.tests
+++ b/HUnit.cabal.tests
@@ -6,7 +6,7 @@
 -- To use this file, simply copy it to HUnit.cabal, then build as normal.  You
 -- may rename the existing version of HUnit.cabal first, if you like.
 Name:                   HUnit
-Version:                1.2.5.1
+Version:                1.2.5.2
 Cabal-Version:          >= 1.8
 License:                BSD3
 License-File:           LICENSE
@@ -20,8 +20,9 @@
     HUnit is a unit testing framework for Haskell, inspired by the
     JUnit tool for Java, see: <http://www.junit.org>.
 Tested-With:
-    GHC == 7.0.4
     GHC == 7.4.1
+    GHC == 7.4.2
+    GHC == 7.7
 Build-Type:             Simple
 Extra-Source-Files:
     HUnit.cabal.hugs
diff --git a/Test/HUnit/Lang.hs b/Test/HUnit/Lang.hs
--- a/Test/HUnit/Lang.hs
+++ b/Test/HUnit/Lang.hs
@@ -1,6 +1,11 @@
 -- | This module abstracts the differences between implementations of 
 -- Haskell (e.g., GHC, Hugs, and NHC).
 
+{-# LANGUAGE CPP #-} 
+#if __GLASGOW_HASKELL__ >= 707
+{-# LANGUAGE DeriveDataTypeable #-}
+#endif
+
 module Test.HUnit.Lang
 (
   Assertion,
@@ -75,6 +80,9 @@
 
 #if defined(__GLASGOW_HASKELL__) || defined(__HUGS__)
 data HUnitFailure = HUnitFailure String
+#if __GLASGOW_HASKELL__ >= 707
+    deriving (Show, Typeable)
+#else
     deriving Show
 
 hunitFailureTc :: TyCon
@@ -87,6 +95,8 @@
  
 instance Typeable HUnitFailure where
     typeOf _ = mkTyConApp hunitFailureTc []
+#endif
+
 #ifdef BASE4
 instance Exception HUnitFailure