diff --git a/Cargo.toml b/Cargo.toml
index 9c0f84c5..8e0f3a68 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -83,8 +83,7 @@ failure = { version = "0.1.5", optional = true }
 
 [dev-dependencies]
 actix-rt = "0.2.0"
-#actix-server = { version = "0.3.0", features=["ssl"] }
-actix-server = { git="https://github.com/actix/actix-net.git", features=["ssl"] }
+actix-server = { version = "0.4.0", features=["ssl"] }
 actix-connector = { version = "0.3.0", features=["ssl"] }
 actix-http-test = { path="test-server", features=["ssl"] }
 
diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml
index 2b469773..b7535f99 100644
--- a/test-server/Cargo.toml
+++ b/test-server/Cargo.toml
@@ -36,8 +36,7 @@ actix-codec = "0.1.1"
 actix-rt = "0.2.1"
 actix-http = { path=".." }
 actix-service = "0.3.4"
-#actix-server = "0.3.0"
-actix-server = { git="https://github.com/actix/actix-net.git" }
+actix-server = "0.4.0"
 actix-utils = "0.3.4"
 
 base64 = "0.10"