diff --git a/servant-server/Setup.lhs b/servant-server/Setup.lhs
index faedcd30..059c3825 100644
--- a/servant-server/Setup.lhs
+++ b/servant-server/Setup.lhs
@@ -16,12 +16,9 @@ main = defaultMainWithDoctests "doctests"
 #else
 
 #ifdef MIN_VERSION_Cabal
--- If the macro is defined, we have new cabal-install,
--- but for some reason we don't have cabal-doctest in package-db
---
--- Probably we are running cabal sdist, when otherwise using new-build
--- workflow
-import Warning ()
+#warning You are configuring this package without cabal-doctest installed. \
+         The doctests test-suite will not work as a result. \
+         To fix this, install cabal-doctest before configuring.
 #endif
 
 import Distribution.Simple
diff --git a/servant/Setup.lhs b/servant/Setup.lhs
index faedcd30..059c3825 100644
--- a/servant/Setup.lhs
+++ b/servant/Setup.lhs
@@ -16,12 +16,9 @@ main = defaultMainWithDoctests "doctests"
 #else
 
 #ifdef MIN_VERSION_Cabal
--- If the macro is defined, we have new cabal-install,
--- but for some reason we don't have cabal-doctest in package-db
---
--- Probably we are running cabal sdist, when otherwise using new-build
--- workflow
-import Warning ()
+#warning You are configuring this package without cabal-doctest installed. \
+         The doctests test-suite will not work as a result. \
+         To fix this, install cabal-doctest before configuring.
 #endif
 
 import Distribution.Simple