diff --git a/test/nodejs/Makefile.am b/test/nodejs/Makefile.am
index 8f74ba8..06e2eec 100755
--- a/test/nodejs/Makefile.am
+++ b/test/nodejs/Makefile.am
@@ -22,14 +22,15 @@
 	$(THRIFT) --gen js:node ../ThriftTest.thrift
 
 check: stubs
-	@if which expresso &> /dev/null ; then \
+	@if which nodeunit &> /dev/null ; then \
 		echo "   Testing thrift/binary"; \
 		NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift:$(NODE_PATH) nodeunit ../../lib/nodejs/test/binary.test.js; \
 	fi
-	timeout 2 $(MAKE) server &
-	@sleep 1
-	$(MAKE) client
-	@sleep 1
+	@if which node &> /dev/null ; then \
+		echo "   Testing Client/Server"; \
+		timeout 2 $(MAKE) server & \
+		sleep 1; $(MAKE) client; sleep 1; \
+	fi
 
 clean-local:
 	$(RM) -r gen-nodejs