diff --git a/ghcide-bench/src/Experiments.hs b/ghcide-bench/src/Experiments.hs
index e9da50c2c8..c53ffd0a7c 100644
--- a/ghcide-bench/src/Experiments.hs
+++ b/ghcide-bench/src/Experiments.hs
@@ -857,11 +857,9 @@ getBuildEdgesCount = tryCallTestPlugin GetBuildEdgesCount
 getRebuildsCount :: Session (Either (TResponseError @ClientToServer (Method_CustomMethod "test")) Int)
 getRebuildsCount = tryCallTestPlugin GetRebuildsCount
 
--- Copy&paste from ghcide/test/Development.IDE.Test
 getStoredKeys :: Session [Text]
 getStoredKeys = callTestPlugin GetStoredKeys
 
--- Copy&paste from ghcide/test/Development.IDE.Test
 tryCallTestPlugin :: (A.FromJSON b) => TestRequest -> Session (Either (TResponseError @ClientToServer (Method_CustomMethod "test")) b)
 tryCallTestPlugin cmd = do
     let cm = SMethod_CustomMethod (Proxy @"test")
@@ -873,7 +871,6 @@ tryCallTestPlugin cmd = do
              A.Success a -> Right a
              A.Error e   -> error e
 
--- Copy&paste from ghcide/test/Development.IDE.Test
 callTestPlugin :: (A.FromJSON b) => TestRequest -> Session b
 callTestPlugin cmd = do
     res <- tryCallTestPlugin cmd
diff --git a/ghcide/test/LICENSE b/ghcide-test/LICENSE
similarity index 100%
rename from ghcide/test/LICENSE
rename to ghcide-test/LICENSE
diff --git a/ghcide/test/data/TH/THA.hs b/ghcide-test/data/TH/THA.hs
similarity index 100%
rename from ghcide/test/data/TH/THA.hs
rename to ghcide-test/data/TH/THA.hs
diff --git a/ghcide/test/data/TH/THB.hs b/ghcide-test/data/TH/THB.hs
similarity index 100%
rename from ghcide/test/data/TH/THB.hs
rename to ghcide-test/data/TH/THB.hs
diff --git a/ghcide/test/data/TH/THC.hs b/ghcide-test/data/TH/THC.hs
similarity index 100%
rename from ghcide/test/data/TH/THC.hs
rename to ghcide-test/data/TH/THC.hs
diff --git a/ghcide/test/data/TH/hie.yaml b/ghcide-test/data/TH/hie.yaml
similarity index 100%
rename from ghcide/test/data/TH/hie.yaml
rename to ghcide-test/data/TH/hie.yaml
diff --git a/ghcide/test/data/THCoreFile/THA.hs b/ghcide-test/data/THCoreFile/THA.hs
similarity index 100%
rename from ghcide/test/data/THCoreFile/THA.hs
rename to ghcide-test/data/THCoreFile/THA.hs
diff --git a/ghcide/test/data/THCoreFile/THB.hs b/ghcide-test/data/THCoreFile/THB.hs
similarity index 100%
rename from ghcide/test/data/THCoreFile/THB.hs
rename to ghcide-test/data/THCoreFile/THB.hs
diff --git a/ghcide/test/data/THCoreFile/THC.hs b/ghcide-test/data/THCoreFile/THC.hs
similarity index 100%
rename from ghcide/test/data/THCoreFile/THC.hs
rename to ghcide-test/data/THCoreFile/THC.hs
diff --git a/ghcide/test/data/THCoreFile/hie.yaml b/ghcide-test/data/THCoreFile/hie.yaml
similarity index 100%
rename from ghcide/test/data/THCoreFile/hie.yaml
rename to ghcide-test/data/THCoreFile/hie.yaml
diff --git a/ghcide/test/data/THLoading/A.hs b/ghcide-test/data/THLoading/A.hs
similarity index 100%
rename from ghcide/test/data/THLoading/A.hs
rename to ghcide-test/data/THLoading/A.hs
diff --git a/ghcide/test/data/THLoading/B.hs b/ghcide-test/data/THLoading/B.hs
similarity index 100%
rename from ghcide/test/data/THLoading/B.hs
rename to ghcide-test/data/THLoading/B.hs
diff --git a/ghcide/test/data/THLoading/THA.hs b/ghcide-test/data/THLoading/THA.hs
similarity index 100%
rename from ghcide/test/data/THLoading/THA.hs
rename to ghcide-test/data/THLoading/THA.hs
diff --git a/ghcide/test/data/THLoading/THB.hs b/ghcide-test/data/THLoading/THB.hs
similarity index 100%
rename from ghcide/test/data/THLoading/THB.hs
rename to ghcide-test/data/THLoading/THB.hs
diff --git a/ghcide/test/data/THLoading/hie.yaml b/ghcide-test/data/THLoading/hie.yaml
similarity index 100%
rename from ghcide/test/data/THLoading/hie.yaml
rename to ghcide-test/data/THLoading/hie.yaml
diff --git a/ghcide/test/data/THNewName/A.hs b/ghcide-test/data/THNewName/A.hs
similarity index 100%
rename from ghcide/test/data/THNewName/A.hs
rename to ghcide-test/data/THNewName/A.hs
diff --git a/ghcide/test/data/THNewName/B.hs b/ghcide-test/data/THNewName/B.hs
similarity index 100%
rename from ghcide/test/data/THNewName/B.hs
rename to ghcide-test/data/THNewName/B.hs
diff --git a/ghcide/test/data/THNewName/C.hs b/ghcide-test/data/THNewName/C.hs
similarity index 100%
rename from ghcide/test/data/THNewName/C.hs
rename to ghcide-test/data/THNewName/C.hs
diff --git a/ghcide/test/data/THNewName/hie.yaml b/ghcide-test/data/THNewName/hie.yaml
similarity index 100%
rename from ghcide/test/data/THNewName/hie.yaml
rename to ghcide-test/data/THNewName/hie.yaml
diff --git a/ghcide/test/data/THUnboxed/THA.hs b/ghcide-test/data/THUnboxed/THA.hs
similarity index 100%
rename from ghcide/test/data/THUnboxed/THA.hs
rename to ghcide-test/data/THUnboxed/THA.hs
diff --git a/ghcide/test/data/THUnboxed/THB.hs b/ghcide-test/data/THUnboxed/THB.hs
similarity index 100%
rename from ghcide/test/data/THUnboxed/THB.hs
rename to ghcide-test/data/THUnboxed/THB.hs
diff --git a/ghcide/test/data/THUnboxed/THC.hs b/ghcide-test/data/THUnboxed/THC.hs
similarity index 100%
rename from ghcide/test/data/THUnboxed/THC.hs
rename to ghcide-test/data/THUnboxed/THC.hs
diff --git a/ghcide/test/data/THUnboxed/hie.yaml b/ghcide-test/data/THUnboxed/hie.yaml
similarity index 100%
rename from ghcide/test/data/THUnboxed/hie.yaml
rename to ghcide-test/data/THUnboxed/hie.yaml
diff --git a/ghcide/test/data/boot/A.hs b/ghcide-test/data/boot/A.hs
similarity index 100%
rename from ghcide/test/data/boot/A.hs
rename to ghcide-test/data/boot/A.hs
diff --git a/ghcide/test/data/boot/A.hs-boot b/ghcide-test/data/boot/A.hs-boot
similarity index 100%
rename from ghcide/test/data/boot/A.hs-boot
rename to ghcide-test/data/boot/A.hs-boot
diff --git a/ghcide/test/data/boot/B.hs b/ghcide-test/data/boot/B.hs
similarity index 100%
rename from ghcide/test/data/boot/B.hs
rename to ghcide-test/data/boot/B.hs
diff --git a/ghcide/test/data/boot/C.hs b/ghcide-test/data/boot/C.hs
similarity index 100%
rename from ghcide/test/data/boot/C.hs
rename to ghcide-test/data/boot/C.hs
diff --git a/ghcide/test/data/boot/hie.yaml b/ghcide-test/data/boot/hie.yaml
similarity index 100%
rename from ghcide/test/data/boot/hie.yaml
rename to ghcide-test/data/boot/hie.yaml
diff --git a/ghcide/test/data/boot2/A.hs b/ghcide-test/data/boot2/A.hs
similarity index 100%
rename from ghcide/test/data/boot2/A.hs
rename to ghcide-test/data/boot2/A.hs
diff --git a/ghcide/test/data/boot2/B.hs b/ghcide-test/data/boot2/B.hs
similarity index 100%
rename from ghcide/test/data/boot2/B.hs
rename to ghcide-test/data/boot2/B.hs
diff --git a/ghcide/test/data/boot2/B.hs-boot b/ghcide-test/data/boot2/B.hs-boot
similarity index 100%
rename from ghcide/test/data/boot2/B.hs-boot
rename to ghcide-test/data/boot2/B.hs-boot
diff --git a/ghcide/test/data/boot2/C.hs b/ghcide-test/data/boot2/C.hs
similarity index 100%
rename from ghcide/test/data/boot2/C.hs
rename to ghcide-test/data/boot2/C.hs
diff --git a/ghcide/test/data/boot2/D.hs b/ghcide-test/data/boot2/D.hs
similarity index 100%
rename from ghcide/test/data/boot2/D.hs
rename to ghcide-test/data/boot2/D.hs
diff --git a/ghcide/test/data/boot2/E.hs b/ghcide-test/data/boot2/E.hs
similarity index 100%
rename from ghcide/test/data/boot2/E.hs
rename to ghcide-test/data/boot2/E.hs
diff --git a/ghcide/test/data/boot2/hie.yaml b/ghcide-test/data/boot2/hie.yaml
similarity index 100%
rename from ghcide/test/data/boot2/hie.yaml
rename to ghcide-test/data/boot2/hie.yaml
diff --git a/ghcide/test/data/cabal-exe/a/a.cabal b/ghcide-test/data/cabal-exe/a/a.cabal
similarity index 100%
rename from ghcide/test/data/cabal-exe/a/a.cabal
rename to ghcide-test/data/cabal-exe/a/a.cabal
diff --git a/ghcide/test/data/cabal-exe/a/src/Main.hs b/ghcide-test/data/cabal-exe/a/src/Main.hs
similarity index 100%
rename from ghcide/test/data/cabal-exe/a/src/Main.hs
rename to ghcide-test/data/cabal-exe/a/src/Main.hs
diff --git a/ghcide/test/data/cabal-exe/cabal.project b/ghcide-test/data/cabal-exe/cabal.project
similarity index 100%
rename from ghcide/test/data/cabal-exe/cabal.project
rename to ghcide-test/data/cabal-exe/cabal.project
diff --git a/ghcide/test/data/cabal-exe/hie.yaml b/ghcide-test/data/cabal-exe/hie.yaml
similarity index 100%
rename from ghcide/test/data/cabal-exe/hie.yaml
rename to ghcide-test/data/cabal-exe/hie.yaml
diff --git a/ghcide/test/data/hover/Bar.hs b/ghcide-test/data/hover/Bar.hs
similarity index 100%
rename from ghcide/test/data/hover/Bar.hs
rename to ghcide-test/data/hover/Bar.hs
diff --git a/ghcide/test/data/hover/Foo.hs b/ghcide-test/data/hover/Foo.hs
similarity index 100%
rename from ghcide/test/data/hover/Foo.hs
rename to ghcide-test/data/hover/Foo.hs
diff --git a/ghcide/test/data/hover/GotoHover.hs b/ghcide-test/data/hover/GotoHover.hs
similarity index 100%
rename from ghcide/test/data/hover/GotoHover.hs
rename to ghcide-test/data/hover/GotoHover.hs
diff --git a/ghcide/test/data/hover/GotoImplementation.hs b/ghcide-test/data/hover/GotoImplementation.hs
similarity index 100%
rename from ghcide/test/data/hover/GotoImplementation.hs
rename to ghcide-test/data/hover/GotoImplementation.hs
diff --git a/ghcide/test/data/hover/RecordDotSyntax.hs b/ghcide-test/data/hover/RecordDotSyntax.hs
similarity index 100%
rename from ghcide/test/data/hover/RecordDotSyntax.hs
rename to ghcide-test/data/hover/RecordDotSyntax.hs
diff --git a/ghcide/test/data/hover/hie.yaml b/ghcide-test/data/hover/hie.yaml
similarity index 100%
rename from ghcide/test/data/hover/hie.yaml
rename to ghcide-test/data/hover/hie.yaml
diff --git a/ghcide/test/data/ignore-fatal/IgnoreFatal.hs b/ghcide-test/data/ignore-fatal/IgnoreFatal.hs
similarity index 100%
rename from ghcide/test/data/ignore-fatal/IgnoreFatal.hs
rename to ghcide-test/data/ignore-fatal/IgnoreFatal.hs
diff --git a/ghcide/test/data/ignore-fatal/cabal.project b/ghcide-test/data/ignore-fatal/cabal.project
similarity index 100%
rename from ghcide/test/data/ignore-fatal/cabal.project
rename to ghcide-test/data/ignore-fatal/cabal.project
diff --git a/ghcide/test/data/ignore-fatal/hie.yaml b/ghcide-test/data/ignore-fatal/hie.yaml
similarity index 100%
rename from ghcide/test/data/ignore-fatal/hie.yaml
rename to ghcide-test/data/ignore-fatal/hie.yaml
diff --git a/ghcide/test/data/ignore-fatal/ignore-fatal.cabal b/ghcide-test/data/ignore-fatal/ignore-fatal.cabal
similarity index 100%
rename from ghcide/test/data/ignore-fatal/ignore-fatal.cabal
rename to ghcide-test/data/ignore-fatal/ignore-fatal.cabal
diff --git a/ghcide/test/data/multi-unit-reexport/a-1.0.0-inplace b/ghcide-test/data/multi-unit-reexport/a-1.0.0-inplace
similarity index 100%
rename from ghcide/test/data/multi-unit-reexport/a-1.0.0-inplace
rename to ghcide-test/data/multi-unit-reexport/a-1.0.0-inplace
diff --git a/ghcide/test/data/multi-unit-reexport/a/A.hs b/ghcide-test/data/multi-unit-reexport/a/A.hs
similarity index 100%
rename from ghcide/test/data/multi-unit-reexport/a/A.hs
rename to ghcide-test/data/multi-unit-reexport/a/A.hs
diff --git a/ghcide/test/data/multi-unit-reexport/b-1.0.0-inplace b/ghcide-test/data/multi-unit-reexport/b-1.0.0-inplace
similarity index 100%
rename from ghcide/test/data/multi-unit-reexport/b-1.0.0-inplace
rename to ghcide-test/data/multi-unit-reexport/b-1.0.0-inplace
diff --git a/ghcide/test/data/multi-unit-reexport/b/B.hs b/ghcide-test/data/multi-unit-reexport/b/B.hs
similarity index 100%
rename from ghcide/test/data/multi-unit-reexport/b/B.hs
rename to ghcide-test/data/multi-unit-reexport/b/B.hs
diff --git a/ghcide/test/data/multi-unit-reexport/c-1.0.0-inplace b/ghcide-test/data/multi-unit-reexport/c-1.0.0-inplace
similarity index 100%
rename from ghcide/test/data/multi-unit-reexport/c-1.0.0-inplace
rename to ghcide-test/data/multi-unit-reexport/c-1.0.0-inplace
diff --git a/ghcide/test/data/multi-unit-reexport/c/C.hs b/ghcide-test/data/multi-unit-reexport/c/C.hs
similarity index 100%
rename from ghcide/test/data/multi-unit-reexport/c/C.hs
rename to ghcide-test/data/multi-unit-reexport/c/C.hs
diff --git a/ghcide/test/data/multi-unit-reexport/cabal.project b/ghcide-test/data/multi-unit-reexport/cabal.project
similarity index 100%
rename from ghcide/test/data/multi-unit-reexport/cabal.project
rename to ghcide-test/data/multi-unit-reexport/cabal.project
diff --git a/ghcide/test/data/multi-unit-reexport/hie.yaml b/ghcide-test/data/multi-unit-reexport/hie.yaml
similarity index 100%
rename from ghcide/test/data/multi-unit-reexport/hie.yaml
rename to ghcide-test/data/multi-unit-reexport/hie.yaml
diff --git a/ghcide/test/data/multi-unit/a-1.0.0-inplace b/ghcide-test/data/multi-unit/a-1.0.0-inplace
similarity index 100%
rename from ghcide/test/data/multi-unit/a-1.0.0-inplace
rename to ghcide-test/data/multi-unit/a-1.0.0-inplace
diff --git a/ghcide/test/data/multi-unit/a/A.hs b/ghcide-test/data/multi-unit/a/A.hs
similarity index 100%
rename from ghcide/test/data/multi-unit/a/A.hs
rename to ghcide-test/data/multi-unit/a/A.hs
diff --git a/ghcide/test/data/multi-unit/b-1.0.0-inplace b/ghcide-test/data/multi-unit/b-1.0.0-inplace
similarity index 100%
rename from ghcide/test/data/multi-unit/b-1.0.0-inplace
rename to ghcide-test/data/multi-unit/b-1.0.0-inplace
diff --git a/ghcide/test/data/multi-unit/b/B.hs b/ghcide-test/data/multi-unit/b/B.hs
similarity index 100%
rename from ghcide/test/data/multi-unit/b/B.hs
rename to ghcide-test/data/multi-unit/b/B.hs
diff --git a/ghcide/test/data/multi-unit/c-1.0.0-inplace b/ghcide-test/data/multi-unit/c-1.0.0-inplace
similarity index 100%
rename from ghcide/test/data/multi-unit/c-1.0.0-inplace
rename to ghcide-test/data/multi-unit/c-1.0.0-inplace
diff --git a/ghcide/test/data/multi-unit/c/C.hs b/ghcide-test/data/multi-unit/c/C.hs
similarity index 100%
rename from ghcide/test/data/multi-unit/c/C.hs
rename to ghcide-test/data/multi-unit/c/C.hs
diff --git a/ghcide/test/data/multi-unit/cabal.project b/ghcide-test/data/multi-unit/cabal.project
similarity index 100%
rename from ghcide/test/data/multi-unit/cabal.project
rename to ghcide-test/data/multi-unit/cabal.project
diff --git a/ghcide/test/data/multi-unit/hie.yaml b/ghcide-test/data/multi-unit/hie.yaml
similarity index 100%
rename from ghcide/test/data/multi-unit/hie.yaml
rename to ghcide-test/data/multi-unit/hie.yaml
diff --git a/ghcide/test/data/multi/a/A.hs b/ghcide-test/data/multi/a/A.hs
similarity index 100%
rename from ghcide/test/data/multi/a/A.hs
rename to ghcide-test/data/multi/a/A.hs
diff --git a/ghcide/test/data/multi/a/a.cabal b/ghcide-test/data/multi/a/a.cabal
similarity index 100%
rename from ghcide/test/data/multi/a/a.cabal
rename to ghcide-test/data/multi/a/a.cabal
diff --git a/ghcide/test/data/multi/b/B.hs b/ghcide-test/data/multi/b/B.hs
similarity index 100%
rename from ghcide/test/data/multi/b/B.hs
rename to ghcide-test/data/multi/b/B.hs
diff --git a/ghcide/test/data/multi/b/b.cabal b/ghcide-test/data/multi/b/b.cabal
similarity index 100%
rename from ghcide/test/data/multi/b/b.cabal
rename to ghcide-test/data/multi/b/b.cabal
diff --git a/ghcide/test/data/multi/c/C.hs b/ghcide-test/data/multi/c/C.hs
similarity index 100%
rename from ghcide/test/data/multi/c/C.hs
rename to ghcide-test/data/multi/c/C.hs
diff --git a/ghcide/test/data/multi/c/c.cabal b/ghcide-test/data/multi/c/c.cabal
similarity index 100%
rename from ghcide/test/data/multi/c/c.cabal
rename to ghcide-test/data/multi/c/c.cabal
diff --git a/ghcide/test/data/multi/cabal.project b/ghcide-test/data/multi/cabal.project
similarity index 100%
rename from ghcide/test/data/multi/cabal.project
rename to ghcide-test/data/multi/cabal.project
diff --git a/ghcide/test/data/multi/hie.yaml b/ghcide-test/data/multi/hie.yaml
similarity index 100%
rename from ghcide/test/data/multi/hie.yaml
rename to ghcide-test/data/multi/hie.yaml
diff --git a/ghcide/test/data/plugin-knownnat/KnownNat.hs b/ghcide-test/data/plugin-knownnat/KnownNat.hs
similarity index 100%
rename from ghcide/test/data/plugin-knownnat/KnownNat.hs
rename to ghcide-test/data/plugin-knownnat/KnownNat.hs
diff --git a/ghcide/test/data/plugin-knownnat/cabal.project b/ghcide-test/data/plugin-knownnat/cabal.project
similarity index 100%
rename from ghcide/test/data/plugin-knownnat/cabal.project
rename to ghcide-test/data/plugin-knownnat/cabal.project
diff --git a/ghcide/test/data/plugin-knownnat/plugin.cabal b/ghcide-test/data/plugin-knownnat/plugin.cabal
similarity index 100%
rename from ghcide/test/data/plugin-knownnat/plugin.cabal
rename to ghcide-test/data/plugin-knownnat/plugin.cabal
diff --git a/ghcide/test/data/recomp/A.hs b/ghcide-test/data/recomp/A.hs
similarity index 100%
rename from ghcide/test/data/recomp/A.hs
rename to ghcide-test/data/recomp/A.hs
diff --git a/ghcide/test/data/recomp/B.hs b/ghcide-test/data/recomp/B.hs
similarity index 100%
rename from ghcide/test/data/recomp/B.hs
rename to ghcide-test/data/recomp/B.hs
diff --git a/ghcide/test/data/recomp/P.hs b/ghcide-test/data/recomp/P.hs
similarity index 100%
rename from ghcide/test/data/recomp/P.hs
rename to ghcide-test/data/recomp/P.hs
diff --git a/ghcide/test/data/recomp/hie.yaml b/ghcide-test/data/recomp/hie.yaml
similarity index 100%
rename from ghcide/test/data/recomp/hie.yaml
rename to ghcide-test/data/recomp/hie.yaml
diff --git a/ghcide/test/data/references/Main.hs b/ghcide-test/data/references/Main.hs
similarity index 100%
rename from ghcide/test/data/references/Main.hs
rename to ghcide-test/data/references/Main.hs
diff --git a/ghcide/test/data/references/OtherModule.hs b/ghcide-test/data/references/OtherModule.hs
similarity index 100%
rename from ghcide/test/data/references/OtherModule.hs
rename to ghcide-test/data/references/OtherModule.hs
diff --git a/ghcide/test/data/references/OtherOtherModule.hs b/ghcide-test/data/references/OtherOtherModule.hs
similarity index 100%
rename from ghcide/test/data/references/OtherOtherModule.hs
rename to ghcide-test/data/references/OtherOtherModule.hs
diff --git a/ghcide/test/data/references/References.hs b/ghcide-test/data/references/References.hs
similarity index 100%
rename from ghcide/test/data/references/References.hs
rename to ghcide-test/data/references/References.hs
diff --git a/ghcide/test/data/references/hie.yaml b/ghcide-test/data/references/hie.yaml
similarity index 100%
rename from ghcide/test/data/references/hie.yaml
rename to ghcide-test/data/references/hie.yaml
diff --git a/ghcide/test/data/rootUri/dirA/Foo.hs b/ghcide-test/data/rootUri/dirA/Foo.hs
similarity index 100%
rename from ghcide/test/data/rootUri/dirA/Foo.hs
rename to ghcide-test/data/rootUri/dirA/Foo.hs
diff --git a/ghcide/test/data/rootUri/dirA/foo.cabal b/ghcide-test/data/rootUri/dirA/foo.cabal
similarity index 100%
rename from ghcide/test/data/rootUri/dirA/foo.cabal
rename to ghcide-test/data/rootUri/dirA/foo.cabal
diff --git a/ghcide/test/data/rootUri/dirB/Foo.hs b/ghcide-test/data/rootUri/dirB/Foo.hs
similarity index 100%
rename from ghcide/test/data/rootUri/dirB/Foo.hs
rename to ghcide-test/data/rootUri/dirB/Foo.hs
diff --git a/ghcide/test/data/rootUri/dirB/foo.cabal b/ghcide-test/data/rootUri/dirB/foo.cabal
similarity index 100%
rename from ghcide/test/data/rootUri/dirB/foo.cabal
rename to ghcide-test/data/rootUri/dirB/foo.cabal
diff --git a/ghcide/test/data/symlink/hie.yaml b/ghcide-test/data/symlink/hie.yaml
similarity index 100%
rename from ghcide/test/data/symlink/hie.yaml
rename to ghcide-test/data/symlink/hie.yaml
diff --git a/ghcide/test/data/symlink/other_loc/.gitkeep b/ghcide-test/data/symlink/other_loc/.gitkeep
similarity index 100%
rename from ghcide/test/data/symlink/other_loc/.gitkeep
rename to ghcide-test/data/symlink/other_loc/.gitkeep
diff --git a/ghcide/test/data/symlink/some_loc/Sym.hs b/ghcide-test/data/symlink/some_loc/Sym.hs
similarity index 100%
rename from ghcide/test/data/symlink/some_loc/Sym.hs
rename to ghcide-test/data/symlink/some_loc/Sym.hs
diff --git a/ghcide/test/data/symlink/src/Foo.hs b/ghcide-test/data/symlink/src/Foo.hs
similarity index 100%
rename from ghcide/test/data/symlink/src/Foo.hs
rename to ghcide-test/data/symlink/src/Foo.hs
diff --git a/ghcide/test/data/working-dir/a/A.hs b/ghcide-test/data/working-dir/a/A.hs
similarity index 100%
rename from ghcide/test/data/working-dir/a/A.hs
rename to ghcide-test/data/working-dir/a/A.hs
diff --git a/ghcide/test/data/working-dir/a/B.hs b/ghcide-test/data/working-dir/a/B.hs
similarity index 100%
rename from ghcide/test/data/working-dir/a/B.hs
rename to ghcide-test/data/working-dir/a/B.hs
diff --git a/ghcide/test/data/working-dir/a/a.cabal b/ghcide-test/data/working-dir/a/a.cabal
similarity index 100%
rename from ghcide/test/data/working-dir/a/a.cabal
rename to ghcide-test/data/working-dir/a/a.cabal
diff --git a/ghcide/test/data/working-dir/a/wdtest b/ghcide-test/data/working-dir/a/wdtest
similarity index 100%
rename from ghcide/test/data/working-dir/a/wdtest
rename to ghcide-test/data/working-dir/a/wdtest
diff --git a/ghcide/test/data/working-dir/cabal.project b/ghcide-test/data/working-dir/cabal.project
similarity index 100%
rename from ghcide/test/data/working-dir/cabal.project
rename to ghcide-test/data/working-dir/cabal.project
diff --git a/ghcide/test/data/working-dir/hie.yaml b/ghcide-test/data/working-dir/hie.yaml
similarity index 100%
rename from ghcide/test/data/working-dir/hie.yaml
rename to ghcide-test/data/working-dir/hie.yaml
diff --git a/ghcide/test/exe/AsyncTests.hs b/ghcide-test/exe/AsyncTests.hs
similarity index 100%
rename from ghcide/test/exe/AsyncTests.hs
rename to ghcide-test/exe/AsyncTests.hs
diff --git a/ghcide/test/exe/BootTests.hs b/ghcide-test/exe/BootTests.hs
similarity index 100%
rename from ghcide/test/exe/BootTests.hs
rename to ghcide-test/exe/BootTests.hs
diff --git a/ghcide/test/exe/CPPTests.hs b/ghcide-test/exe/CPPTests.hs
similarity index 100%
rename from ghcide/test/exe/CPPTests.hs
rename to ghcide-test/exe/CPPTests.hs
diff --git a/ghcide/test/exe/ClientSettingsTests.hs b/ghcide-test/exe/ClientSettingsTests.hs
similarity index 100%
rename from ghcide/test/exe/ClientSettingsTests.hs
rename to ghcide-test/exe/ClientSettingsTests.hs
diff --git a/ghcide/test/exe/CodeLensTests.hs b/ghcide-test/exe/CodeLensTests.hs
similarity index 100%
rename from ghcide/test/exe/CodeLensTests.hs
rename to ghcide-test/exe/CodeLensTests.hs
diff --git a/ghcide/test/exe/CompletionTests.hs b/ghcide-test/exe/CompletionTests.hs
similarity index 100%
rename from ghcide/test/exe/CompletionTests.hs
rename to ghcide-test/exe/CompletionTests.hs
diff --git a/ghcide/test/exe/Config.hs b/ghcide-test/exe/Config.hs
similarity index 99%
rename from ghcide/test/exe/Config.hs
rename to ghcide-test/exe/Config.hs
index 19ae47c67b..c98023e90e 100644
--- a/ghcide/test/exe/Config.hs
+++ b/ghcide-test/exe/Config.hs
@@ -28,6 +28,7 @@ module Config(
     , withLongTimeout
     , lspTestCaps
     , lspTestCapsNoFileWatches
+    , testDataDir
     ) where
 
 import           Control.Exception           (bracket_)
@@ -47,7 +48,7 @@ import           Test.Hls
 import qualified Test.Hls.FileSystem         as FS
 
 testDataDir :: FilePath
-testDataDir = "ghcide" </> "test" </> "data"
+testDataDir = "ghcide-test" </> "data"
 
 mkIdeTestFs :: [FS.FileTree] -> FS.VirtualFileTree
 mkIdeTestFs = FS.mkVirtualFileTree testDataDir
diff --git a/ghcide/test/exe/CradleTests.hs b/ghcide-test/exe/CradleTests.hs
similarity index 100%
rename from ghcide/test/exe/CradleTests.hs
rename to ghcide-test/exe/CradleTests.hs
diff --git a/ghcide/test/exe/DependentFileTest.hs b/ghcide-test/exe/DependentFileTest.hs
similarity index 100%
rename from ghcide/test/exe/DependentFileTest.hs
rename to ghcide-test/exe/DependentFileTest.hs
diff --git a/ghcide/test/exe/DiagnosticTests.hs b/ghcide-test/exe/DiagnosticTests.hs
similarity index 100%
rename from ghcide/test/exe/DiagnosticTests.hs
rename to ghcide-test/exe/DiagnosticTests.hs
diff --git a/ghcide/test/exe/ExceptionTests.hs b/ghcide-test/exe/ExceptionTests.hs
similarity index 100%
rename from ghcide/test/exe/ExceptionTests.hs
rename to ghcide-test/exe/ExceptionTests.hs
diff --git a/ghcide/test/exe/FindDefinitionAndHoverTests.hs b/ghcide-test/exe/FindDefinitionAndHoverTests.hs
similarity index 100%
rename from ghcide/test/exe/FindDefinitionAndHoverTests.hs
rename to ghcide-test/exe/FindDefinitionAndHoverTests.hs
diff --git a/ghcide/test/exe/FindImplementationAndHoverTests.hs b/ghcide-test/exe/FindImplementationAndHoverTests.hs
similarity index 100%
rename from ghcide/test/exe/FindImplementationAndHoverTests.hs
rename to ghcide-test/exe/FindImplementationAndHoverTests.hs
diff --git a/ghcide/test/exe/FuzzySearch.hs b/ghcide-test/exe/FuzzySearch.hs
similarity index 100%
rename from ghcide/test/exe/FuzzySearch.hs
rename to ghcide-test/exe/FuzzySearch.hs
diff --git a/ghcide/test/exe/GarbageCollectionTests.hs b/ghcide-test/exe/GarbageCollectionTests.hs
similarity index 100%
rename from ghcide/test/exe/GarbageCollectionTests.hs
rename to ghcide-test/exe/GarbageCollectionTests.hs
diff --git a/ghcide/test/exe/HaddockTests.hs b/ghcide-test/exe/HaddockTests.hs
similarity index 100%
rename from ghcide/test/exe/HaddockTests.hs
rename to ghcide-test/exe/HaddockTests.hs
diff --git a/ghcide/test/exe/HieDbRetry.hs b/ghcide-test/exe/HieDbRetry.hs
similarity index 100%
rename from ghcide/test/exe/HieDbRetry.hs
rename to ghcide-test/exe/HieDbRetry.hs
diff --git a/ghcide/test/exe/HighlightTests.hs b/ghcide-test/exe/HighlightTests.hs
similarity index 100%
rename from ghcide/test/exe/HighlightTests.hs
rename to ghcide-test/exe/HighlightTests.hs
diff --git a/ghcide/test/exe/IfaceTests.hs b/ghcide-test/exe/IfaceTests.hs
similarity index 100%
rename from ghcide/test/exe/IfaceTests.hs
rename to ghcide-test/exe/IfaceTests.hs
diff --git a/ghcide/test/exe/InitializeResponseTests.hs b/ghcide-test/exe/InitializeResponseTests.hs
similarity index 100%
rename from ghcide/test/exe/InitializeResponseTests.hs
rename to ghcide-test/exe/InitializeResponseTests.hs
diff --git a/ghcide/test/exe/LogType.hs b/ghcide-test/exe/LogType.hs
similarity index 100%
rename from ghcide/test/exe/LogType.hs
rename to ghcide-test/exe/LogType.hs
diff --git a/ghcide/test/exe/Main.hs b/ghcide-test/exe/Main.hs
similarity index 100%
rename from ghcide/test/exe/Main.hs
rename to ghcide-test/exe/Main.hs
diff --git a/ghcide/test/exe/NonLspCommandLine.hs b/ghcide-test/exe/NonLspCommandLine.hs
similarity index 90%
rename from ghcide/test/exe/NonLspCommandLine.hs
rename to ghcide-test/exe/NonLspCommandLine.hs
index a0940625b5..b2b41071d4 100644
--- a/ghcide/test/exe/NonLspCommandLine.hs
+++ b/ghcide-test/exe/NonLspCommandLine.hs
@@ -14,6 +14,7 @@ import           System.Process.Extra     (CreateProcess (cwd), proc,
                                            readCreateProcessWithExitCode)
 import           Test.Tasty
 import           Test.Tasty.HUnit
+import           Config                   (testDataDir)
 
 
 -- A test to ensure that the command line ghcide workflow stays working
@@ -44,7 +45,7 @@ withTempDir f = System.IO.Extra.withTempDir $ canonicalizePath >=> f
 copyTestDataFiles :: FilePath -> FilePath -> IO ()
 copyTestDataFiles dir prefix = do
   -- Copy all the test data files to the temporary workspace
-  testDataFiles <- getDirectoryFilesIO ("ghcide/test/data" </> prefix) ["//*"]
+  testDataFiles <- getDirectoryFilesIO (testDataDir </> prefix) ["//*"]
   for_ testDataFiles $ \f -> do
     createDirectoryIfMissing True $ dir </> takeDirectory f
-    copyFile ("ghcide/test/data" </> prefix </> f) (dir </> f)
+    copyFile (testDataDir </> prefix </> f) (dir </> f)
diff --git a/ghcide/test/exe/OpenCloseTest.hs b/ghcide-test/exe/OpenCloseTest.hs
similarity index 100%
rename from ghcide/test/exe/OpenCloseTest.hs
rename to ghcide-test/exe/OpenCloseTest.hs
diff --git a/ghcide/test/exe/OutlineTests.hs b/ghcide-test/exe/OutlineTests.hs
similarity index 100%
rename from ghcide/test/exe/OutlineTests.hs
rename to ghcide-test/exe/OutlineTests.hs
diff --git a/ghcide/test/exe/PluginSimpleTests.hs b/ghcide-test/exe/PluginSimpleTests.hs
similarity index 100%
rename from ghcide/test/exe/PluginSimpleTests.hs
rename to ghcide-test/exe/PluginSimpleTests.hs
diff --git a/ghcide/test/exe/PositionMappingTests.hs b/ghcide-test/exe/PositionMappingTests.hs
similarity index 100%
rename from ghcide/test/exe/PositionMappingTests.hs
rename to ghcide-test/exe/PositionMappingTests.hs
diff --git a/ghcide/test/exe/PreprocessorTests.hs b/ghcide-test/exe/PreprocessorTests.hs
similarity index 100%
rename from ghcide/test/exe/PreprocessorTests.hs
rename to ghcide-test/exe/PreprocessorTests.hs
diff --git a/ghcide/test/exe/Progress.hs b/ghcide-test/exe/Progress.hs
similarity index 100%
rename from ghcide/test/exe/Progress.hs
rename to ghcide-test/exe/Progress.hs
diff --git a/ghcide/test/exe/ReferenceTests.hs b/ghcide-test/exe/ReferenceTests.hs
similarity index 100%
rename from ghcide/test/exe/ReferenceTests.hs
rename to ghcide-test/exe/ReferenceTests.hs
diff --git a/ghcide/test/exe/ResolveTests.hs b/ghcide-test/exe/ResolveTests.hs
similarity index 100%
rename from ghcide/test/exe/ResolveTests.hs
rename to ghcide-test/exe/ResolveTests.hs
diff --git a/ghcide/test/exe/RootUriTests.hs b/ghcide-test/exe/RootUriTests.hs
similarity index 100%
rename from ghcide/test/exe/RootUriTests.hs
rename to ghcide-test/exe/RootUriTests.hs
diff --git a/ghcide/test/exe/SafeTests.hs b/ghcide-test/exe/SafeTests.hs
similarity index 100%
rename from ghcide/test/exe/SafeTests.hs
rename to ghcide-test/exe/SafeTests.hs
diff --git a/ghcide/test/exe/SymlinkTests.hs b/ghcide-test/exe/SymlinkTests.hs
similarity index 100%
rename from ghcide/test/exe/SymlinkTests.hs
rename to ghcide-test/exe/SymlinkTests.hs
diff --git a/ghcide/test/exe/THTests.hs b/ghcide-test/exe/THTests.hs
similarity index 100%
rename from ghcide/test/exe/THTests.hs
rename to ghcide-test/exe/THTests.hs
diff --git a/ghcide/test/exe/UnitTests.hs b/ghcide-test/exe/UnitTests.hs
similarity index 100%
rename from ghcide/test/exe/UnitTests.hs
rename to ghcide-test/exe/UnitTests.hs
diff --git a/ghcide/test/exe/WatchedFileTests.hs b/ghcide-test/exe/WatchedFileTests.hs
similarity index 100%
rename from ghcide/test/exe/WatchedFileTests.hs
rename to ghcide-test/exe/WatchedFileTests.hs
diff --git a/ghcide/test/manual/lhs/Bird.lhs b/ghcide-test/manual/lhs/Bird.lhs
similarity index 100%
rename from ghcide/test/manual/lhs/Bird.lhs
rename to ghcide-test/manual/lhs/Bird.lhs
diff --git a/ghcide/test/manual/lhs/Main.hs b/ghcide-test/manual/lhs/Main.hs
similarity index 100%
rename from ghcide/test/manual/lhs/Main.hs
rename to ghcide-test/manual/lhs/Main.hs
diff --git a/ghcide/test/manual/lhs/Test.lhs b/ghcide-test/manual/lhs/Test.lhs
similarity index 100%
rename from ghcide/test/manual/lhs/Test.lhs
rename to ghcide-test/manual/lhs/Test.lhs
diff --git a/ghcide/test/preprocessor/Main.hs b/ghcide-test/preprocessor/Main.hs
similarity index 100%
rename from ghcide/test/preprocessor/Main.hs
rename to ghcide-test/preprocessor/Main.hs
diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal
index af9a191406..f705fde5b6 100644
--- a/ghcide/ghcide.cabal
+++ b/ghcide/ghcide.cabal
@@ -18,11 +18,6 @@ tested-with:        GHC ==9.10.1 || ==9.8.2 || ==9.6.5 || ==9.4.8
 extra-source-files:
   CHANGELOG.md
   README.md
-  test/data/**/*.cabal
-  test/data/**/*.hs
-  test/data/**/*.hs-boot
-  test/data/**/*.project
-  test/data/**/*.yaml
 
 source-repository head
   type:     git
@@ -212,20 +207,6 @@ library
     ghc-options:
       -Werror
 
-flag test-exe
-  description: Build the ghcide-test-preprocessor executable
-  default:     True
-
-executable ghcide-test-preprocessor
-  import: warnings
-  default-language:   GHC2021
-  hs-source-dirs:   test/preprocessor
-  main-is:          Main.hs
-  build-depends:    base >=4 && <5
-
-  if !flag(test-exe)
-    buildable: False
-
 flag executable
   description: Build the ghcide executable
   default:     True
diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
index 5f011472fb..ee705b9209 100644
--- a/haskell-language-server.cabal
+++ b/haskell-language-server.cabal
@@ -32,6 +32,12 @@ extra-source-files:
   plugins/**/*.txt
   plugins/**/*.hs
 
+  ghcide-test/data/**/*.cabal
+  ghcide-test/data/**/*.hs
+  ghcide-test/data/**/*.hs-boot
+  ghcide-test/data/**/*.project
+  ghcide-test/data/**/*.yaml
+
   bindist/wrapper.in
 
 source-repository head
@@ -2027,7 +2033,6 @@ test-suite func-test
   type:               exitcode-stdio-1.0
   build-tool-depends:
     haskell-language-server:haskell-language-server,
-    ghcide:ghcide-test-preprocessor
 
   build-depends:
     , aeson
@@ -2124,6 +2129,19 @@ benchmark benchmark
       , text
       , yaml
 
+flag test-exe
+  description: Build the ghcide-test-preprocessor executable
+  default:     True
+
+executable ghcide-test-preprocessor
+  import: warnings
+  default-language:   GHC2021
+  hs-source-dirs:   ghcide-test/preprocessor
+  main-is:          Main.hs
+  build-depends:    base >=4 && <5
+
+  if !flag(test-exe)
+    buildable: False
 
 test-suite ghcide-tests
   import: warnings
@@ -2131,7 +2149,7 @@ test-suite ghcide-tests
   default-language:   GHC2021
   build-tool-depends:
     , ghcide:ghcide
-    , ghcide:ghcide-test-preprocessor
+    , haskell-language-server:ghcide-test-preprocessor
     , implicit-hie:gen-hie
 
   build-depends:
@@ -2174,7 +2192,7 @@ test-suite ghcide-tests
   if impl(ghc <9.3)
     build-depends: ghc-typelits-knownnat
 
-  hs-source-dirs:     ghcide/test/exe
+  hs-source-dirs:     ghcide-test/exe
   ghc-options:        -threaded -O0
 
   main-is:            Main.hs