diff --git a/src/agent.rs b/src/agent.rs
index e6f0ab2..a785fca 100644
--- a/src/agent.rs
+++ b/src/agent.rs
@@ -325,6 +325,11 @@ impl Agent {
     {
         self.request("PATCH", path)
     }
+
+    #[cfg(test)]
+    pub fn state(&self) -> &Arc<Mutex<Option<AgentState>>> {
+        &self.state
+    }
 }
 
 fn basic_auth(user: &str, pass: &str) -> String {
diff --git a/src/pool.rs b/src/pool.rs
index fcf9104..00239a0 100644
--- a/src/pool.rs
+++ b/src/pool.rs
@@ -20,6 +20,20 @@ impl ConnectionPool {
     pub fn try_get_connection(&mut self, url: &Url) -> Option<Stream> {
         self.recycle.remove(&PoolKey::new(url))
     }
+
+    #[cfg(test)]
+    pub fn len(&self) -> usize {
+        self.recycle.len()
+    }
+
+    #[cfg(test)]
+    pub fn get(&self, hostname: &str, port: u16) -> Option<&Stream> {
+        let key = PoolKey {
+            hostname: hostname.into(),
+            port,
+        };
+        self.recycle.get(&key)
+    }
 }
 
 #[derive(Debug, PartialEq, Clone, Eq, Hash)]
@@ -66,12 +80,16 @@ impl<R: Read + Sized> PoolReturnRead<R> {
             if let Some(agent) = state.as_mut() {
                 unsafe {
                     let stream = *Box::from_raw(self.stream);
+                    self.stream = ::std::ptr::null_mut();
+                    if !stream.is_poolable() {
+                        // just let it deallocate
+                        return;
+                    }
                     // insert back into pool
                     let key = PoolKey::new(&unit.url);
                     agent.pool().recycle.insert(key, stream);
                 }
             };
-            self.stream = ::std::ptr::null_mut();
         }
     }
 
diff --git a/src/stream.rs b/src/stream.rs
index 514d8ca..ac54d30 100644
--- a/src/stream.rs
+++ b/src/stream.rs
@@ -35,6 +35,14 @@ impl ::std::fmt::Debug for Stream {
 }
 
 impl Stream {
+    pub fn is_poolable(&self) -> bool {
+        match self {
+            Stream::Http(_) => true,
+            Stream::Https(_) => true,
+            _ => false,
+        }
+    }
+
     #[cfg(test)]
     pub fn to_write_vec(&self) -> Vec<u8> {
         match self {
diff --git a/src/test/range.rs b/src/test/range.rs
index d0dcc26..f548c15 100644
--- a/src/test/range.rs
+++ b/src/test/range.rs
@@ -17,3 +17,38 @@ fn read_range() {
         [0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 3, 232, 0, 0, 0, 1]
     )
 }
+
+#[test]
+fn agent_pool() {
+    let agent = agent().build();
+
+    // req 1
+    let resp = agent.get("https://s3.amazonaws.com/foosrvr/bbb.mp4")
+        .set("Range", "bytes=1000-1999")
+        .call();
+    assert_eq!(*resp.status(), 206);
+    let mut reader = resp.into_reader();
+    let mut buf = vec![];
+    // reading the entire content will return the connection to the pool
+    let len = reader.read_to_end(&mut buf).unwrap();
+    assert_eq!(len, 1000);
+
+    {
+        let mut lock = agent.state().lock().unwrap();
+        let state = lock.as_mut().unwrap();
+        let pool = state.pool();
+        assert_eq!(pool.len(), 1);
+        let foo = format!("{:?}", pool.get("s3.amazonaws.com", 443));
+        assert_eq!(foo, "Some(Stream[https])"); // not a great way of testing.
+    }
+
+    // req 2 should be done with a reused connection
+    let resp = agent.get("https://s3.amazonaws.com/foosrvr/bbb.mp4")
+        .set("Range", "bytes=5000-6999")
+        .call();
+    assert_eq!(*resp.status(), 206);
+    let mut reader = resp.into_reader();
+    let mut buf = vec![];
+    let len = reader.read_to_end(&mut buf).unwrap();
+    assert_eq!(len, 2000);
+}