diff --git a/scripts/test-stack.sh b/scripts/test-stack.sh
new file mode 100755
index 00000000..b93d6107
--- /dev/null
+++ b/scripts/test-stack.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -o nounset
+set -o errexit
+
+for stack_file in stack*.yaml ; do
+  echo testing $stack_file...
+  export STACK_YAML=$stack_file
+  stack setup
+  stack test --fast --ghc-options="-Werror"
+done
diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal
index 7ce9b184..6b7997fc 100644
--- a/servant-server/servant-server.cabal
+++ b/servant-server/servant-server.cabal
@@ -67,7 +67,7 @@ library
       , transformers       >= 0.3  && < 0.6
       , transformers-compat>= 0.4
       , wai                >= 3.0  && < 3.3
-      , wai-app-static     >= 3.0  && < 3.2
+      , wai-app-static     >= 3.1  && < 3.2
       , warp               >= 3.0  && < 3.3
       , word8              == 0.1.*
 
diff --git a/servant/servant.cabal b/servant/servant.cabal
index c500894d..694958a9 100644
--- a/servant/servant.cabal
+++ b/servant/servant.cabal
@@ -104,6 +104,7 @@ test-suite spec
       Servant.Utils.LinksSpec
   build-depends:
       base == 4.*
+    , base-compat
     , aeson
     , attoparsec
     , bytestring
diff --git a/servant/src/Servant/API/Alternative.hs b/servant/src/Servant/API/Alternative.hs
index a7651d3c..8a8a693f 100644
--- a/servant/src/Servant/API/Alternative.hs
+++ b/servant/src/Servant/API/Alternative.hs
@@ -1,9 +1,7 @@
 {-# LANGUAGE CPP                #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE DeriveFunctor      #-}
-#if !MIN_VERSION_base(4,8,0)
 {-# LANGUAGE DeriveFoldable     #-}
-#endif
 {-# LANGUAGE DeriveTraversable  #-}
 {-# LANGUAGE TypeOperators      #-}
 {-# OPTIONS_HADDOCK not-home    #-}
diff --git a/servant/src/Servant/Utils/Enter.hs b/servant/src/Servant/Utils/Enter.hs
index 35168dc2..12f7a530 100644
--- a/servant/src/Servant/Utils/Enter.hs
+++ b/servant/src/Servant/Utils/Enter.hs
@@ -11,9 +11,6 @@
 module Servant.Utils.Enter where
 
 import qualified Control.Category            as C
-#if MIN_VERSION_mtl(2,2,1)
-import           Control.Monad.Except
-#endif
 import           Control.Monad.Identity
 import           Control.Monad.Morph
 import           Control.Monad.Reader
diff --git a/servant/test/Servant/API/ContentTypesSpec.hs b/servant/test/Servant/API/ContentTypesSpec.hs
index e29900e2..1a155b5c 100644
--- a/servant/test/Servant/API/ContentTypesSpec.hs
+++ b/servant/test/Servant/API/ContentTypesSpec.hs
@@ -8,10 +8,9 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Servant.API.ContentTypesSpec where
 
-#if !MIN_VERSION_base(4,8,0)
-import           Control.Applicative
-import           Data.Monoid
-#endif
+import           Prelude ()
+import           Prelude.Compat
+
 import           Control.Arrow
 import           Data.Aeson
 import           Data.ByteString.Char8     (ByteString, append, pack)
diff --git a/stack-ghc-7.8.4.yaml b/stack-ghc-7.8.4.yaml
index c138c647..0fe58482 100644
--- a/stack-ghc-7.8.4.yaml
+++ b/stack-ghc-7.8.4.yaml
@@ -8,17 +8,21 @@ packages:
 - servant-mock/
 - servant-server/
 extra-deps:
-- base-compat-0.9.0
-- hspec-2.2.0
-- hspec-core-2.2.0
-- hspec-discover-2.2.0
-- hspec-expectations-0.7.2
-- doctest-0.10.1
-- engine-io-1.2.10
-- engine-io-wai-1.0.3
-- socket-io-1.3.3
-- stm-delay-0.1.1.1
+- base-compat-0.9.1
 - control-monad-omega-0.3.1
-- http-api-data-0.1.1.1
+- cryptonite-0.6
+- doctest-0.11.0
+- hspec-2.2.3
+- hspec-core-2.2.3
+- hspec-discover-2.2.3
+- hspec-expectations-0.7.2
+- http-api-data-0.2.2
+- primitive-0.6.1.0
+- servant-0.7.1
+- servant-client-0.7.1
+- servant-docs-0.7.1
+- servant-server-0.7.1
 - should-not-typecheck-2.1.0
+- time-locale-compat-0.1.1.1
+- wai-app-static-3.1.5
 resolver: lts-2.22
diff --git a/stack.yaml b/stack.yaml
index 65fbd685..95599455 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,6 +1,4 @@
-flags:
-  servant-js:
-    example: false
+flags: {}
 packages:
 - servant/
 - servant-client/