diff --git a/build-constraints.yaml b/build-constraints.yaml
index 08b841e1..28407c3c 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -5104,7 +5104,6 @@ packages:
         - timeit
         - tls-session-manager
         - token-bucket
-        - tomland
         - tonatona
         - transformers-base
         - tree-diff
@@ -5210,6 +5209,7 @@ packages:
         - lens-labels < 0 # deprecated https://github.com/commercialhaskell/stackage/pull/4358
         - proto-lens-combinators < 0 # deprecated https://github.com/commercialhaskell/stackage/pull/4358
         - heart-core < 0 # deprecated
+        - tomland < 0
 
     "GHC upper bounds":
         # Need to always match the version shipped with GHC
@@ -6709,10 +6709,6 @@ packages:
       # https://github.com/commercialhaskell/stackage/issues/5959
       - attoparsec < 0.14.1
 
-      # https://github.com/commercialhaskell/stackage/issues/6116
-      - megaparsec < 9.1
-      - megaparsec-tests < 9.1
-
       # https://github.com/commercialhaskell/stackage/issues/6122
       - mmorph < 1.2
 
@@ -7084,7 +7080,6 @@ skipped-tests:
     - temporary-resourcet # tried temporary-resourcet-0.1.0.1, but its *test-suite* does not support: tasty-1.4.2
     - test-framework # tried test-framework-0.8.2.0, but its *test-suite* requires the disabled package: libxml
     - text-short # tried text-short-0.1.3, but its *test-suite* does not support: tasty-1.4.2
-    - tomland # tried tomland-1.3.3.0, but its *test-suite* does not support: hspec-2.8.3
     - transient # tried transient-0.7.0.0, but its *test-suite* does not support: random-1.2.0
     - tree-diff # tried tree-diff-0.2, but its *test-suite* does not support: tasty-1.4.2
     - tzdata # tried tzdata-0.2.20201021.0, but its *test-suite* requires the disabled package: test-framework-th