diff --git a/build-constraints.yaml b/build-constraints.yaml
index 0ddb6354..1c43675d 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3511,10 +3511,6 @@ packages:
         - servant-docs < 0.11.1
         - servant-foreign < 0.10.2
 
-        # https://github.com/fpco/stackage/issues/3014
-        - hspec-wai < 0.9
-        - hspec-wai-json < 0.9
-
 # end of packages
 
 # Package flags are applied to individual packages, and override the values of
@@ -3775,6 +3771,10 @@ skipped-tests:
     - hpio # https://github.com/fpco/stackage/issues/2926
     - validation # https://github.com/fpco/stackage/issues/2949
 
+    # https://github.com/fpco/stackage/issues/3014
+    - servant-mock
+    - servant-server
+
 # end of skipped-tests
 
 # Tests which we should build and run, but which are expected to fail. We