diff --git a/build-constraints.yaml b/build-constraints.yaml
index c27739e2..7704091d 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3157,7 +3157,6 @@ expected-test-failures:
 
     # Compilation failures
     - ListLike # No issue tracker, e-mail sent to maintainer
-    - Spock-core # https://github.com/agrafix/Spock/issues/102
     - commutative # https://github.com/athanclark/commutative/issues/4
     - dbus # 0.10.12 No issue tracker, e-mail sent to maintainer
     - folds # https://github.com/ekmett/folds/issues/12
@@ -3290,12 +3289,12 @@ skipped-benchmarks:
     - cipher-camellia # https://github.com/vincenthz/hs-crypto-cipher/issues/46
     - cipher-des # https://github.com/vincenthz/hs-crypto-cipher/issues/46
     - cipher-rc4 # https://github.com/vincenthz/hs-crypto-cipher/issues/46
+    - http2 # https://github.com/kazu-yamamoto/http2/pull/13, we can upgrade http2 in lts-6 when this is lifted.
 
     # GHC Bugs
     - hledger-lib # https://github.com/fpco/stackage/issues/1587
 
     - pipes # optparse-applicative 0.13
-    - http2 # OOM? https://github.com/fpco/stackage/issues/2232
 
 # end of skipped-benchmarks
 
@@ -3415,7 +3414,6 @@ tell-me-when-its-released:
 - yarr-1.4.0.2 # Re-enable package https://github.com/fpco/stackage/issues/1876
 - terminal-progress-bar-0.1.1 # Unskip test suite
 - optparse-applicative-0.13.0.0 # Unskip test suite https://github.com/pcapriotti/optparse-applicative/issues/228
-- Spock-core-0.11.0.0 # testsuite fail
 - vivid-0.2.0.5 # compilation failure
 
 # Packages which should be hidden after registering, to avoid module name