diff --git a/servant-client/test/Servant/ClientSpec.hs b/servant-client/test/Servant/ClientSpec.hs
index 4a6ed243..4c21e201 100644
--- a/servant-client/test/Servant/ClientSpec.hs
+++ b/servant-client/test/Servant/ClientSpec.hs
@@ -45,8 +45,7 @@ import qualified Network.HTTP.Client        as C
 import           Network.HTTP.Media
 import qualified Network.HTTP.Types         as HTTP
 import           Network.Socket
-import           Network.Wai                (Application, Request,
-                                             requestHeaders, responseLBS)
+import           Network.Wai                (Request, requestHeaders, responseLBS)
 import           Network.Wai.Handler.Warp
 import           System.IO.Unsafe           (unsafePerformIO)
 import           Test.Hspec
diff --git a/servant-server/src/Servant/Server.hs b/servant-server/src/Servant/Server.hs
index 257a721d..6f4f0c22 100644
--- a/servant-server/src/Servant/Server.hs
+++ b/servant-server/src/Servant/Server.hs
@@ -95,6 +95,9 @@ module Servant.Server
   , err504
   , err505
 
+  -- * Re-exports
+  , Application
+
   ) where
 
 import           Data.Proxy                    (Proxy)
diff --git a/servant-server/test/Servant/Server/RouterSpec.hs b/servant-server/test/Servant/Server/RouterSpec.hs
index e1ec5d7b..135497e3 100644
--- a/servant-server/test/Servant/Server/RouterSpec.hs
+++ b/servant-server/test/Servant/Server/RouterSpec.hs
@@ -8,7 +8,7 @@ import           Control.Monad                  (unless)
 import           Data.Proxy                     (Proxy(..))
 import           Data.Text                      (unpack)
 import           Network.HTTP.Types             (Status (..))
-import           Network.Wai                    (Application, responseBuilder)
+import           Network.Wai                    (responseBuilder)
 import           Network.Wai.Internal           (Response (ResponseBuilder))
 import           Test.Hspec
 import           Test.Hspec.Wai                 (get, shouldRespondWith, with)