diff --git a/actix-codec/Cargo.toml b/actix-codec/Cargo.toml
index 5778c4b6..e81d1402 100644
--- a/actix-codec/Cargo.toml
+++ b/actix-codec/Cargo.toml
@@ -16,8 +16,8 @@ name = "actix_codec"
 path = "src/lib.rs"
 
 [dependencies]
+actix-rt = { version = "2.0.0", default-features = false }
 actix-service = "2.0.0-beta.5"
-actix-rt = "2.0.0"
 
 bitflags = "1.2.1"
 bytes = "1"
diff --git a/actix-server/tests/test_server.rs b/actix-server/tests/test_server.rs
index 86ec25e6..718ebcc6 100644
--- a/actix-server/tests/test_server.rs
+++ b/actix-server/tests/test_server.rs
@@ -22,14 +22,15 @@ fn test_bind() {
 
     let h = thread::spawn(move || {
         let sys = actix_rt::System::new();
-        let srv = sys.block_on(lazy(|_| {
+        let srv = sys.block_on(async {
             Server::build()
                 .workers(1)
                 .disable_signals()
                 .bind("test", addr, move || fn_service(|_| ok::<_, ()>(())))
                 .unwrap()
                 .run()
-        }));
+        });
+
         let _ = tx.send((srv, actix_rt::System::current()));
         let _ = sys.run();
     });
@@ -82,7 +83,7 @@ fn test_start() {
 
     let h = thread::spawn(move || {
         let sys = actix_rt::System::new();
-        let srv = sys.block_on(lazy(|_| {
+        let srv = sys.block_on(async {
             Server::build()
                 .backlog(100)
                 .disable_signals()
@@ -95,7 +96,7 @@ fn test_start() {
                 })
                 .unwrap()
                 .run()
-        }));
+        });
 
         let _ = tx.send((srv, actix_rt::System::current()));
         let _ = sys.run();
@@ -151,7 +152,7 @@ fn test_configure() {
     let h = thread::spawn(move || {
         let num = num2.clone();
         let sys = actix_rt::System::new();
-        let srv = sys.block_on(lazy(|_| {
+        let srv = sys.block_on(async {
             Server::build()
                 .disable_signals()
                 .configure(move |cfg| {
@@ -174,7 +175,8 @@ fn test_configure() {
                 .unwrap()
                 .workers(1)
                 .run()
-        }));
+        });
+
         let _ = tx.send((srv, actix_rt::System::current()));
         let _ = sys.run();
     });