diff --git a/js/binary/proto_test.js b/js/binary/proto_test.js
index ae50a703844ca..f86dc6455bb48 100644
--- a/js/binary/proto_test.js
+++ b/js/binary/proto_test.js
@@ -88,7 +88,7 @@ goog.require('proto.jspb.test.extendRepeatedStringList');
 goog.require('proto.jspb.test.extendRepeatedUint32List');
 goog.require('proto.jspb.test.extendRepeatedUint64List');
 
-// CommonJS-LoadFromFile: google/protobuf/any_pb proto.google.protobuf
+// CommonJS-LoadFromFile: ../node_modules/google-protobuf/google/protobuf/any_pb proto.google.protobuf
 goog.require('proto.google.protobuf.Any');
 
 
diff --git a/js/commonjs/export.js b/js/commonjs/export.js
index 2403b1a490ccc..1eaab5d51cbe4 100644
--- a/js/commonjs/export.js
+++ b/js/commonjs/export.js
@@ -24,3 +24,4 @@ exports.ExtensionFieldBinaryInfo = jspb.ExtensionFieldBinaryInfo;
 exports.exportSymbol = goog.exportSymbol;
 exports.inherits = goog.inherits;
 exports.object = {extend: goog.object.extend};
+exports.typeOf = goog.typeOf;
diff --git a/js/commonjs/export_testdeps.js b/js/commonjs/export_testdeps.js
index 59c77ca2cd4f3..174c61e6840c4 100644
--- a/js/commonjs/export_testdeps.js
+++ b/js/commonjs/export_testdeps.js
@@ -12,6 +12,7 @@ goog.require('jspb.arith.Int64');
 goog.require('jspb.arith.UInt64');
 goog.require('jspb.BinaryEncoder');
 goog.require('jspb.BinaryDecoder');
+goog.require('jspb.BinaryWriter');
 goog.require('jspb.utils');
 
 exports.goog = goog;
diff --git a/js/gulpfile.js b/js/gulpfile.js
index cca99131a77b5..5f1b1d93f6081 100644
--- a/js/gulpfile.js
+++ b/js/gulpfile.js
@@ -24,7 +24,7 @@ var wellKnownTypes = [
 ];
 
 gulp.task('genproto_closure', function (cb) {
-  exec(protoc + ' --js_out=library=testproto_libs,binary:.  -I ../src -I . *.proto ../src/google/protobuf/descriptor.proto',
+  exec(protoc + ' --js_out=library=testproto_libs,binary:.  -I ../src -I . *.proto && ' + protoc + ' --js_out=one_output_file_per_input_file,binary:. -I ../src -I . ' + wellKnownTypes.join(' '),
        function (err, stdout, stderr) {
     console.log(stdout);
     console.log(stderr);
@@ -33,7 +33,7 @@ gulp.task('genproto_closure', function (cb) {
 });
 
 gulp.task('genproto_commonjs', function (cb) {
-  exec('mkdir -p commonjs_out && ' + protoc + ' --js_out=import_style=commonjs,binary:commonjs_out -I ../src -I commonjs -I . *.proto commonjs/test*/*.proto ../src/google/protobuf/descriptor.proto',
+  exec('mkdir -p commonjs_out && ' + protoc + ' --js_out=import_style=commonjs,binary:commonjs_out -I ../src -I commonjs -I . *.proto commonjs/test*/*.proto ' + wellKnownTypes.join(' '),
        function (err, stdout, stderr) {
     console.log(stdout);
     console.log(stderr);
@@ -42,7 +42,7 @@ gulp.task('genproto_commonjs', function (cb) {
 });
 
 gulp.task('genproto_commonjs_wellknowntypes', function (cb) {
-  exec('mkdir -p commonjs_out/node_modules/google-protobuf && ' + protoc + ' --js_out=import_style=commonjs,binary:commonjs_out/node_modules/google-protobuf -I ../src ../src/google/protobuf/descriptor.proto',
+  exec('mkdir -p commonjs_out/node_modules/google-protobuf && ' + protoc + ' --js_out=import_style=commonjs,binary:commonjs_out/node_modules/google-protobuf -I ../src ' + wellKnownTypes.join(' '),
        function (err, stdout, stderr) {
     console.log(stdout);
     console.log(stderr);
diff --git a/js/jasmine.json b/js/jasmine.json
index f83c54c09d35d..093f15794f71b 100644
--- a/js/jasmine.json
+++ b/js/jasmine.json
@@ -7,6 +7,9 @@
     "helpers": [
         "node_modules/google-closure-library/closure/goog/bootstrap/nodejs.js",
         "node_loader.js",
-        "deps.js"
+        "deps.js",
+        "google/protobuf/any.js",
+        "google/protobuf/struct.js",
+        "google/protobuf/timestamp.js"
     ]
 }
diff --git a/js/message_test.js b/js/message_test.js
index 38ed136087763..082da944b3b1f 100644
--- a/js/message_test.js
+++ b/js/message_test.js
@@ -1049,12 +1049,13 @@ describe('Message test suite', function() {
     var nested = new proto.jspb.test.Deeply.Nested.Message();
     nested.setCount(5);
     msg.setDeeplyNestedMessage(nested);
+    assertEquals(5, msg.getDeeplyNestedMessage().getCount());
 
     // After a serialization-deserialization round trip we should get back the
     // same data we started with.
-    var serialized = msg.toObject();
+    var serialized = msg.serializeBinary();
     var deserialized =
-        proto.jspb.test.ForeignNestedFieldMessage.fromObject(serialized);
+        proto.jspb.test.ForeignNestedFieldMessage.deserializeBinary(serialized);
     assertEquals(5, deserialized.getDeeplyNestedMessage().getCount());
   });
 
diff --git a/js/test.proto b/js/test.proto
index 52ba2cc1c83c0..2be5b8c184140 100644
--- a/js/test.proto
+++ b/js/test.proto
@@ -254,9 +254,9 @@ message TestMapFieldsNoBinary {
 }
 
 enum MapValueEnumNoBinary {
-  MAP_VALUE_FOO = 0;
-  MAP_VALUE_BAR = 1;
-  MAP_VALUE_BAZ = 2;
+  MAP_VALUE_FOO_NOBINARY = 0;
+  MAP_VALUE_BAR_NOBINARY = 1;
+  MAP_VALUE_BAZ_NOBINARY = 2;
 }
 
 message MapValueMessageNoBinary {