diff --git a/build-constraints.yaml b/build-constraints.yaml
index 4c94e655..44f66ce5 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3628,7 +3628,6 @@ packages:
         - bank-holidays-england < 0 # GHC 8.4 via base-4.11.0.0
         - benchpress < 0 # GHC 8.4 via base-4.11.0.0
         - butcher < 0 # GHC 8.4 via base-4.11.0.0
-        - cabal-install < 0 # GHC 8.4 via base-4.11.0.0
         - capataz < 0 # GHC 8.4 via base-4.11.0.0
         - circle-packing < 0 # GHC 8.4 via base-4.11.0.0
         - colour-accelerate < 0 # GHC 8.4 via base-4.11.0.0
@@ -3664,7 +3663,6 @@ packages:
         - gloss-rendering < 0 # GHC 8.4 via base-4.11.0.0
         - google-cloud < 0 # GHC 8.4 via base-4.11.0.0
         - grouped-list < 0 # GHC 8.4 via base-4.11.0.0
-        - hackage-security < 0 # GHC 8.4 via base-4.11.0.0
         - hashable-time < 0 # GHC 8.4 via base-4.11.0.0
         - haskell-lsp < 0 # GHC 8.4 via base-4.11.0.0
         - hjsonpointer < 0 # GHC 8.4 via base-4.11.0.0
@@ -3814,8 +3812,6 @@ packages:
         - json-schema < 0 # GHC 8.4 via generic-aeson
         - hint < 0 # GHC 8.4 via ghc-8.4.1
         - hmatrix-backprop < 0 # GHC 8.4 via ghc-typelits-knownnat
-        - stack < 0 # GHC 8.4 via hackage-security
-        - pandoc < 0 # GHC 8.4 via haddock-library-1.5.0.1
         - happstack-jmacro < 0 # GHC 8.4 via happstack-server
         - happstack-server-tls < 0 # GHC 8.4 via happstack-server
         - jmacro-rpc-happstack < 0 # GHC 8.4 via happstack-server
@@ -3824,10 +3820,6 @@ packages:
         - haskell-lsp-client < 0 # GHC 8.4 via haskell-lsp
         - hjsonschema < 0 # GHC 8.4 via hjsonpointer
         - IPv6DB < 0 # GHC 8.4 via hspec-2.5.0
-        - cayley-client < 0 # GHC 8.4 via hspec-2.5.0
-        - chatwork < 0 # GHC 8.4 via hspec-2.5.0
-        - clay < 0 # GHC 8.4 via hspec-2.5.0
-        - fmt < 0 # GHC 8.4 via hspec-2.5.0
         - genvalidity-aeson < 0 # GHC 8.4 via hspec-2.5.0
         - genvalidity-containers < 0 # GHC 8.4 via hspec-2.5.0
         - genvalidity-hspec < 0 # GHC 8.4 via hspec-2.5.0
@@ -3835,12 +3827,6 @@ packages:
         - genvalidity-property < 0 # GHC 8.4 via hspec-2.5.0
         - genvalidity-unordered-containers < 0 # GHC 8.4 via hspec-2.5.0
         - genvalidity-vector < 0 # GHC 8.4 via hspec-2.5.0
-        - haddock-library < 0 # GHC 8.4 via hspec-2.5.0
-        - hsyslog-udp < 0 # GHC 8.4 via hspec-2.5.0
-        - postgresql-simple-migration < 0 # GHC 8.4 via hspec-2.5.0
-        - rakuten < 0 # GHC 8.4 via hspec-2.5.0
-        - servant-kotlin < 0 # GHC 8.4 via hspec-2.5.0
-        - simple-log < 0 # GHC 8.4 via hspec-2.5.0
         - xmlhtml < 0 # GHC 8.4 via hspec-2.5.0
         - chatwork < 0 # GHC 8.4 via http-api-data-0.3.8.1
         - rakuten < 0 # GHC 8.4 via http-api-data-0.3.8.1
@@ -3926,7 +3912,6 @@ packages:
         - servant-subscriber < 0 # GHC 8.4 via servant-server
         - servant-websockets < 0 # GHC 8.4 via servant-server
         - hledger-api < 0 # GHC 8.4 via servant-swagger
-        - pandoc < 0 # GHC 8.4 via skylighting-0.7.1
         - pipes-text < 0 # GHC 8.4 via streaming-commons-0.2.0.0
         - highjson-swagger < 0 # GHC 8.4 via swagger2
         - highjson-th < 0 # GHC 8.4 via swagger2
@@ -3978,7 +3963,6 @@ packages:
         - haskintex < 0 # GHC 8.4 via hint
         - xmonad-extras < 0 # GHC 8.4 via hint
         - urlpath < 0 # GHC 8.4 via monad-control-aligned
-        - pandoc-citeproc < 0 # GHC 8.4 via pandoc
         - plot < 0 # GHC 8.4 via pango
         - eventful-postgresql < 0 # GHC 8.4 via persistent-postgresql
         - serversession-backend-persistent < 0 # GHC 8.4 via persistent-postgresql
@@ -4277,6 +4261,7 @@ skipped-tests:
     - GLFW-b # HUnit 1.6
     - haskell-tools-refactor # either, tasty, and tasty-hunit
     - hasql-transaction # rebase, see https://github.com/nikita-volkov/rebase/issues/11
+    - haddock-library # hspec 2.5
     - ip # hspec 2.5 https://github.com/andrewthad/haskell-ip/issues/33
     - lifted-base # HUnit 1.6
     - makefile # GHC 8.2
@@ -4352,6 +4337,7 @@ skipped-tests:
     - cryptohash-sha256
     - cryptohash-sha512
     - lzma
+    - resolv # tasty
     - token-bucket
     - uuid
     - uuid-types