diff --git a/lib/_stream_readable.js b/lib/_stream_readable.js
index 0316a05571080b..ea36e6ed62abf2 100644
--- a/lib/_stream_readable.js
+++ b/lib/_stream_readable.js
@@ -385,6 +385,7 @@ function onEofChunk(stream, state) {
     }
   }
   state.ended = true;
+  stream.readable = false;
 
   // emit 'readable' now to make sure it gets picked up.
   emitReadable(stream);
@@ -670,7 +671,7 @@ Readable.prototype.on = function(ev, fn) {
     this.resume();
   }
 
-  if (ev === 'readable' && this.readable) {
+  if (ev === 'readable' && !this._readableState.endEmitted) {
     var state = this._readableState;
     if (!state.readableListening) {
       state.readableListening = true;
diff --git a/lib/_stream_writable.js b/lib/_stream_writable.js
index 73f4d9fb3e193f..10fcae04f5553e 100644
--- a/lib/_stream_writable.js
+++ b/lib/_stream_writable.js
@@ -483,4 +483,5 @@ function endWritable(stream, state, cb) {
       stream.once('finish', cb);
   }
   state.ended = true;
+  stream.writable = false;
 }
diff --git a/test/parallel/test-stream2-compatibility.js b/test/parallel/test-stream2-compatibility.js
index 9eab7b713bf167..cbb65facfa7073 100644
--- a/test/parallel/test-stream2-compatibility.js
+++ b/test/parallel/test-stream2-compatibility.js
@@ -1,6 +1,7 @@
 'use strict';
 var common = require('../common');
 var R = require('_stream_readable');
+var W = require('_stream_writable');
 var assert = require('assert');
 
 var util = require('util');
@@ -29,4 +30,25 @@ var reader = new TestReader();
 setImmediate(function() {
   assert.equal(ondataCalled, 1);
   console.log('ok');
+  reader.push(null);
+});
+
+function TestWriter() {
+  W.apply(this);
+  this.write('foo');
+  this.end();
+}
+
+util.inherits(TestWriter, W);
+
+TestWriter.prototype._write = function(chunk, enc, cb) {
+  cb();
+};
+
+var writer = new TestWriter();
+
+process.on('exit', function() {
+  assert.strictEqual(reader.readable, false);
+  assert.strictEqual(writer.writable, false);
+  console.log('ok');
 });