diff --git a/build-constraints.yaml b/build-constraints.yaml
index d5d4c5dc..4d5cf481 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -7345,12 +7345,8 @@ expected-test-failures:
     - download # https://github.com/fpco/stackage/issues/2811
     - rando # https://github.com/commercialhaskell/stackage/issues/4249
     - xml-picklers # https://github.com/Philonous/xml-picklers/issues/5
-    - hakyll # https://github.com/jaspervdj/hakyll/issues/682
     - hpack-dhall # https://github.com/BlockScope/hpack-dhall/issues/25
-    - bv-little # https://github.com/commercialhaskell/stackage/issues/4544
     - hpack # https://github.com/commercialhaskell/stackage/issues/4512
-    - kawhi # https://github.com/commercialhaskell/stackage/issues/4512
-    - loopbreaker # https://github.com/polysemy-research/loopbreaker/issues/10
     - nettle # https://github.com/stbuehler/haskell-nettle/issues/10
     - persistent-sqlite # https://github.com/yesodweb/persistent/issues/989
     - haskell-src-exts # https://github.com/commercialhaskell/stackage/issues/5151
@@ -7365,53 +7361,21 @@ expected-test-failures:
     - reanimate # https://github.com/commercialhaskell/stackage/issues/5626
 
     # Compilation failures
-    - amazonka-core # https://github.com/brendanhay/amazonka/issues/397
-    - async-timer # https://github.com/mtesseract/async-timer/issues/8
     - base16 # #5948/closed
-    - chronos # #5443/closed
-    - commutative # https://github.com/athanclark/commutative/issues/4
-    - conduit-throttle # https://github.com/mtesseract/conduit-throttle/issues/12
     - config-ini # https://github.com/aisamanra/config-ini/issues/22
-    - dhall # https://github.com/dhall-lang/dhall-haskell/issues/1985
-    - email-validate # https://github.com/Porges/email-validate-hs/issues/55
-    - haddock
-    - haskell-tools-builtin-refactorings
-    - heterocephalus # doctest requires hidden shakespeare and blaze-markup
-    - hgeometry # https://github.com/commercialhaskell/stackage/issues/5777
-    - http-conduit # #5948/closed
-    - hw-dsv # #5948/closed
     - hweblib # https://github.com/aycanirican/hweblib/issues/3
-    - iproute # doctest with hidden containers and other errors
-    - liquid-fixpoint # #5948/closed
-    - massiv
-    - mixed-types-num # https://github.com/commercialhaskell/stackage/issues/6005
-    - multiset # doctests require Glob, a hidden package
     - parameterized # # https://github.com/commercialhaskell/stackage/issues/5746
-    - perf # https://github.com/fpco/stackage/pull/2859
-    - persistent-qq # https://github.com/commercialhaskell/stackage/issues/6034
-    - picosat # https://github.com/fpco/stackage/pull/2382
-    - pkcs10 # https://github.com/fcomb/pkcs10-hs/issues/2
-    - prometheus-client # #5948/closed
     - relapse # #5948/closed
     - require # compilation failure https://github.com/commercialhaskell/stackage/issues/6093
     - secp256k1-haskell # #5948/closed
     - servant-static-th # Tasty issue: https://github.com/commercialhaskell/stackage/issues/6090
     - snap-core # random 1.2
-    - snappy # https://github.com/bos/snappy/issues/1
-    - sourcemap # https://github.com/chrisdone/sourcemap/issues/3
-    - squeal-postgresql # https://github.com/fpco/stackage/issues/3180
     - string-random # https://github.com/hiratara/hs-string-random/issues/16
     - text-icu # https://github.com/bos/text-icu/issues/32
-    - text-ldap # https://github.com/khibino/haskell-text-ldap/issues/1
     - type-of-html-static # https://github.com/commercialhaskell/stackage/issues/5728
-    - unicode-transforms # https://github.com/harendra-kumar/unicode-transforms/issues/15
     - vector-algorithms # http://hub.darcs.net/dolio/vector-algorithms/issue/9
     - vivid-supercollider # https://github.com/commercialhaskell/stackage/issues/4250
     - xmlgen # https://github.com/skogsbaer/xmlgen/issues/6
-    - yeshql # https://bitbucket.org/tdammers/yeshql/issues/1/stackage-nightly-test-failure
-    - yeshql-core # https://github.com/tdammers/yeshql/issues/6
-    - yeshql-hdbc # https://github.com/tdammers/yeshql/issues/6
-    - yesod-gitrev # https://github.com/DanBurton/yesod-gitrev/issues/5
 
     # Recursive deps https://github.com/fpco/stackage/issues/1818
     - options
@@ -7424,9 +7388,6 @@ expected-test-failures:
     - rounded # ExitFailure -11
     - shake-language-c # Cannot reproduce locally, looks like it may be a bug in Stack or curator
 
-    # Doctests require hidden Glob package
-    - makefile
-
     # Misc. Please check if there is a better section before adding more packages here.
     - Diff # https://github.com/commercialhaskell/stackage/issues/4289
     - algebraic-graphs # Module not visible https://github.com/commercialhaskell/stackage/issues/4670
@@ -7482,6 +7443,10 @@ expected-test-failures:
     - yesod-paginator
     - hledger-lib
 
+    # Doctests require hidden Glob package
+    - makefile
+    - multiset # doctests require Glob, a hidden package
+
     #
     # GHC 9 test compilation failures
     #