diff --git a/test/communication-tests.js b/test/communication-tests.js
new file mode 100644
index 00000000..ccb905ba
--- /dev/null
+++ b/test/communication-tests.js
@@ -0,0 +1,17 @@
+require(__dirname+'/test-helper');
+
+var MemoryStream = function() {
+  EventEmitter.call(this);
+};
+
+sys.inherits(MemoryStream, EventEmitter);
+
+var p = MemoryStream.prototype;
+
+test('client can take existing stream', function() {
+  var stream = new MemoryStream();
+  var client = new Client({
+    stream: stream
+  });
+  assert.equal(client.stream, stream);
+});
diff --git a/test/test-helper.js b/test/test-helper.js
index 25276113..16f3722c 100644
--- a/test/test-helper.js
+++ b/test/test-helper.js
@@ -2,6 +2,7 @@ sys = require('sys');
 assert = require('assert');
 Client = require(__dirname+"/../lib/").Client;
 Parser = require(__dirname+"/../lib/").Parser;
+EventEmitter = require('events').EventEmitter;
 
 assert.same = function(actual, expected) {
   for(var key in expected) {