diff --git a/http-media.cabal b/http-media.cabal
--- a/http-media.cabal
+++ b/http-media.cabal
@@ -1,12 +1,12 @@
 name:          http-media
-version:       0.6.3
+version:       0.6.4
 license:       MIT
 license-file:  LICENSE
 author:        Timothy Jones
-maintainer:    Timothy Jones <git@zmthy.io>
+maintainer:    Timothy Jones <tim@zmthy.net>
 homepage:      https://github.com/zmthy/http-media
 bug-reports:   https://github.com/zmthy/http-media/issues
-copyright:     (c) 2012-2015 Timothy Jones
+copyright:     (c) 2012-2016 Timothy Jones
 category:      Web
 build-type:    Simple
 cabal-version: >= 1.10
@@ -113,7 +113,7 @@
     bytestring                 >= 0.10 && < 0.11,
     case-insensitive           >= 1.0  && < 1.3,
     containers                 >= 0.5  && < 0.6,
-    QuickCheck                 >= 2.6  && < 2.9,
+    QuickCheck                 >= 2.6  && < 2.10,
     test-framework             >= 0.8  && < 0.9,
     test-framework-quickcheck2 >= 0.3  && < 0.4
 
diff --git a/test/Network/HTTP/Media/Tests.hs b/test/Network/HTTP/Media/Tests.hs
--- a/test/Network/HTTP/Media/Tests.hs
+++ b/test/Network/HTTP/Media/Tests.hs
@@ -199,5 +199,6 @@
 genServerAndClient :: Gen ([MediaType], [MediaType])
 genServerAndClient = do
     server <- genServer
-    client <- listOf1 $ genDiffMediaTypesWith genConcreteMediaType server
+    client <- filter (not . flip any server . flip matches) <$>
+        listOf1 (genDiffMediaTypesWith genConcreteMediaType server)
     return (server, client)