diff --git a/Cargo.toml b/Cargo.toml
index 7b095af91..eb0c42c17 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -72,7 +72,7 @@ experimental-io-uring = ["actix-server/io-uring"]
 actix-codec = "0.4.1"
 actix-macros = "0.2.3"
 actix-rt = "2.3"
-actix-server = "2.0.0-rc.1"
+actix-server = "2.0.0-rc.2"
 actix-service = "2.0.0"
 actix-utils = "3.0.0"
 actix-tls = { version = "3.0.0", default-features = false, optional = true }
diff --git a/actix-http-test/CHANGES.md b/actix-http-test/CHANGES.md
index 4e86e20e8..2ccd4c006 100644
--- a/actix-http-test/CHANGES.md
+++ b/actix-http-test/CHANGES.md
@@ -1,6 +1,9 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+- Update `actix-server` to `2.0.0-rc.2`. [#????]
+
+[#????]: https://github.com/actix/actix-web/pull/????
 
 
 ## 3.0.0-beta.9 - 2021-12-11
diff --git a/actix-http-test/Cargo.toml b/actix-http-test/Cargo.toml
index 2ad620b08..78c08b41a 100644
--- a/actix-http-test/Cargo.toml
+++ b/actix-http-test/Cargo.toml
@@ -34,7 +34,7 @@ actix-codec = "0.4.1"
 actix-tls = "3.0.0"
 actix-utils = "3.0.0"
 actix-rt = "2.2"
-actix-server = "2.0.0-rc.1"
+actix-server = "2.0.0-rc.2"
 awc = { version = "3.0.0-beta.14", default-features = false }
 
 base64 = "0.13"
diff --git a/actix-http-test/src/lib.rs b/actix-http-test/src/lib.rs
index 03239ece6..8636ef9c4 100644
--- a/actix-http-test/src/lib.rs
+++ b/actix-http-test/src/lib.rs
@@ -12,7 +12,7 @@ use std::{net, thread, time::Duration};
 
 use actix_codec::{AsyncRead, AsyncWrite, Framed};
 use actix_rt::{net::TcpStream, System};
-use actix_server::{Server, ServiceFactory};
+use actix_server::{Server, ServerServiceFactory};
 use awc::{
     error::PayloadError, http::header::HeaderMap, ws, Client, ClientRequest, ClientResponse,
     Connector,
@@ -51,13 +51,13 @@ use tokio::sync::mpsc;
 ///     assert!(response.status().is_success());
 /// }
 /// ```
-pub async fn test_server<F: ServiceFactory<TcpStream>>(factory: F) -> TestServer {
+pub async fn test_server<F: ServerServiceFactory<TcpStream>>(factory: F) -> TestServer {
     let tcp = net::TcpListener::bind("127.0.0.1:0").unwrap();
     test_server_with_addr(tcp, factory).await
 }
 
 /// Start [`test server`](test_server()) on an existing address binding.
-pub async fn test_server_with_addr<F: ServiceFactory<TcpStream>>(
+pub async fn test_server_with_addr<F: ServerServiceFactory<TcpStream>>(
     tcp: net::TcpListener,
     factory: F,
 ) -> TestServer {
diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index 3fa437562..87faae15a 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -80,7 +80,7 @@ zstd = { version = "0.9", optional = true }
 
 [dev-dependencies]
 actix-http-test = { version = "3.0.0-beta.9", features = ["openssl"] }
-actix-server = "2.0.0-rc.1"
+actix-server = "2.0.0-rc.2"
 actix-tls = { version = "3.0.0", features = ["openssl"] }
 actix-web = "4.0.0-beta.15"
 
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index d0494e023..ff79ecb66 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -95,7 +95,7 @@ trust-dns-resolver = { version = "0.20.0", optional = true }
 [dev-dependencies]
 actix-http = { version = "3.0.0-beta.16", features = ["openssl"] }
 actix-http-test = { version = "3.0.0-beta.9", features = ["openssl"] }
-actix-server = "2.0.0-rc.1"
+actix-server = "2.0.0-rc.2"
 actix-test = { version = "0.1.0-beta.9", features = ["openssl", "rustls"] }
 actix-tls = { version = "3.0.0", features = ["openssl", "rustls"] }
 actix-utils = "3.0.0"