diff --git a/build-constraints.yaml b/build-constraints.yaml
index f9708eb4..aca71ec1 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3744,17 +3744,6 @@ packages:
         - snap-server < 0 # GHC 8.4 via io-streams-haproxy
         - hOpenPGP < 0 # GHC 8.4 via ixset-typed
         - text-generic-pretty < 0 # GHC 8.4 via ixset-typed
-        - async-refresh < 0 # GHC 8.4 via lifted-async
-        - async-refresh-tokens < 0 # GHC 8.4 via lifted-async
-        - async-timer < 0 # GHC 8.4 via lifted-async
-        - consul-haskell < 0 # GHC 8.4 via lifted-async
-        - eventsource-api < 0 # GHC 8.4 via lifted-async
-        - eventstore < 0 # GHC 8.4 via lifted-async
-        - hedgehog < 0 # GHC 8.4 via lifted-async
-        - log-warper < 0 # GHC 8.4 via lifted-async
-        - pipes-fluid < 0 # GHC 8.4 via lifted-async
-        - quickcheck-state-machine < 0 # GHC 8.4 via lifted-async
-        - shelly < 0 # GHC 8.4 via lifted-async
         - lzma-conduit < 0 # GHC 8.4 via lzma
         - zim-parser < 0 # GHC 8.4 via lzma
         - heist < 0 # GHC 8.4 via map-syntax
@@ -3948,13 +3937,6 @@ packages:
         - gi-glib < 0 # GHC 8.4 via haskell-gi
         - gi-gobject < 0 # GHC 8.4 via haskell-gi
         - gi-javascriptcore < 0 # GHC 8.4 via haskell-gi
-        - either < 0 # GHC 8.4 via hedgehog
-        - hedgehog-quickcheck < 0 # GHC 8.4 via hedgehog
-        - hw-fingertree-strict < 0 # GHC 8.4 via hedgehog
-        - hw-hedgehog < 0 # GHC 8.4 via hedgehog
-        - hw-hspec-hedgehog < 0 # GHC 8.4 via hedgehog
-        - hw-rankselect < 0 # GHC 8.4 via hedgehog
-        - validation < 0 # GHC 8.4 via hedgehog
         - IPv6DB < 0 # GHC 8.4 via hedis
         - hworker < 0 # GHC 8.4 via hedis
         - serversession-backend-redis < 0 # GHC 8.4 via hedis
@@ -4377,8 +4359,6 @@ packages:
         - hspec-checkers < 0 # GHC 8.4 via checkers
         - picedit < 0 # GHC 8.4 via cli
         - termcolor < 0 # GHC 8.4 via cli
-        - glabrous < 0 # GHC 8.4 via either
-        - model < 0 # GHC 8.4 via either
         - diversity < 0 # GHC 8.4 via fasta
         - ChannelT < 0 # GHC 8.4 via free
         - Rasterific < 0 # GHC 8.4 via free
@@ -4601,7 +4581,6 @@ packages:
         - email-validate < 0 # GHC 8.4 via doctest-0.15.0
         - flow < 0 # GHC 8.4 via doctest-0.15.0
         - turtle < 0 # GHC 8.4 via doctest-0.15.0
-        - jose-jwt < 0 # GHC 8.4 via either
         - eventsource-store-specs < 0 # GHC 8.4 via eventsource-api
         - hapistrano < 0 # GHC 8.4 via formatting
         - genvalidity-aeson < 0 # GHC 8.4 via genvalidity-hspec
@@ -4823,6 +4802,26 @@ packages:
         - dublincore-xml-conduit < 0 # GHC 8.4 via xml-conduit
         - opml-conduit < 0 # GHC 8.4 via xml-conduit
         - rss-conduit < 0 # GHC 8.4 via xml-conduit
+        - hedgehog-quickcheck < 0 # GHC 8.4 via QuickCheck-2.11.3
+        - eventstore < 0 # GHC 8.4 via connection
+        - eventstore < 0 # GHC 8.4 via ekg-core
+        - eventstore < 0 # GHC 8.4 via fast-logger
+        - log-warper < 0 # GHC 8.4 via fmt
+        - glabrous < 0 # GHC 8.4 via hspec-2.5.0
+        - eventstore < 0 # GHC 8.4 via http-client
+        - eventstore < 0 # GHC 8.4 via interpolate
+        - log-warper < 0 # GHC 8.4 via lifted-async-0.10.0.1
+        - async-refresh < 0 # GHC 8.4 via monad-logger
+        - async-refresh-tokens < 0 # GHC 8.4 via monad-logger
+        - eventstore < 0 # GHC 8.4 via monad-logger
+        - pipes-fluid < 0 # GHC 8.4 via pipes-concurrency
+        - pipes-fluid < 0 # GHC 8.4 via pipes-misc
+        - dns < 0 # GHC 8.4 via psqueues
+        - eventstore < 0 # GHC 8.4 via tasty-hspec
+        - eventstore < 0 # GHC 8.4 via text-format
+        - log-warper < 0 # GHC 8.4 via universum
+        - eventsource-api < 0 # GHC 8.4 via uuid
+        - eventstore < 0 # GHC 8.4 via uuid
 
 
     "GHC upper bounds":
@@ -5034,6 +5033,7 @@ skipped-tests:
     - linear # ghc 8.4 via simple-reflect # https://github.com/twanvl/simple-reflect/issues/3
     - log-domain # ghc 8.4 via simple-reflect # https://github.com/twanvl/simple-reflect/issues/3
     - semigroupoids # doctest 0.15
+    - glabrous # hspec 2.5
     - stb-image-redux # hspec 2.5
     - wide-word # hspec 2.5
     - HTTP # conduit-extra 1.3