diff --git a/build-constraints.yaml b/build-constraints.yaml
index eea52ff4..a1a81578 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3724,6 +3724,8 @@ skipped-tests:
     - mysql-haskell # tasty
     - static-text # tasty
     - test-framework # QuickCheck 2.10
+    - ed25519 # QuickCheck, hlint and more
+    - hackage-security # QuickCheck
 
     # Transitive outdated dependencies
     # These can also be checked for updates periodically.
@@ -3740,6 +3742,7 @@ skipped-tests:
     # Compilation failures
     - proto-lens-combinators # https://github.com/google/proto-lens/issues/119
     - store # https://github.com/fpco/store/issues/125
+    - snappy # https://github.com/fpco/stackage/issues/3511
 
     # Runtime issues
     - blank-canvas # Never finishes https://github.com/ku-fpg/blank-canvas/issues/73
@@ -3809,11 +3812,6 @@ skipped-tests:
     - time-parsers
     - dlist-nonempty # QuickCheck2.11
 
-    # Uncategorized, please categorize!
-    - hackage-security # Cabal 2.0
-    - ed25519 # QuickCheck, hlint and more
-    - snappy # https://github.com/fpco/stackage/issues/3511
-
     # tasty 0.12 and tasty-hunit 0.10
     - airship
     - hakyll
@@ -3992,7 +3990,6 @@ expected-test-failures:
     - DRBG # https://github.com/TomMD/DRBG/issues/7
     - cayley-client # https://github.com/MichelBoucey/cayley-client/issues/2
     - download # https://github.com/fpco/stackage/issues/2811
-    - ed25519 # 0.0.5.0 https://github.com/thoughtpolice/hs-ed25519/issues/15
     - ghc-exactprint # https://github.com/alanz/ghc-exactprint/issues/47
     - llvm-hs-pretty # https://github.com/llvm-hs/llvm-hs-pretty/issues/48
     - nettle # https://github.com/stbuehler/haskell-nettle/issues/8