diff --git a/buildout.cfg b/buildout.cfg
index 227bff6e6d..55e68a62a6 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -19,7 +19,6 @@ parts =
     requirements
 sources-dir = develop
 auto-checkout =
-    ZServer
 
 
 [test]
diff --git a/requirements.txt b/requirements.txt
index b9ed85298f..c85ea35241 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,6 +22,7 @@ WebTest==2.0.23
 ZConfig==3.1.0
 ZEO==5.0.1
 ZODB==5.0.0
+ZServer==4.0a1
 five.globalrequest==1.0
 mechanize==0.2.5
 persistent==4.2.1
diff --git a/versions-prod.cfg b/versions-prod.cfg
index ee484042f9..8fdd61c2ab 100644
--- a/versions-prod.cfg
+++ b/versions-prod.cfg
@@ -83,4 +83,4 @@ zope.testing = 4.5.0
 zope.testrunner = 4.5.1
 zope.traversing = 4.1.0
 zope.viewlet = 4.0.0
-ZServer =
+ZServer = 4.0a1