diff --git a/tower-balance/Cargo.toml b/tower-balance/Cargo.toml
index 48952ac..4883ec1 100644
--- a/tower-balance/Cargo.toml
+++ b/tower-balance/Cargo.toml
@@ -37,7 +37,7 @@ tower-util = "0.1.0"
 [dev-dependencies]
 log = "0.4.1"
 env_logger = { version = "0.5.3", default-features = false }
-hdrsample = "6.0"
+hdrhistogram = "6.0"
 quickcheck = { version = "0.6", default-features = false }
 tokio = "0.1.7"
 tokio-executor = "0.1.2"
diff --git a/tower-balance/examples/demo.rs b/tower-balance/examples/demo.rs
index 076348e..a85c924 100644
--- a/tower-balance/examples/demo.rs
+++ b/tower-balance/examples/demo.rs
@@ -2,7 +2,7 @@
 
 use env_logger;
 use futures::{future, stream, Async, Future, Poll, Stream};
-use hdrsample::Histogram;
+use hdrhistogram::Histogram;
 use rand::{self, Rng};
 use std::time::{Duration, Instant};
 use tokio::{runtime, timer};
diff --git a/tower-load-shed/tests/load-shed.rs b/tower-load-shed/tests/load-shed.rs
index 9c7970e..a7ae11d 100644
--- a/tower-load-shed/tests/load-shed.rs
+++ b/tower-load-shed/tests/load-shed.rs
@@ -49,6 +49,6 @@ fn new_service() -> (LoadShed<Mock>, Handle) {
 }
 
 fn with_task<F: FnOnce() -> U, U>(f: F) -> U {
-    use futures::future::{lazy, Future};
+    use futures::future::lazy;
     lazy(|| Ok::<_, ()>(f())).wait().unwrap()
 }
diff --git a/tower-retry/tests/retry.rs b/tower-retry/tests/retry.rs
index 821e6c8..92120e5 100644
--- a/tower-retry/tests/retry.rs
+++ b/tower-retry/tests/retry.rs
@@ -163,7 +163,6 @@ fn assert_not_ready<F: Future>(f: &mut F)
 where
     F::Error: ::std::fmt::Debug,
 {
-    use futures::future;
     future::poll_fn(|| {
         assert!(f.poll().unwrap().is_not_ready());
         Ok::<_, ()>(().into())
diff --git a/tower-test/tests/mock.rs b/tower-test/tests/mock.rs
index a58a427..7ba1263 100644
--- a/tower-test/tests/mock.rs
+++ b/tower-test/tests/mock.rs
@@ -54,6 +54,6 @@ fn new_mock() -> (Mock, Handle) {
 
 // Helper to run some code within context of a task
 fn with_task<F: FnOnce() -> U, U>(f: F) -> U {
-    use futures::future::{lazy, Future};
+    use futures::future::lazy;
     lazy(|| Ok::<_, ()>(f())).wait().unwrap()
 }