diff --git a/.travis.yml b/.travis.yml
index 030f111f..8a5c7474 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ before_install:
 
 before_cache: |
   if [[ "$TRAVIS_RUST_VERSION" == "nightly-2020-02-16" ]]; then
-    RUSTFLAGS="--cfg procmacro2_semver_exempt" cargo install --version 0.6.11 cargo-tarpaulin
+    RUSTFLAGS="--cfg procmacro2_semver_exempt" cargo install --version 0.10.2 cargo-tarpaulin
   fi
 
 # Add clippy
diff --git a/Cargo.toml b/Cargo.toml
index 33790d96..1cf9579c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,3 +3,7 @@ members = [
   "ntex",
   "ntex-web-macros",
 ]
+
+[patch.crates-io]
+actix-server = { path = "actix-net/actix-server" }
+actix-service = { path = "actix-net/actix-service" }
diff --git a/actix-net/Cargo.toml b/actix-net/Cargo.toml
index f8e43727..f032478a 100644
--- a/actix-net/Cargo.toml
+++ b/actix-net/Cargo.toml
@@ -2,7 +2,6 @@
 members = [
   "actix-codec",
   "actix-connect",
-  "actix-ioframe",
   "actix-rt",
   "actix-macros",
   "actix-service",
@@ -19,7 +18,6 @@ members = [
 [patch.crates-io]
 actix-codec = { path = "actix-codec" }
 actix-connect = { path = "actix-connect" }
-actix-ioframe = { path = "actix-ioframe" }
 actix-rt = { path = "actix-rt" }
 actix-macros = { path = "actix-macros" }
 actix-server = { path = "actix-server" }
diff --git a/actix-net/actix-service/src/and_then.rs b/actix-net/actix-service/src/and_then.rs
index b67de0a0..5dbe9397 100644
--- a/actix-net/actix-service/src/and_then.rs
+++ b/actix-net/actix-service/src/and_then.rs
@@ -49,6 +49,19 @@ where
         }
     }
 
+    fn poll_shutdown(&mut self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> {
+        let srv = self.0.get_mut();
+
+        if srv.0.poll_shutdown(cx, is_error).is_ready()
+            && srv.1.poll_shutdown(cx, is_error).is_ready()
+        {
+            Poll::Ready(())
+        } else {
+            Poll::Pending
+        }
+    }
+
+    #[inline]
     fn call(&mut self, req: A::Request) -> Self::Future {
         AndThenServiceResponse {
             state: State::A(self.0.get_mut().0.call(req), Some(self.0.clone())),
diff --git a/actix-net/actix-service/src/and_then_apply_fn.rs b/actix-net/actix-service/src/and_then_apply_fn.rs
index 4ff3b4d0..5a584c80 100644
--- a/actix-net/actix-service/src/and_then_apply_fn.rs
+++ b/actix-net/actix-service/src/and_then_apply_fn.rs
@@ -76,6 +76,18 @@ where
         }
     }
 
+    fn poll_shutdown(&mut self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> {
+        let srv = self.srv.get_mut();
+
+        if srv.0.poll_shutdown(cx, is_error).is_ready()
+            && srv.1.poll_shutdown(cx, is_error).is_ready()
+        {
+            Poll::Ready(())
+        } else {
+            Poll::Pending
+        }
+    }
+
     fn call(&mut self, req: A::Request) -> Self::Future {
         let fut = self.srv.get_mut().0.call(req);
         AndThenApplyFnFuture {
diff --git a/actix-net/actix-service/src/apply.rs b/actix-net/actix-service/src/apply.rs
index b8cc7426..5b429568 100644
--- a/actix-net/actix-service/src/apply.rs
+++ b/actix-net/actix-service/src/apply.rs
@@ -82,10 +82,17 @@ where
     type Error = Err;
     type Future = R;
 
+    #[inline]
     fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         Poll::Ready(futures_util::ready!(self.service.poll_ready(cx)))
     }
 
+    #[inline]
+    fn poll_shutdown(&mut self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> {
+        self.service.poll_shutdown(cx, is_error)
+    }
+
+    #[inline]
     fn call(&mut self, req: In) -> Self::Future {
         (self.f)(req, &mut self.service)
     }
diff --git a/actix-net/actix-service/src/boxed.rs b/actix-net/actix-service/src/boxed.rs
index e630f81c..f6429d82 100644
--- a/actix-net/actix-service/src/boxed.rs
+++ b/actix-net/actix-service/src/boxed.rs
@@ -135,10 +135,17 @@ where
     type Error = Err;
     type Future = BoxFuture<Res, Err>;
 
+    #[inline]
     fn poll_ready(&mut self, ctx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         self.0.poll_ready(ctx)
     }
 
+    #[inline]
+    fn poll_shutdown(&mut self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> {
+        self.0.poll_shutdown(cx, is_error)
+    }
+
+    #[inline]
     fn call(&mut self, req: Self::Request) -> Self::Future {
         Box::pin(self.0.call(req))
     }
diff --git a/actix-net/actix-service/src/cell.rs b/actix-net/actix-service/src/cell.rs
index 3bcac0be..9981fc6e 100644
--- a/actix-net/actix-service/src/cell.rs
+++ b/actix-net/actix-service/src/cell.rs
@@ -51,6 +51,10 @@ impl<T: crate::Service> crate::Service for Cell<T> {
         self.get_mut().poll_ready(cx)
     }
 
+    fn poll_shutdown(&mut self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> {
+        self.get_mut().poll_shutdown(cx, is_error)
+    }
+
     fn call(&mut self, req: Self::Request) -> Self::Future {
         self.get_mut().call(req)
     }
diff --git a/actix-net/actix-service/src/lib.rs b/actix-net/actix-service/src/lib.rs
index 90d4c790..826a7182 100644
--- a/actix-net/actix-service/src/lib.rs
+++ b/actix-net/actix-service/src/lib.rs
@@ -97,6 +97,16 @@ pub trait Service {
     /// 2. In case of chained services, `.poll_ready()` get called for all services at once.
     fn poll_ready(&mut self, ctx: &mut task::Context<'_>) -> Poll<Result<(), Self::Error>>;
 
+    #[inline]
+    #[allow(unused_variables)]
+    /// Shutdown service.
+    ///
+    /// Returns `Ready` when the service is properly shutdowned. This method might be called
+    /// after it returns `Ready`.
+    fn poll_shutdown(&mut self, ctx: &mut task::Context<'_>, is_error: bool) -> Poll<()> {
+        Poll::Ready(())
+    }
+
     /// Process the request and return the response asynchronously.
     ///
     /// This function is expected to be callable off task. As such,
@@ -108,6 +118,7 @@ pub trait Service {
     /// implementation must be resilient to this fact.
     fn call(&mut self, req: Self::Request) -> Self::Future;
 
+    #[inline]
     /// Map this service's output to a different type, returning a new service
     /// of the resulting type.
     ///
@@ -125,6 +136,7 @@ pub trait Service {
         crate::dev::Map::new(self, f)
     }
 
+    #[inline]
     /// Map this service's error to a different error, returning a new service.
     ///
     /// This function is similar to the `Result::map_err` where it will change
diff --git a/actix-net/actix-service/src/map.rs b/actix-net/actix-service/src/map.rs
index ec3520a1..78e90937 100644
--- a/actix-net/actix-service/src/map.rs
+++ b/actix-net/actix-service/src/map.rs
@@ -53,10 +53,17 @@ where
     type Error = A::Error;
     type Future = MapFuture<A, F, Response>;
 
-    fn poll_ready(&mut self, ctx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.service.poll_ready(ctx)
+    #[inline]
+    fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        self.service.poll_ready(cx)
     }
 
+    #[inline]
+    fn poll_shutdown(&mut self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> {
+        self.service.poll_shutdown(cx, is_error)
+    }
+
+    #[inline]
     fn call(&mut self, req: A::Request) -> Self::Future {
         MapFuture::new(self.service.call(req), self.f.clone())
     }
diff --git a/actix-net/actix-service/src/map_err.rs b/actix-net/actix-service/src/map_err.rs
index ee7145c3..5b48b290 100644
--- a/actix-net/actix-service/src/map_err.rs
+++ b/actix-net/actix-service/src/map_err.rs
@@ -54,10 +54,17 @@ where
     type Error = E;
     type Future = MapErrFuture<A, F, E>;
 
-    fn poll_ready(&mut self, ctx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.service.poll_ready(ctx).map_err(&self.f)
+    #[inline]
+    fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
+        self.service.poll_ready(cx).map_err(&self.f)
     }
 
+    #[inline]
+    fn poll_shutdown(&mut self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> {
+        self.service.poll_shutdown(cx, is_error)
+    }
+
+    #[inline]
     fn call(&mut self, req: A::Request) -> Self::Future {
         MapErrFuture::new(self.service.call(req), self.f.clone())
     }
diff --git a/actix-net/actix-service/src/pipeline.rs b/actix-net/actix-service/src/pipeline.rs
index 69881e4b..68fffc98 100644
--- a/actix-net/actix-service/src/pipeline.rs
+++ b/actix-net/actix-service/src/pipeline.rs
@@ -161,8 +161,13 @@ impl<T: Service> Service for Pipeline<T> {
     type Future = T::Future;
 
     #[inline]
-    fn poll_ready(&mut self, ctx: &mut Context<'_>) -> Poll<Result<(), T::Error>> {
-        self.service.poll_ready(ctx)
+    fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), T::Error>> {
+        self.service.poll_ready(cx)
+    }
+
+    #[inline]
+    fn poll_shutdown(&mut self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> {
+        self.service.poll_shutdown(cx, is_error)
     }
 
     #[inline]
diff --git a/actix-net/actix-service/src/then.rs b/actix-net/actix-service/src/then.rs
index b3a624ab..c7073b45 100644
--- a/actix-net/actix-service/src/then.rs
+++ b/actix-net/actix-service/src/then.rs
@@ -49,6 +49,18 @@ where
         }
     }
 
+    fn poll_shutdown(&mut self, cx: &mut Context<'_>, is_error: bool) -> Poll<()> {
+        let srv = self.0.get_mut();
+
+        if srv.0.poll_shutdown(cx, is_error).is_ready()
+            && srv.1.poll_shutdown(cx, is_error).is_ready()
+        {
+            Poll::Ready(())
+        } else {
+            Poll::Pending
+        }
+    }
+
     fn call(&mut self, req: A::Request) -> Self::Future {
         ThenServiceResponse {
             state: State::A(self.0.get_mut().0.call(req), Some(self.0.clone())),
diff --git a/ntex/src/server/test.rs b/ntex/src/server/test.rs
index bf1d8fef..f33ea332 100644
--- a/ntex/src/server/test.rs
+++ b/ntex/src/server/test.rs
@@ -59,10 +59,7 @@ pub fn test_server<F: ServiceFactory<TcpStream>>(factory: F) -> TestServer {
 
     let (system, addr) = rx.recv().unwrap();
 
-    TestServer {
-        addr,
-        system,
-    }
+    TestServer { addr, system }
 }
 
 /// Test server controller