diff --git a/Cargo.toml b/Cargo.toml
index 0ea1d425..d1b20be9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,5 +29,6 @@ sha-1 = { default-features = false, version = "0.9" }
 
 [dev-dependencies]
 quickcheck = "0.9"
-tokio = { version = "0.2", features = ["dns", "stream", "tcp", "rt-threaded", "macros"] }
-tokio-util = { version = "0.3", features = ["compat"] }
+tokio = { version = "1", features = ["full"] }
+tokio-util = { version = "0.6", features = ["compat"] }
+tokio-stream = { version = "0.1", features = ["net"] }
diff --git a/examples/autobahn_client.rs b/examples/autobahn_client.rs
index 02612651..6df99f25 100644
--- a/examples/autobahn_client.rs
+++ b/examples/autobahn_client.rs
@@ -18,7 +18,7 @@ use futures::io::{BufReader, BufWriter};
 use soketto::{BoxedError, connection, handshake};
 use std::str::FromStr;
 use tokio::net::TcpStream;
-use tokio_util::compat::{Compat, Tokio02AsyncReadCompatExt};
+use tokio_util::compat::{Compat, TokioAsyncReadCompatExt};
 
 const SOKETTO_VERSION: &str = env!("CARGO_PKG_VERSION");
 
diff --git a/examples/autobahn_server.rs b/examples/autobahn_server.rs
index 1106df23..88614f28 100644
--- a/examples/autobahn_server.rs
+++ b/examples/autobahn_server.rs
@@ -16,13 +16,13 @@
 
 use futures::io::{BufReader, BufWriter};
 use soketto::{BoxedError, connection, handshake};
-use tokio::{net::{TcpListener, TcpStream}, stream::StreamExt};
-use tokio_util::compat::{Compat, Tokio02AsyncReadCompatExt};
-
+use tokio::{net::{TcpListener, TcpStream}};
+use tokio_util::compat::{Compat, TokioAsyncReadCompatExt};
+use tokio_stream::{wrappers::TcpListenerStream, StreamExt};
 #[tokio::main]
 async fn main() -> Result<(), BoxedError> {
-    let mut listener = TcpListener::bind("127.0.0.1:9001").await?;
-    let mut incoming = listener.incoming();
+    let listener = TcpListener::bind("127.0.0.1:9001").await?;
+    let mut incoming = TcpListenerStream::new(listener);
     while let Some(socket) = incoming.next().await {
         let mut server = new_server(socket?);
         let key = {
diff --git a/src/lib.rs b/src/lib.rs
index fc026e83..038afb97 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -27,7 +27,7 @@
 //! # Client example
 //!
 //! ```no_run
-//! # use tokio_util::compat::Tokio02AsyncReadCompatExt;
+//! # use tokio_util::compat::TokioAsyncReadCompatExt;
 //! # async fn doc() -> Result<(), soketto::BoxedError> {
 //! use soketto::handshake::{Client, ServerResponse};
 //!
@@ -61,14 +61,14 @@
 //! # Server example
 //!
 //! ```no_run
-//! # use tokio_util::compat::Tokio02AsyncReadCompatExt;
-//! # use tokio::stream::StreamExt;
+//! # use tokio_util::compat::TokioAsyncReadCompatExt;
+//! # use tokio_stream::{wrappers::TcpListenerStream, StreamExt};
 //! # async fn doc() -> Result<(), soketto::BoxedError> {
 //! use soketto::{handshake::{Server, ClientRequest, server::Response}};
 //!
 //! // First, we listen for incoming connections.
-//! let mut listener = tokio::net::TcpListener::bind("...").await?;
-//! let mut incoming = listener.incoming();
+//! let listener = tokio::net::TcpListener::bind("...").await?;
+//! let mut incoming = TcpListenerStream::new(listener);
 //!
 //! while let Some(socket) = incoming.next().await {
 //!     // For each incoming connection we perform a handshake.