diff --git a/hie.yaml.cbl b/hie.yaml.cbl
index c9f53613e8..ee80f7c113 100644
--- a/hie.yaml.cbl
+++ b/hie.yaml.cbl
@@ -8,8 +8,8 @@
 cradle:
   cabal:
 
-    - path: "./test"
-      component: "haskell-language-server:hls-tests"
+    - path: "./test/functional/"
+      component: "haskell-language-server:func-test"
 
     - path: "./test/utils/"
       component: "haskell-language-server:hls-test-utils"
diff --git a/hie.yaml.stack b/hie.yaml.stack
index 8d184076ba..a81bf0809a 100644
--- a/hie.yaml.stack
+++ b/hie.yaml.stack
@@ -11,8 +11,12 @@
 #          ```
 cradle:
   stack:
-    - path: "./test"
-      component: "haskell-language-server:hls-tests"
+    - path: "./test/functional/"
+      component: "haskell-language-server:func-test"
+
+    # This target does not currently work (stack 2.1.3)
+    # - path: "./test/utils"
+    #   component: "haskell-language-server:lib:hls-test-utils"
 
     - path: "./exe/Main.hs"
       component: "haskell-language-server:exe:haskell-language-server"