diff --git a/test/js-native-api/test_constructor/binding.gyp b/test/js-native-api/test_constructor/binding.gyp
index 160ff436341950..019114f64651c6 100644
--- a/test/js-native-api/test_constructor/binding.gyp
+++ b/test/js-native-api/test_constructor/binding.gyp
@@ -5,7 +5,8 @@
       "sources": [
         "../common.c",
         "../entry_point.c",
-        "test_constructor.c"
+        "test_constructor.c",
+        "test_null.c",
       ]
     }
   ]
diff --git a/test/js-native-api/test_constructor/test_constructor.c b/test/js-native-api/test_constructor/test_constructor.c
index 7582e53bb600c4..92b03985513d36 100644
--- a/test/js-native-api/test_constructor/test_constructor.c
+++ b/test/js-native-api/test_constructor/test_constructor.c
@@ -1,5 +1,6 @@
 #include <js_native_api.h>
 #include "../common.h"
+#include "test_null.h"
 
 static double value_ = 1;
 static double static_value_ = 10;
@@ -191,6 +192,8 @@ napi_value Init(napi_env env, napi_value exports) {
   NODE_API_CALL(env, napi_define_class(env, "MyObject", NAPI_AUTO_LENGTH, New,
       NULL, sizeof(properties)/sizeof(*properties), properties, &cons));
 
+  init_test_null(env, cons);
+
   return cons;
 }
 EXTERN_C_END
diff --git a/test/js-native-api/test_constructor/test_null.c b/test/js-native-api/test_constructor/test_null.c
new file mode 100644
index 00000000000000..84f02f32febf13
--- /dev/null
+++ b/test/js-native-api/test_constructor/test_null.c
@@ -0,0 +1,111 @@
+#include <js_native_api.h>
+
+#include "../common.h"
+#include "test_null.h"
+
+static int some_data = 0;
+
+static napi_value TestConstructor(napi_env env, napi_callback_info info) {
+  return NULL;
+}
+
+static napi_value TestDefineClass(napi_env env, napi_callback_info info) {
+  napi_value return_value, cons;
+
+  const napi_property_descriptor prop =
+      DECLARE_NODE_API_PROPERTY("testConstructor", TestConstructor);
+
+  NODE_API_CALL(env, napi_create_object(env, &return_value));
+  add_returned_status(env,
+                      "envIsNull",
+                      return_value,
+                      "Invalid argument",
+                      napi_invalid_arg,
+                      napi_define_class(NULL,
+                                        "TestClass",
+                                        NAPI_AUTO_LENGTH,
+                                        TestConstructor,
+                                        &some_data,
+                                        1,
+                                        &prop,
+                                        &cons));
+
+  napi_define_class(env,
+                    NULL,
+                    NAPI_AUTO_LENGTH,
+                    TestConstructor,
+                    &some_data,
+                    1,
+                    &prop,
+                    &cons);
+  add_last_status(env, "nameIsNull", return_value);
+
+  napi_define_class(
+      env, "TestClass", 0, TestConstructor, &some_data, 1, &prop, &cons);
+  add_last_status(env, "lengthIsZero", return_value);
+
+  napi_define_class(
+      env, "TestClass", NAPI_AUTO_LENGTH, NULL, &some_data, 1, &prop, &cons);
+  add_last_status(env, "nativeSideIsNull", return_value);
+
+  napi_define_class(env,
+                    "TestClass",
+                    NAPI_AUTO_LENGTH,
+                    TestConstructor,
+                    NULL,
+                    1,
+                    &prop,
+                    &cons);
+  add_last_status(env, "dataIsNull", return_value);
+
+  napi_define_class(env,
+                    "TestClass",
+                    NAPI_AUTO_LENGTH,
+                    TestConstructor,
+                    &some_data,
+                    0,
+                    &prop,
+                    &cons);
+  add_last_status(env, "propsLengthIsZero", return_value);
+
+  napi_define_class(env,
+                    "TestClass",
+                    NAPI_AUTO_LENGTH,
+                    TestConstructor,
+                    &some_data,
+                    1,
+                    NULL,
+                    &cons);
+  add_last_status(env, "propsIsNull", return_value);
+
+  napi_define_class(env,
+                    "TestClass",
+                    NAPI_AUTO_LENGTH,
+                    TestConstructor,
+                    &some_data,
+                    1,
+                    &prop,
+                    NULL);
+  add_last_status(env, "resultIsNull", return_value);
+
+  return return_value;
+}
+
+void init_test_null(napi_env env, napi_value exports) {
+  napi_value test_null;
+
+  const napi_property_descriptor test_null_props[] = {
+      DECLARE_NODE_API_PROPERTY("testDefineClass", TestDefineClass),
+  };
+
+  NODE_API_CALL_RETURN_VOID(env, napi_create_object(env, &test_null));
+  NODE_API_CALL_RETURN_VOID(
+      env,
+      napi_define_properties(env,
+                             test_null,
+                             sizeof(test_null_props) / sizeof(*test_null_props),
+                             test_null_props));
+
+  NODE_API_CALL_RETURN_VOID(
+      env, napi_set_named_property(env, exports, "testNull", test_null));
+}
diff --git a/test/js-native-api/test_constructor/test_null.h b/test/js-native-api/test_constructor/test_null.h
new file mode 100644
index 00000000000000..e10b708372c3b1
--- /dev/null
+++ b/test/js-native-api/test_constructor/test_null.h
@@ -0,0 +1,8 @@
+#ifndef TEST_JS_NATIVE_API_TEST_OBJECT_TEST_NULL_H_
+#define TEST_JS_NATIVE_API_TEST_OBJECT_TEST_NULL_H_
+
+#include <js_native_api.h>
+
+void init_test_null(napi_env env, napi_value exports);
+
+#endif  // TEST_JS_NATIVE_API_TEST_OBJECT_TEST_NULL_H_
diff --git a/test/js-native-api/test_constructor/test_null.js b/test/js-native-api/test_constructor/test_null.js
new file mode 100644
index 00000000000000..832d2e6ef4811a
--- /dev/null
+++ b/test/js-native-api/test_constructor/test_null.js
@@ -0,0 +1,18 @@
+'use strict';
+const common = require('../../common');
+const assert = require('assert');
+
+// Test passing NULL to object-related N-APIs.
+const { testNull } = require(`./build/${common.buildType}/test_constructor`);
+const expectedResult = {
+  envIsNull: 'Invalid argument',
+  nameIsNull: 'Invalid argument',
+  lengthIsZero: 'napi_ok',
+  nativeSideIsNull: 'Invalid argument',
+  dataIsNull: 'napi_ok',
+  propsLengthIsZero: 'napi_ok',
+  propsIsNull: 'Invalid argument',
+  resultIsNull: 'Invalid argument',
+};
+
+assert.deepStrictEqual(testNull.testDefineClass(), expectedResult);