diff --git a/Cargo.toml b/Cargo.toml
index a69378ae..4d948643 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,7 +29,7 @@ itoa = "0.4.1"
 log = "0.4"
 net2 = { version = "0.2.32", optional = true }
 time = "0.1"
-tokio = { version = "0.1.7", optional = true }
+tokio = { version = "0.1.14", optional = true, default-features = false, features = ["rt-full"] }
 tokio-executor = { version = "0.1.0", optional = true }
 tokio-io = "0.1"
 tokio-reactor = { version = "0.1", optional = true }
diff --git a/tests/client.rs b/tests/client.rs
index 180f9269..54fb15d4 100644
--- a/tests/client.rs
+++ b/tests/client.rs
@@ -6,6 +6,7 @@ extern crate futures_timer;
 extern crate net2;
 extern crate tokio;
 extern crate tokio_io;
+extern crate tokio_tcp;
 extern crate pretty_env_logger;
 
 use std::io::{Read, Write};
@@ -18,7 +19,7 @@ use hyper::{Body, Client, Method, Request, StatusCode};
 use futures::{Future, Stream};
 use futures::sync::oneshot;
 use tokio::runtime::current_thread::Runtime;
-use tokio::net::tcp::{ConnectFuture, TcpListener as TkTcpListener, TcpStream};
+use tokio_tcp::{ConnectFuture, TcpListener as TkTcpListener, TcpStream};
 
 fn s(buf: &[u8]) -> &str {
     ::std::str::from_utf8(buf).expect("from_utf8")
@@ -713,7 +714,7 @@ mod dispatch_impl {
     use futures::{self, Future};
     use futures::sync::{mpsc, oneshot};
     use futures_timer::Delay;
-    use tokio::net::TcpStream;
+    use tokio_tcp::TcpStream;
     use tokio::runtime::current_thread::Runtime;
     use tokio_io::{AsyncRead, AsyncWrite};
 
@@ -1578,7 +1579,7 @@ mod conn {
     use futures::sync::oneshot;
     use futures_timer::Delay;
     use tokio::runtime::current_thread::Runtime;
-    use tokio::net::TcpStream;
+    use tokio_tcp::TcpStream;
     use tokio_io::{AsyncRead, AsyncWrite};
 
     use hyper::{self, Request, Body, Method};
diff --git a/tests/server.rs b/tests/server.rs
index 24b35471..923510ee 100644
--- a/tests/server.rs
+++ b/tests/server.rs
@@ -9,6 +9,7 @@ extern crate spmc;
 extern crate pretty_env_logger;
 extern crate tokio;
 extern crate tokio_io;
+extern crate tokio_tcp;
 
 use std::net::{TcpStream, Shutdown, SocketAddr};
 use std::io::{self, Read, Write};
@@ -24,7 +25,7 @@ use futures::future::{self, FutureResult, Either};
 use futures::sync::oneshot;
 use futures_timer::Delay;
 use http::header::{HeaderName, HeaderValue};
-use tokio::net::{TcpListener, TcpStream as TkTcpStream};
+use tokio_tcp::{TcpListener, TcpStream as TkTcpStream};
 use tokio::runtime::current_thread::Runtime;
 use tokio::reactor::Handle;
 use tokio_io::{AsyncRead, AsyncWrite};