diff --git a/Cargo.toml b/Cargo.toml
index 0b672a3..bf3596e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,7 @@ branch = "master"
 [features]
 # Enables `futures::Stream` implementations for various types.
 # This is an optional feature due to `Stream` not being stable.
-stream = []
+unstable-stream = []
 
 # Enables **unstable** APIs. Any API exposed by this feature has no backwards
 # compatibility guarantees. In other words, you should not use this feature for
diff --git a/src/client.rs b/src/client.rs
index 81ac093..d6b3667 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -1306,7 +1306,7 @@ impl PushPromises {
     }
 }
 
-#[cfg(feature = "stream")]
+#[cfg(feature = "unstable-stream")]
 impl futures_core::Stream for PushPromises {
     type Item = Result<PushPromise, crate::Error>;
 
diff --git a/src/server.rs b/src/server.rs
index 17f41e4..c7cdc66 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -477,7 +477,7 @@ where
     }
 }
 
-#[cfg(feature = "stream")]
+#[cfg(feature = "unstable-stream")]
 impl<T, B> futures_core::Stream for Connection<T, B>
 where
     T: AsyncRead + AsyncWrite + Unpin,
diff --git a/src/share.rs b/src/share.rs
index d6dfa72..8c2f211 100644
--- a/src/share.rs
+++ b/src/share.rs
@@ -7,7 +7,7 @@ use http::HeaderMap;
 
 use crate::PollExt;
 use std::fmt;
-#[cfg(feature = "stream")]
+#[cfg(feature = "unstable-stream")]
 use std::pin::Pin;
 use std::task::{Context, Poll};
 
@@ -448,7 +448,7 @@ impl RecvStream {
     }
 }
 
-#[cfg(feature = "stream")]
+#[cfg(feature = "unstable-stream")]
 impl futures_core::Stream for RecvStream {
     type Item = Result<Bytes, crate::Error>;
 
diff --git a/tests/h2-support/Cargo.toml b/tests/h2-support/Cargo.toml
index d3ec410..65248ff 100644
--- a/tests/h2-support/Cargo.toml
+++ b/tests/h2-support/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Carl Lerche <me@carllerche.com>"]
 edition = "2018"
 
 [dependencies]
-h2 = { path = "../..", features = ["stream", "unstable"] }
+h2 = { path = "../..", features = ["unstable-stream", "unstable"] }
 
 bytes = "0.4.7"
 env_logger = "0.5.9"