diff --git a/test/nodejs/Makefile.am b/test/nodejs/Makefile.am
index f796b07..ab9a554 100755
--- a/test/nodejs/Makefile.am
+++ b/test/nodejs/Makefile.am
@@ -32,6 +32,12 @@
 		sleep 1; $(MAKE) client; sleep 2; \
 	fi
 
+	@if which node &> /dev/null ; then \
+		echo "   Testing Multiplex Client/Server"; \
+		sleep 4; timeout -s14 5 $(MAKE) mserver & \
+		sleep 1; $(MAKE) mclient; sleep 2; \
+	fi
+
 clean-local:
 	$(RM) -r gen-nodejs
 
@@ -40,3 +46,9 @@
 
 client:
 	NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift:$(NODE_PATH) node client.js
+
+mserver:
+	NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift:$(NODE_PATH) node --harmony multiplex_server.js
+
+mclient:
+	NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift:$(NODE_PATH) node --harmony multiplex_client.js