diff --git a/doc/api/cli.md b/doc/api/cli.md
index 5e6390335b..31087367da 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -144,6 +144,13 @@ added: v6.0.0
 
 Silence all process warnings (including deprecations).
 
+### `--napi-modules`
+<!-- YAML
+added: v8.0.0
+-->
+
+Load N-API modules.
+
 ### `--trace-warnings`
 <!-- YAML
 added: v6.0.0
diff --git a/doc/node.1 b/doc/node.1
index 30087cd53e..561e26c0be 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -119,6 +119,10 @@ Throw errors for deprecations.
 .BR \-\-no\-warnings
 Silence all process warnings (including deprecations).
 
+.TP
+.BR \-\-napi\-modules
+Load N-API modules.
+
 .TP
 .BR \-\-trace\-warnings
 Print stack traces for process warnings (including deprecations).
diff --git a/src/node.cc b/src/node.cc
index 52a5041804..5836b75741 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -2471,7 +2471,8 @@ void DLOpen(const FunctionCallbackInfo<Value>& args) {
                sizeof(errmsg),
                "The module '%s'"
                "\nwas compiled against the Node.js API. This feature is "
-               "\nexperimental and must be enabled on the command-line.",
+               "\nexperimental and must be enabled on the command-line by "
+               "\nadding --napi-modules.",
                *filename);
     } else {
       snprintf(errmsg,
@@ -3548,7 +3549,7 @@ static void PrintHelp() {
          "  --trace-deprecation        show stack traces on deprecations\n"
          "  --throw-deprecation        throw an exception on deprecations\n"
          "  --no-warnings              silence all process warnings\n"
-         "  --napi-modules[=yes|no]    load N-API modules (default no)\n"
+         "  --napi-modules             load N-API modules\n"
          "  --trace-warnings           show stack traces on process warnings\n"
          "  --redirect-warnings=path\n"
          "                             write warnings to path instead of\n"
@@ -3721,10 +3722,6 @@ static void ParseArgs(int* argc,
       no_deprecation = true;
     } else if (strcmp(arg, "--napi-modules") == 0) {
       load_napi_modules = true;
-    } else if (strcmp(arg, "--napi-modules=yes") == 0) {
-      load_napi_modules = true;
-    } else if (strcmp(arg, "--napi-modules=no") == 0) {
-      load_napi_modules = false;
     } else if (strcmp(arg, "--no-warnings") == 0) {
       no_process_warnings = true;
     } else if (strcmp(arg, "--trace-warnings") == 0) {
diff --git a/test/addons-napi/testcfg.py b/test/addons-napi/testcfg.py
index 07037ff6a0..ef7c18fdae 100644
--- a/test/addons-napi/testcfg.py
+++ b/test/addons-napi/testcfg.py
@@ -3,4 +3,4 @@
 import testpy
 
 def GetConfiguration(context, root):
-  return testpy.AddonTestConfiguration(context, root, 'addons-napi', ['--napi-modules=yes'])
+  return testpy.AddonTestConfiguration(context, root, 'addons-napi', ['--napi-modules'])