diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal
index 81186a0a21..82417ac0e3 100644
--- a/ghcide/ghcide.cabal
+++ b/ghcide/ghcide.cabal
@@ -1,4 +1,4 @@
-cabal-version:      2.2
+cabal-version:      2.4
 build-type:         Simple
 category:           Development
 name:               ghcide
@@ -15,13 +15,11 @@ homepage:           https://github.com/haskell/haskell-language-server/tree/mast
 bug-reports:        https://github.com/haskell/haskell-language-server/issues
 tested-with:        GHC == 8.6.4 || == 8.6.5 || == 8.8.2 || == 8.8.3 || == 8.8.4 || == 8.10.2 || == 8.10.3 || == 8.10.4
 extra-source-files: include/ghc-api-version.h README.md CHANGELOG.md
-                    test/data/hover/*.hs
-                    test/data/multi/cabal.project
-                    test/data/multi/hie.yaml
-                    test/data/multi/a/a.cabal
-                    test/data/multi/a/*.hs
-                    test/data/multi/b/b.cabal
-                    test/data/multi/b/*.hs
+                    test/data/**/*.project
+                    test/data/**/*.cabal
+                    test/data/**/*.yaml
+                    test/data/**/*.hs
+                    test/data/**/*.hs-boot
 
 source-repository head
     type:     git
diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
index daf705de91..37e87c4b31 100644
--- a/haskell-language-server.cabal
+++ b/haskell-language-server.cabal
@@ -1,4 +1,4 @@
-cabal-version:      2.2
+cabal-version:      2.4
 category:           Development
 name:               haskell-language-server
 version:            1.0.0.0
@@ -19,6 +19,15 @@ extra-source-files:
   README.md
   ChangeLog.md
   include/ghc-api-version.h
+  test/testdata/**/*.project
+  test/testdata/**/*.cabal
+  test/testdata/**/*.yaml
+  -- this one is not matched by the previous glob
+  test/testdata/hlint/ignore/.hlint.yaml
+  test/testdata/**/*.h
+  test/testdata/**/*.hs
+  test/testdata/**/*.expected
+  test/testdata/**/*.error
 
 flag pedantic
   description: Enable -Werror
diff --git a/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal b/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal
index 4b4940bf64..6e875daf57 100644
--- a/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal
+++ b/plugins/hls-brittany-plugin/hls-brittany-plugin.cabal
@@ -1,7 +1,8 @@
-cabal-version: 2.2
+cabal-version: 2.4
 name:          hls-brittany-plugin
 version:       1.0.0.0
 synopsis:      Integration with the Brittany code formatter
+description:   Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
 license:       Apache-2.0
 license-file:  LICENSE
 author:        The Haskell IDE Team
@@ -11,12 +12,13 @@ category:      Development
 build-type:    Simple
 extra-source-files:
   LICENSE
+  test/testdata/**/*.hs
 
 library
   exposed-modules:  Ide.Plugin.Brittany
   hs-source-dirs:   src
-  build-depends:    base
-               ,    brittany      >= 0.13.1.0
+  build-depends:    base             >=4.12 && <5
+               ,    brittany         >= 0.13.1.0
                ,    filepath
                ,    ghc
                ,    ghc-boot-th
diff --git a/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal b/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal
index f264bbf4ce..ff9a28ce47 100644
--- a/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal
+++ b/plugins/hls-tactics-plugin/hls-tactics-plugin.cabal
@@ -14,7 +14,11 @@ license-file:       LICENSE
 build-type:         Simple
 extra-source-files:
   README.md
---   ChangeLog.md
+  test/golden/*.cabal
+  test/golden/*.yaml
+  test/golden/*.hs
+  test/golden/*.hs.expected
+
 
 flag pedantic
   description: Enable -Werror