diff --git a/lib/stream.js b/lib/stream.js
index c03b8b77de..b40a774d9c 100644
--- a/lib/stream.js
+++ b/lib/stream.js
@@ -106,7 +106,6 @@ Stream.prototype.pipe = function(dest, options) {
   source.on('end', cleanup);
   source.on('close', cleanup);
 
-  dest.on('end', cleanup);
   dest.on('close', cleanup);
 
   dest.emit('pipe', source);
diff --git a/test/simple/test-stream-pipe-cleanup.js b/test/simple/test-stream-pipe-cleanup.js
index 5a72a48fb0..f689358524 100644
--- a/test/simple/test-stream-pipe-cleanup.js
+++ b/test/simple/test-stream-pipe-cleanup.js
@@ -47,15 +47,17 @@ function Readable() {
 }
 util.inherits(Readable, stream.Stream);
 
+function Duplex() {
+  this.readable = true;
+  Writable.call(this);
+}
+util.inherits(Duplex, Writable);
+
 var i = 0;
 var limit = 100;
 
 var w = new Writable();
 
-console.error = function(text) {
-  throw new Error(text);
-};
-
 var r;
 
 for (i = 0; i < limit; i++) {
@@ -80,13 +82,6 @@ w.endCalls = 0;
 
 r = new Readable();
 
-for (i = 0; i < limit; i++) {
-  w = new Writable();
-  r.pipe(w);
-  w.emit('end');
-}
-assert.equal(0, w.listeners('end').length);
-
 for (i = 0; i < limit; i++) {
   w = new Writable();
   r.pipe(w);
@@ -94,3 +89,34 @@ for (i = 0; i < limit; i++) {
 }
 assert.equal(0, w.listeners('close').length);
 
+r = new Readable();
+w = new Writable();
+var d = new Duplex();
+r.pipe(d); // pipeline A
+d.pipe(w); // pipeline B
+assert.equal(r.listeners('end').length, 2);   // A.onend, A.cleanup
+assert.equal(r.listeners('close').length, 2); // A.onclose, A.cleanup
+assert.equal(d.listeners('end').length, 2);   // B.onend, B.cleanup
+assert.equal(d.listeners('close').length, 3); // A.cleanup, B.onclose, B.cleanup
+assert.equal(w.listeners('end').length, 0);
+assert.equal(w.listeners('close').length, 1); // B.cleanup
+
+r.emit('end');
+assert.equal(d.endCalls, 1);
+assert.equal(w.endCalls, 0);
+assert.equal(r.listeners('end').length, 0);
+assert.equal(r.listeners('close').length, 0);
+assert.equal(d.listeners('end').length, 2);   // B.onend, B.cleanup
+assert.equal(d.listeners('close').length, 2); // B.onclose, B.cleanup
+assert.equal(w.listeners('end').length, 0);
+assert.equal(w.listeners('close').length, 1); // B.cleanup
+
+d.emit('end');
+assert.equal(d.endCalls, 1);
+assert.equal(w.endCalls, 1);
+assert.equal(r.listeners('end').length, 0);
+assert.equal(r.listeners('close').length, 0);
+assert.equal(d.listeners('end').length, 0);
+assert.equal(d.listeners('close').length, 0);
+assert.equal(w.listeners('end').length, 0);
+assert.equal(w.listeners('close').length, 0);