diff --git a/hls-test-utils/hls-test-utils.cabal b/hls-test-utils/hls-test-utils.cabal
index 81f24b8c3c..eb886cb2cb 100644
--- a/hls-test-utils/hls-test-utils.cabal
+++ b/hls-test-utils/hls-test-utils.cabal
@@ -35,7 +35,6 @@ library
     , aeson
     , async
     , base                    >=4.12 && <5
-    , blaze-markup
     , bytestring
     , containers
     , data-default
@@ -43,10 +42,8 @@ library
     , extra
     , filepath
     , ghcide                  == 2.6.0.0
-    , hls-graph
     , hls-plugin-api          == 2.6.0.0
     , lens
-    , lsp                     ^>=2.3
     , lsp-test                ^>=0.16
     , lsp-types               ^>=2.1
     , tasty
@@ -56,9 +53,8 @@ library
     , tasty-rerun
     , temporary
     , text
-    , unordered-containers
     , row-types
-  ghc-options:      -Wall
+  ghc-options:      -Wall -Wunused-packages
 
   if flag(pedantic)
     ghc-options: -Werror
diff --git a/hls-test-utils/src/Test/Hls.hs b/hls-test-utils/src/Test/Hls.hs
index 9320e3b300..62630fa9e6 100644
--- a/hls-test-utils/src/Test/Hls.hs
+++ b/hls-test-utils/src/Test/Hls.hs
@@ -1,14 +1,13 @@
-{-# LANGUAGE DataKinds                #-}
-{-# LANGUAGE DisambiguateRecordFields #-}
-{-# LANGUAGE DuplicateRecordFields    #-}
-{-# LANGUAGE GADTs                    #-}
-{-# LANGUAGE LambdaCase               #-}
-{-# LANGUAGE NamedFieldPuns           #-}
-{-# LANGUAGE OverloadedLists          #-}
-{-# LANGUAGE OverloadedStrings        #-}
-{-# LANGUAGE PolyKinds                #-}
-{-# LANGUAGE RankNTypes               #-}
-{-# LANGUAGE TypeApplications         #-}
+{-# LANGUAGE DataKinds             #-}
+{-# LANGUAGE DuplicateRecordFields #-}
+{-# LANGUAGE GADTs                 #-}
+{-# LANGUAGE LambdaCase            #-}
+{-# LANGUAGE NamedFieldPuns        #-}
+{-# LANGUAGE OverloadedLists       #-}
+{-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE PolyKinds             #-}
+{-# LANGUAGE RankNTypes            #-}
+{-# LANGUAGE TypeApplications      #-}
 module Test.Hls
   ( module Test.Tasty.HUnit,
     module Test.Tasty,
@@ -440,12 +439,12 @@ runSessionWithServerInTmpDir' plugins conf sessConf caps tree act = withLock loc
           | val /= "0" -> \action -> do
             (tempDir, _) <- newTempDir
             a <- action tempDir
-            logWith recorder Debug $ LogNoCleanup
+            logWith recorder Debug LogNoCleanup
             pure a
 
         _ -> \action -> do
           a <- withTempDir action
-          logWith recorder Debug $ LogCleanup
+          logWith recorder Debug LogCleanup
           pure a
 
   runTestInDir $ \tmpDir -> do
diff --git a/hls-test-utils/src/Test/Hls/Util.hs b/hls-test-utils/src/Test/Hls/Util.hs
index 4f0c400a18..3e362693fe 100644
--- a/hls-test-utils/src/Test/Hls/Util.hs
+++ b/hls-test-utils/src/Test/Hls/Util.hs
@@ -1,13 +1,13 @@
 {-# LANGUAGE CPP                   #-}
+{-# LANGUAGE DataKinds             #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE FlexibleContexts      #-}
 {-# LANGUAGE GADTs                 #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE OverloadedLabels      #-}
 {-# LANGUAGE OverloadedStrings     #-}
+{-# LANGUAGE TypeApplications      #-}
 {-# LANGUAGE TypeOperators         #-}
-{-# LANGUAGE OverloadedLabels #-}
-{-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE DataKinds #-}
 module Test.Hls.Util
   (  -- * Test Capabilities
       codeActionResolveCaps
@@ -54,22 +54,22 @@ where
 
 import           Control.Applicative.Combinators (skipManyTill, (<|>))
 import           Control.Exception               (catch, throwIO)
-import           Control.Lens                    ((&), (?~), (^.), _Just, (.~))
+import           Control.Lens                    (_Just, (&), (.~), (?~), (^.))
 import           Control.Monad
 import           Control.Monad.IO.Class
 import qualified Data.Aeson                      as A
 import           Data.Bool                       (bool)
 import           Data.Default
-import           Data.Row
-import           Data.Proxy
 import           Data.List.Extra                 (find)
+import           Data.Proxy
+import           Data.Row
 import qualified Data.Set                        as Set
 import qualified Data.Text                       as T
 import           Development.IDE                 (GhcVersion (..), ghcVersion)
-import qualified Language.LSP.Test               as Test
-import           Language.LSP.Protocol.Types
+import qualified Language.LSP.Protocol.Lens      as L
 import           Language.LSP.Protocol.Message
-import qualified Language.LSP.Protocol.Lens         as L
+import           Language.LSP.Protocol.Types
+import qualified Language.LSP.Test               as Test
 import           System.Directory
 import           System.FilePath
 import           System.Info.Extra               (isMac, isWindows)
@@ -304,7 +304,7 @@ waitForDiagnosticsFromSourceWithTimeout timeout document source = do
     handleDiagnostic testId = do
         diagsNot <- Test.message SMethod_TextDocumentPublishDiagnostics
         let fileUri = diagsNot ^. L.params . L.uri
-            ( diags) = diagsNot ^. L.params . L.diagnostics
+            diags = diagsNot ^. L.params . L.diagnostics
             res = filter matches diags
         if fileUri == document ^. L.uri && not (null res)
             then return res else handleMessages testId