diff --git a/.github/mergify.yml b/.github/mergify.yml
index a4bc4c665be..4a1efe926a8 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,6 +1,3 @@
-# Note: We do not use the rebase strategy to merge PRs, because that
-# loses information needed by changelog-d to associate commits with PRs.
-
 pull_request_rules:
 
   # implementing PR delay logic: apply a label after 2 days of inactivity
@@ -32,7 +29,6 @@ pull_request_rules:
       - label=merge me
       - label=merge delay passed
       - '#approved-reviews-by>=2'
-      - '-label~=^blocked:'
 
   # merge+squash strategy
   - actions:
@@ -48,7 +44,6 @@ pull_request_rules:
       - label=squash+merge me
       - label=merge delay passed
       - '#approved-reviews-by>=2'
-      - '-label~=^blocked:'
 
   # merge+no rebase strategy
   - actions:
@@ -60,41 +55,8 @@ pull_request_rules:
       - label=merge+no rebase
       - label=merge delay passed
       - '#approved-reviews-by>=2'
-      - '-label~=^blocked:'
-
-  # merge strategy for release branches
-  - actions:
-      queue:
-        name: default
-        # Merge with a merge commit
-        method: merge
-        # Update the pr branch with rebase, so the history is clean
-        update_method: rebase
-    name: Put release branch pull requests in the rebase+merge queue
-    conditions:
-      - label=merge me
-      - base!=master
-      - -body~=backport
-      - '#approved-reviews-by>=2'
-      - '-label~=^blocked:'
-
-  # merge+squash strategy for release branches
-  - actions:
-      queue:
-        name: default
-        method: squash
-        # both update methods get absorbed by the squash, so we use the most
-        # reliable
-        update_method: merge
-    name: Put release branch pull requests in the squash+merge queue
-    conditions:
-      - base!=master
-      - label=squash+merge me
-      - -body~=backport
-      - '#approved-reviews-by>=2'
-      - '-label~=^blocked:'
 
-  # merge strategy for backports: require 1 approver instead of 2
+  # rebase+merge strategy for backports: require 1 approver instead of 2
   - actions:
       queue:
         name: default
@@ -108,7 +70,6 @@ pull_request_rules:
       - base!=master
       - body~=backport
       - '#approved-reviews-by>=1'
-      - '-label~=^blocked:'
 
   # merge+squash strategy for backports: require 1 approver instead of 2
   - actions:
@@ -124,7 +85,6 @@ pull_request_rules:
       - base!=master
       - body~=backport
       - '#approved-reviews-by>=1'
-      - '-label~=^blocked:'
 
   # backports should be labeled as such
   - actions:
diff --git a/Cabal-described/Cabal-described.cabal b/Cabal-described/Cabal-described.cabal
index 8f7f9c66750..d8471940cea 100644
--- a/Cabal-described/Cabal-described.cabal
+++ b/Cabal-described/Cabal-described.cabal
@@ -18,8 +18,8 @@ library
     , pretty
     , QuickCheck
     , rere              >=0.1 && <0.3
-    , tasty
-    , tasty-quickcheck
+    , tasty             <1.6
+    , tasty-quickcheck  <0.11
 
   exposed-modules:
     Distribution.Described
diff --git a/Cabal-tests/Cabal-tests.cabal b/Cabal-tests/Cabal-tests.cabal
index f48222332f4..dd443d1fc21 100644
--- a/Cabal-tests/Cabal-tests.cabal
+++ b/Cabal-tests/Cabal-tests.cabal
@@ -71,7 +71,7 @@ test-suite unit-tests
     , QuickCheck          >=2.14  && <2.15
     , tasty               >=1.2.3 && <1.6
     , tasty-hunit
-    , tasty-quickcheck
+    , tasty-quickcheck    <0.11
     , temporary
     , text
 
@@ -176,7 +176,7 @@ test-suite rpmvercmp
       QuickCheck
     , tasty             >=1.2.3 && <1.6
     , tasty-hunit
-    , tasty-quickcheck
+    , tasty-quickcheck  <0.11
 
   c-sources:        tests/cbits/rpmvercmp.c
   cc-options:       -Wall
diff --git a/cabal-install-solver/cabal-install-solver.cabal b/cabal-install-solver/cabal-install-solver.cabal
index 6918f739b88..b2b2b12b7af 100644
--- a/cabal-install-solver/cabal-install-solver.cabal
+++ b/cabal-install-solver/cabal-install-solver.cabal
@@ -135,5 +135,5 @@ Test-Suite unit-tests
      , Cabal-syntax
      , cabal-install-solver
      , tasty       >= 1.2.3 && <1.6
-     , tasty-quickcheck
+     , tasty-quickcheck <0.11
      , tasty-hunit >= 0.10
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index f00041aa9e3..5f20b3db947 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -350,7 +350,7 @@ test-suite unit-tests
           zlib,
           tasty >= 1.2.3 && <1.6,
           tasty-golden >=2.3.1.1 && <2.4,
-          tasty-quickcheck,
+          tasty-quickcheck <0.11,
           tasty-expected-failure,
           tasty-hunit >= 0.10,
           tree-diff,
@@ -438,6 +438,6 @@ test-suite long-tests
         tasty >= 1.2.3 && <1.6,
         tasty-expected-failure,
         tasty-hunit >= 0.10,
-        tasty-quickcheck,
+        tasty-quickcheck <0.11,
         QuickCheck >= 2.14 && <2.16,
         pretty-show >= 1.6.15