diff --git a/build-constraints.yaml b/build-constraints.yaml
index 9dc63fbc..3e92c9e0 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -710,7 +710,7 @@ packages:
 
     "Daniel Gröber <dxld@darkboxed.org> @DanielG":
         []
-        # - ghc-mod # BLOCKED pipes 4.2
+        # - ghc-mod # BLOCKED pipes 4.2 & optparse-applicative 0.13.0.0 when #1784 gets lifted
         # - cabal-helper # BLOCKED extra 1.5
 
     "Yann Esposito <yann.esposito@gmail.com> yogsototh @yogsototh":
@@ -905,7 +905,7 @@ packages:
         - cabal-rpm
         - cabal-sort
         - hslua
-        # - idris # BLOCKED aeson 1.0
+        # - idris # BLOCKED aeson 1.0 & optparse-applicative 0.13.0.0 after #1784
 
         - cairo
         - gio
@@ -2527,12 +2527,11 @@ packages:
         - SVGFonts < 1.6
 
         # https://github.com/fpco/stackage/issues/1784
-        - optparse-applicative < 0.13.0.0
+        - optparse-applicative < 0.13.0.0 # May need to disable test suite when lifting this https://github.com/pcapriotti/optparse-applicative/issues/228
         - diagrams-canvas < 1.3.0.7
         - diagrams-cairo < 1.3.1.2
         - diagrams-rasterific < 1.3.1.9
         - diagrams-svg < 1.4.0.4
-        - optparse-generic < 1.1.2
 
         # https://github.com/fpco/stackage/issues/1833
         - http-api-data < 0.3
@@ -2540,9 +2539,6 @@ packages:
         # https://github.com/fpco/stackage/issues/1842
         - dependent-sum < 0.4
 
-        # https://github.com/fpco/stackage/issues/1855
-        - ansigraph < 0.3.0.0
-
         # https://github.com/fpco/stackage/issues/1857
         - terminal-progress-bar < 0.1.0 # Re-enable tests when lifting this
 
@@ -2696,6 +2692,8 @@ skipped-tests:
     - shelly # https://github.com/yesodweb/Shelly.hs/issues/127
     - vector # https://github.com/haskell/vector/commit/31edb3fc51e76facc1e291f1e9e721663d91dbd8
     - zlib # 0.6.1.1-r3 https://github.com/haskell/zlib/issues/2
+    - newtype-generics # https://github.com/jcristovao/newtype-generics/issues/7
+    - uri-bytestring # via derive
 
     # Transitive outdated dependencies
     # These packages
@@ -3112,3 +3110,4 @@ tell-me-when-its-released:
 - bindings-GLFW-3.1.2.1 # skipped test-suite
 - vector-0.11.0.0 # skipped test-suite
 - criterion-1.1.1.0 # fixes build on windows, upgrade in LTS 7 #1912
+- newtype-generics-0.4.1 # resolves #1863