diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs
index b862a594ed2..6fe1b2a3b47 100644
--- a/src/libstd/sync/mpsc/mod.rs
+++ b/src/libstd/sync/mpsc/mod.rs
@@ -1854,8 +1854,6 @@ mod tests {
                 for x in response_rx.try_iter() {
                     count += x;
                     if count == 6 {
-                        drop(response_rx);
-                        drop(request_tx);
                         return count;
                     }
                 }
@@ -1864,7 +1862,9 @@ mod tests {
         });
 
         for _ in request_rx.iter() {
-            response_tx.send(2).unwrap();
+            if response_tx.send(2).is_err() {
+                break;
+            }
         }
 
         assert_eq!(t.join().unwrap(), 6);