diff --git a/test/nodejs/Makefile.am b/test/nodejs/Makefile.am
index fc8e7d0..32397f1 100755
--- a/test/nodejs/Makefile.am
+++ b/test/nodejs/Makefile.am
@@ -27,7 +27,7 @@
 	$(RM) -r gen-nodejs
 
 server: stubs
-	NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift node server.js
+	NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift:$(NODE_PATH) node server.js
 
 client: stubs
-	NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift node client.js
+	NODE_PATH=../../lib/nodejs/lib:../../lib/nodejs/lib/thrift:$(NODE_PATH) node client.js
diff --git a/test/test.sh b/test/test.sh
index 36e57c3..2e53fb0 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -94,6 +94,9 @@
   done;
 done;
 
+# delete Unix Domain Socket used by cpp tests
+rm -f /tmp/ThriftTest.thrift
+
 do_test "py-py" "binary" "buffered-ip" \
         "py/TestClient.py --proto=binary --port=9090 --host=localhost --genpydir=py/gen-py" \
         "py/TestServer.py --proto=binary --port=9090 --genpydir=py/gen-py TSimpleServer" \