diff --git a/aeson.cabal b/aeson.cabal
index f6500098..032e5e6c 100644
--- a/aeson.cabal
+++ b/aeson.cabal
@@ -1,7 +1,6 @@
 cabal-version:      2.2
 name:               aeson
-version:            2.2.3.0
-x-revision:         4
+version:            2.2.4.0
 license:            BSD-3-Clause
 license-file:       LICENSE
 category:           Text, Web, JSON
@@ -124,7 +123,7 @@ library
     , network-uri           ^>=2.6.4.1
     , OneTuple              ^>=0.4.1.1
     , primitive             ^>=0.8.0.0  || ^>=0.9.0.0
-    , QuickCheck            ^>=2.14.3   || ^>=2.15    || ^>=2.16.0.0
+    , QuickCheck            ^>=2.14.3   || ^>=2.15    || ^>=2.16.0.0 || ^>=2.17.1.0 || ^>=2.18.0.0
     , scientific            ^>=0.3.7.0
     , semialign             ^>=1.3
     , strict                ^>=0.5
@@ -219,7 +218,7 @@ test-suite aeson-tests
     , OneTuple
     , primitive
     , QuickCheck
-    , quickcheck-instances  >=0.3.29 && <0.4
+    , quickcheck-instances  >=0.3.29 && <0.5
     , scientific
     , strict
     , tagged
diff --git a/changelog.md b/changelog.md
index f6e56617..c223a87f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 For the latest version of this document, please see [https://github.com/haskell/aeson/blob/master/changelog.md](https://github.com/haskell/aeson/blob/master/changelog.md).
 
+### 2.2.4.0
+
+* Check for control characters in text literals everywhere
+
 ### 2.2.3.0
 
 * Support `hashable-1.4.6.0`.
diff --git a/tests/Instances.hs b/tests/Instances.hs
index 4f60ba9e..64c9b713 100644
--- a/tests/Instances.hs
+++ b/tests/Instances.hs
@@ -28,6 +28,11 @@ import qualified Network.URI as URI
 import Data.Orphans ()
 import Test.QuickCheck.Instances ()
 
+#if !MIN_VERSION_base(4,16,0)
+import Data.Semigroup (Option (..))
+import Data.Tuple.Solo (Solo (..))
+#endif
+
 -- "System" types.
 
 instance Arbitrary DotNetTime where
@@ -157,9 +162,13 @@ instance Arbitrary (GADT String) where
 
 #if !MIN_VERSION_base(4,16,0)
 instance Arbitrary OptionField where
-    arbitrary = OptionField <$> arbitrary
+    arbitrary = OptionField . Option <$> arbitrary
 #endif
 
+#if !MIN_VERSION_base(4,16,0) && MIN_VERSION_QuickCheck(2,17,0)
+instance Arbitrary a => Arbitrary (Solo a) where
+    arbitrary = MkSolo <$> arbitrary
+#endif
 
 instance ApproxEq Char where
     (=~) = (==)
diff --git a/text-iso8601/text-iso8601.cabal b/text-iso8601/text-iso8601.cabal
index 6a1eb4e7..dc25a6c9 100644
--- a/text-iso8601/text-iso8601.cabal
+++ b/text-iso8601/text-iso8601.cabal
@@ -1,7 +1,7 @@
 cabal-version:      1.12
 name:               text-iso8601
 version:            0.1.1
-x-revision:         2
+x-revision:         3
 synopsis:           Converting time to and from ISO 8601 text.
 description:
   Converting time to and from IS0 8601 text.
@@ -66,8 +66,8 @@ test-suite text-iso8601-tests
 
   -- test dependencies
   build-depends:
-      QuickCheck            >=2.14.3   && <2.17
-    , quickcheck-instances  >=0.3.29.1 && <0.4
+      QuickCheck            >=2.14.3   && <2.19
+    , quickcheck-instances  >=0.3.29.1 && <0.5
     , tasty                 >=1.4.3    && <1.6
     , tasty-hunit           >=0.10.0.3 && <0.11
     , tasty-quickcheck      >=0.10.2   && <0.12