diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9b3ed24357..59578a98a0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -210,6 +210,10 @@ jobs:
         name: Test hls-hlint-plugin test suite
         run: cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-hlint-plugin --test-options="$TEST_OPTS"
 
+      - if: matrix.test && matrix.ghc != '9.2.1'
+        name: Test hls-module-name-plugin test suite
+        run: cabal test hls-module-name-plugin --test-options="$TEST_OPTS" || cabal test hls-module-name-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-module-name-plugin --test-options="$TEST_OPTS"
+
       - if: matrix.test && matrix.ghc != '9.2.1'
         name: Test hls-alternate-number-format-plugin test suite
         run: cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS" || cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS"
diff --git a/cabal-ghc921.project b/cabal-ghc921.project
index df3c6e44f1..e51bc3a1f5 100644
--- a/cabal-ghc921.project
+++ b/cabal-ghc921.project
@@ -55,7 +55,6 @@ constraints:
     +ignore-plugins-ghc-bounds
     -alternateNumberFormat
     -brittany
-    -callhierarchy
     -class
     -eval
     -haddockComments
diff --git a/docs/supported-versions.md b/docs/supported-versions.md
index 2485d94f4f..303a3d330f 100644
--- a/docs/supported-versions.md
+++ b/docs/supported-versions.md
@@ -6,7 +6,7 @@ The current support for different GHC versions is given in the following table.
 
 | GHC version | Last supporting HLS version                                                                                                                              | Deprecation status                       |
 | ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------- |
-| 9.2.0       | [not supported](https://github.com/haskell/haskell-language-server/issues/2179) yet                                                                                                                                        |                                          |
+| 9.2.0       | incoming [partial](https://github.com/haskell/haskell-language-server/issues/2179)                                                                                                                                       |                                          |
 | 9.0.1       | [current](https://github.com/haskell/haskell-language-server/releases/latest) ([partial](https://github.com/haskell/haskell-language-server/issues/297)) |                                          |
 | 8.10.7      | [current](https://github.com/haskell/haskell-language-server/releases/latest)                                                                            |                                          |
 | 8.10.6      | [current](https://github.com/haskell/haskell-language-server/releases/latest)                                                                            | will be deprecated after LTS and HLS full support for ghc-9.0 |
diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal
index fe4585f33d..4dc41b4d09 100644
--- a/haskell-language-server.cabal
+++ b/haskell-language-server.cabal
@@ -211,7 +211,7 @@ common class
     cpp-options: -Dclass
 
 common callHierarchy
-  if flag(callHierarchy) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
+  if flag(callHierarchy)
     build-depends: hls-call-hierarchy-plugin ^>=1.0.0.0
     cpp-options: -DcallHierarchy
 
@@ -256,7 +256,7 @@ common hlint
     cpp-options: -Dhlint
 
 common moduleName
-  if flag(moduleName)
+  if flag(moduleName) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
     build-depends: hls-module-name-plugin ^>=1.0.0.0
     cpp-options: -DmoduleName