diff --git a/actix-service/src/map_config.rs b/actix-service/src/map_config.rs
index d6d6f6b2..1297f7a0 100644
--- a/actix-service/src/map_config.rs
+++ b/actix-service/src/map_config.rs
@@ -6,7 +6,7 @@ use super::{IntoServiceFactory, ServiceFactory};
 ///
 /// Note that this function consumes the receiving service factory and returns
 /// a wrapped version of it.
-pub fn map_config<I, SF, S, Req, F, Cfg>(factory: I, f: F) -> MapConfig<SF, Req, F, Cfg>
+pub fn map_config<I, SF, Req, F, Cfg>(factory: I, f: F) -> MapConfig<SF, Req, F, Cfg>
 where
     I: IntoServiceFactory<SF, Req>,
     SF: ServiceFactory<Req>,
diff --git a/actix-tls/tests/test_connect.rs b/actix-tls/tests/test_connect.rs
index fd083893..83ff00d1 100644
--- a/actix-tls/tests/test_connect.rs
+++ b/actix-tls/tests/test_connect.rs
@@ -3,7 +3,7 @@ use std::io;
 use actix_codec::{BytesCodec, Framed};
 use actix_rt::net::TcpStream;
 use actix_service::{fn_service, Service, ServiceFactory};
-use actix_testing::TestServer;
+use actix_server::TestServer;
 use bytes::Bytes;
 use futures_util::sink::SinkExt;