diff --git a/cabal.project b/cabal.project
index 0c4da5e3aa..7036da4eef 100644
--- a/cabal.project
+++ b/cabal.project
@@ -3,7 +3,9 @@ packages:
          ghcide
 
 tests: true
-documentation: true
+
+package *
+  ghc-options: -haddock
 
 package haskell-language-server
   test-show-details: direct
diff --git a/stack-8.10.1.yaml b/stack-8.10.1.yaml
index c28931ef18..02f99032a0 100644
--- a/stack-8.10.1.yaml
+++ b/stack-8.10.1.yaml
@@ -4,6 +4,9 @@ packages:
 - .
 - ./ghcide/
 
+ghc-options:
+  "$everything": -haddock
+
 extra-deps:
 - Cabal-3.0.2.0
 - hie-bios-0.6.1
diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml
index 56eb41a9ad..b3d09b090e 100644
--- a/stack-8.6.4.yaml
+++ b/stack-8.6.4.yaml
@@ -4,6 +4,9 @@ packages:
 - .
 - ./ghcide/
 
+ghc-options:
+  "$everything": -haddock
+
 extra-deps:
 - aeson-1.4.3.0
 - brittany-0.12.1.1
diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
index 62db328d8c..4fda368fa4 100644
--- a/stack-8.6.5.yaml
+++ b/stack-8.6.5.yaml
@@ -4,6 +4,9 @@ packages:
 - .
 - ./ghcide/
 
+ghc-options:
+  "$everything": -haddock
+
 extra-deps:
 - ansi-terminal-0.10.2
 - base-compat-0.11.0
diff --git a/stack-8.8.2.yaml b/stack-8.8.2.yaml
index ad95d9ea5b..bc43e541b3 100644
--- a/stack-8.8.2.yaml
+++ b/stack-8.8.2.yaml
@@ -4,6 +4,9 @@ packages:
 - .
 - ./ghcide/
 
+ghc-options:
+  "$everything": -haddock
+
 extra-deps:
 - apply-refact-0.7.0.0
 - brittany-0.12.1.1
diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml
index bba9679ccc..0e3dbce818 100644
--- a/stack-8.8.3.yaml
+++ b/stack-8.8.3.yaml
@@ -4,6 +4,9 @@ packages:
 - .
 - ./ghcide/
 
+ghc-options:
+  "$everything": -haddock
+
 extra-deps:
 - apply-refact-0.7.0.0
 - bytestring-trie-0.2.5.0
diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml
index ca3370ee98..97eb469e4e 100644
--- a/stack-8.8.4.yaml
+++ b/stack-8.8.4.yaml
@@ -5,6 +5,9 @@ packages:
 - .
 - ./ghcide/
 
+ghc-options:
+  "$everything": -haddock
+
 extra-deps:
 - apply-refact-0.7.0.0
 - bytestring-trie-0.2.5.0
diff --git a/stack.yaml b/stack.yaml
index 1ff400f465..69df69abb1 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -4,6 +4,9 @@ packages:
 - .
 - ./ghcide/
 
+ghc-options:
+  "$everything": -haddock
+
 extra-deps:
 - ansi-terminal-0.10.2
 - base-compat-0.11.0
diff --git a/test/functional/Deferred.hs b/test/functional/Deferred.hs
index 4bcebda277..1eaef8eb64 100644
--- a/test/functional/Deferred.hs
+++ b/test/functional/Deferred.hs
@@ -159,7 +159,6 @@ multiMainTests :: TestTree
 multiMainTests = testGroup "multiple main modules" [
     ignoreTestBecause "Broken: Unexpected ConduitParser.empty" $
     testCase "Can load one file at a time, when more than one Main module exists"
-        -- $ runSession hieCommand fullCaps "test/testdata" $ do
         $ runSession hieCommand fullCaps "test/testdata" $ do
             _doc <- openDoc "ApplyRefact2.hs" "haskell"
             _diagsRspHlint <- skipManyTill anyNotification message :: Session PublishDiagnosticsNotification
@@ -175,4 +174,4 @@ multiMainTests = testGroup "multiple main modules" [
             let (List diags2) = diagsRsp2 ^. params . diagnostics
 
             liftIO $ show diags2 `shouldBe` "[]"
-    ]
\ No newline at end of file
+    ]
diff --git a/test/functional/TypeDefinition.hs b/test/functional/TypeDefinition.hs
index 893448d36d..a415c82618 100644
--- a/test/functional/TypeDefinition.hs
+++ b/test/functional/TypeDefinition.hs
@@ -75,21 +75,22 @@ tests = testGroup "type definitions" [
                                         (Range (toPos (18, 1)) (toPos (18, 26)))
                             ]
 
-    -- TODO Implement
-    -- , ignoreTestBecause "Broken" $ testCase "find type-definition of type def in component"
-    --     $ pendingWith "Finding symbols cross module is currently not supported"
-        -- $ runSession hieCommand fullCaps "test/testdata/gototest"
-        -- $ do
-        --     doc      <- openDoc "src/Lib2.hs" "haskell"
-        --     otherDoc <- openDoc "src/Lib.hs" "haskell"
-        --     closeDoc otherDoc
-        --     defs <- getTypeDefinitions doc (toPos (13, 20))
-        --     liftIO $ do
-        --       fp <- canonicalizePath "test/testdata/gototest/src/Lib.hs"
-        --       defs
-        --         `shouldBe` [ Location (filePathToUri fp)
-        --                               (Range (toPos (8, 1)) (toPos (8, 29)))
-        --                    ]
+    {--  TODO Implement
+     , ignoreTestBecause "Broken" $ testCase "find type-definition of type def in component"
+         $ pendingWith "Finding symbols cross module is currently not supported"
+         $ runSession hieCommand fullCaps "test/testdata/gototest"
+         $ do
+             doc      <- openDoc "src/Lib2.hs" "haskell"
+             otherDoc <- openDoc "src/Lib.hs" "haskell"
+             closeDoc otherDoc
+             defs <- getTypeDefinitions doc (toPos (13, 20))
+             liftIO $ do
+               fp <- canonicalizePath "test/testdata/gototest/src/Lib.hs"
+               defs
+                 `shouldBe` [ Location (filePathToUri fp)
+                                       (Range (toPos (8, 1)) (toPos (8, 29)))
+                            ]
+    --}
     , ignoreTestBecause "Broken" $ testCase "find definition of parameterized data type"
         $ runSession hieCommand fullCaps "test/testdata/gototest"
         $ do
@@ -105,4 +106,4 @@ tests = testGroup "type definitions" [
 
 --NOTE: copied from Haskell.Ide.Engine.ArtifactMap
 toPos :: (Int,Int) -> Position
-toPos (l,c) = Position (l-1) (c-1)
\ No newline at end of file
+toPos (l,c) = Position (l-1) (c-1)