diff --git a/tokio/src/lib.rs b/tokio/src/lib.rs
index fbf28ff8d..09ef1c107 100644
--- a/tokio/src/lib.rs
+++ b/tokio/src/lib.rs
@@ -16,6 +16,7 @@
     attr(deny(warnings, rust_2018_idioms), allow(dead_code, unused_variables))
 ))]
 #![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, allow(unused_attributes))]
 
 //! A runtime for writing reliable network applications without compromising speed.
 //!
diff --git a/tokio/src/macros/cfg.rs b/tokio/src/macros/cfg.rs
index 7c87522d0..8318fd12a 100644
--- a/tokio/src/macros/cfg.rs
+++ b/tokio/src/macros/cfg.rs
@@ -176,7 +176,7 @@ macro_rules! cfg_net_unix {
     ($($item:item)*) => {
         $(
             #[cfg(all(unix, feature = "net"))]
-            #[cfg_attr(docsrs, doc(cfg(feature = "net")))]
+            #[cfg_attr(docsrs, doc(cfg(all(unix, feature = "net"))))]
             $item
         )*
     }
diff --git a/tokio/tests/io_async_fd.rs b/tokio/tests/io_async_fd.rs
index dc21e426f..5a6875e3c 100644
--- a/tokio/tests/io_async_fd.rs
+++ b/tokio/tests/io_async_fd.rs
@@ -15,7 +15,7 @@ use std::{
 
 use nix::unistd::{close, read, write};
 
-use futures::{poll, FutureExt};
+use futures::poll;
 
 use tokio::io::unix::{AsyncFd, AsyncFdReadyGuard};
 use tokio_test::{assert_err, assert_pending};
@@ -163,10 +163,11 @@ async fn initially_writable() {
     afd_a.writable().await.unwrap().clear_ready();
     afd_b.writable().await.unwrap().clear_ready();
 
-    futures::select_biased! {
-        _ = tokio::time::sleep(Duration::from_millis(10)).fuse() => {},
-        _ = afd_a.readable().fuse() => panic!("Unexpected readable state"),
-        _ = afd_b.readable().fuse() => panic!("Unexpected readable state"),
+    tokio::select! {
+        biased;
+        _ = tokio::time::sleep(Duration::from_millis(10)) => {},
+        _ = afd_a.readable() => panic!("Unexpected readable state"),
+        _ = afd_b.readable() => panic!("Unexpected readable state"),
     }
 }
 
@@ -353,12 +354,13 @@ async fn multiple_waiters() {
                 futures::future::pending::<()>().await;
             };
 
-            futures::select_biased! {
-                guard = afd_a.readable().fuse() => {
+            tokio::select! {
+                biased;
+                guard = afd_a.readable() => {
                     tokio::task::yield_now().await;
                     guard.unwrap().clear_ready()
                 },
-                _ = notify_barrier.fuse() => unreachable!(),
+                _ = notify_barrier => unreachable!(),
             }
 
             std::mem::drop(afd_a);