diff --git a/cabal.ghcjs.project b/cabal.ghcjs.project
index db1ef33a..46d74b2c 100644
--- a/cabal.ghcjs.project
+++ b/cabal.ghcjs.project
@@ -2,6 +2,7 @@
 
 packages:
   servant/
+  servant-client/
   servant-client-core/
 
 -- we need to tell cabal we are using GHCJS
diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal
index b1008f36..e4bc3ba7 100644
--- a/servant-client-core/servant-client-core.cabal
+++ b/servant-client-core/servant-client-core.cabal
@@ -17,7 +17,7 @@ maintainer:          haskell-servant-maintainers@googlegroups.com
 copyright:           2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
 build-type:          Simple
 tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
-           , GHCJS == 8.4
+           , GHCJS ==8.6.0.1
 
 extra-source-files:
   CHANGELOG.md
diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal
index 8f69a4ad..481dbd0a 100644
--- a/servant-client/servant-client.cabal
+++ b/servant-client/servant-client.cabal
@@ -21,6 +21,7 @@ maintainer:          haskell-servant-maintainers@googlegroups.com
 copyright:           2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
 build-type:          Simple
 tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
+           , GHCJS ==8.6.0.1
 
 extra-source-files:
   CHANGELOG.md
@@ -82,6 +83,8 @@ test-suite spec
   type: exitcode-stdio-1.0
   ghc-options: -Wall -rtsopts -threaded "-with-rtsopts=-T -N2"
   default-language: Haskell2010
+  if impl(ghcjs)
+     buildable: False
   hs-source-dirs: test
   main-is: Spec.hs
   other-modules:
@@ -137,3 +140,5 @@ test-suite readme
   build-tool-depends: markdown-unlit:markdown-unlit
   ghc-options:    -pgmL markdown-unlit
   default-language: Haskell2010
+  if impl(ghcjs)
+     buildable: False
diff --git a/servant/servant.cabal b/servant/servant.cabal
index 8dd79c75..7c7af0a1 100644
--- a/servant/servant.cabal
+++ b/servant/servant.cabal
@@ -21,7 +21,7 @@ copyright:           2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant
 build-type:          Simple
 
 tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
-           , GHCJS == 8.4
+           , GHCJS ==8.6.0.1
 
 extra-source-files:
   CHANGELOG.md