diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+## 0.12.5.1
+
+* Support for QuickCheck 2.8.2
+
 ## 0.12.5
 
 * Expose `Alternative` and `optional`
diff --git a/classy-prelude.cabal b/classy-prelude.cabal
--- a/classy-prelude.cabal
+++ b/classy-prelude.cabal
@@ -1,5 +1,5 @@
 name:                classy-prelude
-version:             0.12.5
+version:             0.12.5.1
 synopsis:            A typeclass-based Prelude.
 description:         Modern best practices without name collisions. No partial functions are exposed, but modern data structures are, without requiring import lists. Qualified modules also are not needed: instead operations are based on type-classes from the mono-traversable package.
 
diff --git a/test/main.hs b/test/main.hs
--- a/test/main.hs
+++ b/test/main.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE NoImplicitPrelude #-}
@@ -414,16 +415,12 @@
     deriving (Show, Typeable)
 instance Exception DummyException
 
-instance Arbitrary (Map Int Char) where
-    arbitrary = mapFromList <$> arbitrary
 instance Arbitrary (HashMap Int Char) where
     arbitrary = mapFromList <$> arbitrary
 instance Arbitrary (Vector Int) where
     arbitrary = fromList <$> arbitrary
 instance Arbitrary (UVector Int) where
     arbitrary = fromList <$> arbitrary
-instance Arbitrary (Set Int) where
-    arbitrary = setFromList <$> arbitrary
 instance Arbitrary (HashSet Int) where
     arbitrary = setFromList <$> arbitrary
 instance Arbitrary ByteString where
@@ -434,5 +431,12 @@
     arbitrary = fromList <$> arbitrary
 instance Arbitrary LText where
     arbitrary = fromList <$> arbitrary
+
+#if !MIN_VERSION_QuickCheck(2,8,2)
 instance Arbitrary (Seq Int) where
     arbitrary = fromList <$> arbitrary
+instance Arbitrary (Set Int) where
+    arbitrary = setFromList <$> arbitrary
+instance Arbitrary (Map Int Char) where
+    arbitrary = mapFromList <$> arbitrary
+#endif