diff --git a/all/entrypoint.sh b/all/entrypoint.sh
index 3c4f8334..f830e506 100755
--- a/all/entrypoint.sh
+++ b/all/entrypoint.sh
@@ -19,7 +19,7 @@ printUsage() {
 }
 
 GEN_GATEWAY=false
-SUPPORTED_LANGUAGES=("go" "ruby" "csharp" "java" "python" "objc")
+SUPPORTED_LANGUAGES=("go" "ruby" "csharp" "java" "python" "objc" "node")
 EXTRA_INCLUDES=""
 OUT_DIR=""
 
@@ -143,6 +143,9 @@ case $GEN_LANG in
     "java")
         GEN_STRING="--grpc_out=$OUT_DIR --${GEN_LANG}_out=$OUT_DIR --plugin=protoc-gen-grpc=`which protoc-gen-grpc-java`"
         ;;
+    "node")
+        GEN_STRING="--grpc_out=$OUT_DIR --js_out=import_style=commonjs,binary:$OUT_DIR --plugin=protoc-gen-grpc=`which grpc_${PLUGIN_LANG}_plugin`"
+        ;;
     *)
         GEN_STRING="--grpc_out=$OUT_DIR --${GEN_LANG}_out=$OUT_DIR --plugin=protoc-gen-grpc=`which grpc_${PLUGIN_LANG}_plugin`"
         ;;
diff --git a/all/test.sh b/all/test.sh
index b616331c..56f7c355 100755
--- a/all/test.sh
+++ b/all/test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-LANGS=("go" "ruby" "csharp" "java" "python" "objc")
+LANGS=("go" "ruby" "csharp" "java" "python" "objc" "node")
 
 CONTAINER=$1