From f55ee6e24a4073be42957bd9dbeb8b2591544143 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Thu, 21 Sep 2017 10:07:56 -0700
Subject: [PATCH] http2: make --expose-http2 flag a non-op

Make the `http2` module always available.
The `--expose-http2` cli flag is made a non-op

PR-URL: https://github.com/nodejs/node/pull/15535
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
---
 benchmark/http2/headers.js                                | 2 +-
 benchmark/http2/respond-with-fd.js                        | 2 +-
 benchmark/http2/simple.js                                 | 2 +-
 benchmark/http2/write.js                                  | 2 +-
 doc/api/cli.md                                            | 7 -------
 doc/api/http2.md                                          | 3 ---
 doc/node.1                                                | 4 ----
 lib/internal/bootstrap_node.js                            | 3 ---
 lib/internal/module.js                                    | 6 +-----
 src/node.cc                                               | 8 ++------
 src/node_config.cc                                        | 3 ---
 src/node_internals.h                                      | 2 --
 test/parallel/test-http2-binding.js                       | 1 -
 test/parallel/test-http2-client-data-end.js               | 1 -
 test/parallel/test-http2-client-destroy-before-connect.js | 1 -
 test/parallel/test-http2-client-destroy-before-request.js | 1 -
 test/parallel/test-http2-client-destroy-goaway.js         | 1 -
 test/parallel/test-http2-client-destroy.js                | 1 -
 test/parallel/test-http2-client-onconnect-errors.js       | 1 -
 .../parallel/test-http2-client-priority-before-connect.js | 1 -
 test/parallel/test-http2-client-promisify-connect.js      | 1 -
 test/parallel/test-http2-client-request-options-errors.js | 1 -
 .../test-http2-client-rststream-before-connect.js         | 1 -
 test/parallel/test-http2-client-set-priority.js           | 1 -
 .../parallel/test-http2-client-settings-before-connect.js | 1 -
 .../parallel/test-http2-client-shutdown-before-connect.js | 1 -
 test/parallel/test-http2-client-socket-destroy.js         | 1 -
 .../test-http2-client-stream-destroy-before-connect.js    | 1 -
 test/parallel/test-http2-client-unescaped-path.js         | 1 -
 test/parallel/test-http2-client-upload.js                 | 1 -
 test/parallel/test-http2-client-write-before-connect.js   | 1 -
 test/parallel/test-http2-compat-errors.js                 | 2 +-
 test/parallel/test-http2-compat-expect-continue-check.js  | 1 -
 test/parallel/test-http2-compat-expect-continue.js        | 1 -
 test/parallel/test-http2-compat-expect-handling.js        | 1 -
 test/parallel/test-http2-compat-method-connect.js         | 1 -
 test/parallel/test-http2-compat-serverrequest-end.js      | 1 -
 test/parallel/test-http2-compat-serverrequest-headers.js  | 1 -
 test/parallel/test-http2-compat-serverrequest-pause.js    | 1 -
 test/parallel/test-http2-compat-serverrequest-pipe.js     | 1 -
 .../test-http2-compat-serverrequest-settimeout.js         | 1 -
 test/parallel/test-http2-compat-serverrequest-trailers.js | 1 -
 test/parallel/test-http2-compat-serverrequest.js          | 1 -
 test/parallel/test-http2-compat-serverresponse-close.js   | 2 +-
 ...test-http2-compat-serverresponse-createpushresponse.js | 1 -
 test/parallel/test-http2-compat-serverresponse-destroy.js | 1 -
 test/parallel/test-http2-compat-serverresponse-drain.js   | 1 -
 test/parallel/test-http2-compat-serverresponse-end.js     | 1 -
 .../parallel/test-http2-compat-serverresponse-finished.js | 1 -
 .../test-http2-compat-serverresponse-flushheaders.js      | 1 -
 test/parallel/test-http2-compat-serverresponse-headers.js | 1 -
 .../test-http2-compat-serverresponse-settimeout.js        | 1 -
 .../test-http2-compat-serverresponse-statuscode.js        | 1 -
 ...p2-compat-serverresponse-statusmessage-property-set.js | 1 -
 ...-http2-compat-serverresponse-statusmessage-property.js | 1 -
 .../test-http2-compat-serverresponse-statusmessage.js     | 1 -
 .../parallel/test-http2-compat-serverresponse-trailers.js | 1 -
 .../test-http2-compat-serverresponse-write-no-cb.js       | 1 -
 .../test-http2-compat-serverresponse-writehead.js         | 1 -
 test/parallel/test-http2-connect-method.js                | 1 -
 test/parallel/test-http2-connect.js                       | 1 -
 test/parallel/test-http2-cookies.js                       | 1 -
 test/parallel/test-http2-create-client-connect.js         | 1 -
 test/parallel/test-http2-create-client-secure-session.js  | 1 -
 test/parallel/test-http2-create-client-session.js         | 1 -
 test/parallel/test-http2-createsecureserver-nooptions.js  | 1 -
 test/parallel/test-http2-createwritereq.js                | 1 -
 test/parallel/test-http2-date-header.js                   | 1 -
 test/parallel/test-http2-dont-override.js                 | 1 -
 test/parallel/test-http2-getpackedsettings.js             | 1 -
 test/parallel/test-http2-goaway-opaquedata.js             | 1 -
 test/parallel/test-http2-head-request.js                  | 1 -
 test/parallel/test-http2-https-fallback.js                | 1 -
 test/parallel/test-http2-info-headers.js                  | 1 -
 test/parallel/test-http2-max-concurrent-streams.js        | 1 -
 test/parallel/test-http2-methods.js                       | 1 -
 test/parallel/test-http2-misused-pseudoheaders.js         | 1 -
 test/parallel/test-http2-multi-content-length.js          | 1 -
 test/parallel/test-http2-multiheaders-raw.js              | 1 -
 test/parallel/test-http2-multiheaders.js                  | 1 -
 test/parallel/test-http2-multiplex.js                     | 1 -
 test/parallel/test-http2-noflag.js                        | 8 --------
 .../test-http2-options-max-headers-block-length.js        | 1 -
 test/parallel/test-http2-options-max-reserved-streams.js  | 1 -
 test/parallel/test-http2-padding-callback.js              | 1 -
 test/parallel/test-http2-priority-event.js                | 1 -
 test/parallel/test-http2-request-response-proto.js        | 1 -
 test/parallel/test-http2-respond-file-204.js              | 1 -
 test/parallel/test-http2-respond-file-304.js              | 1 -
 test/parallel/test-http2-respond-file-404.js              | 1 -
 test/parallel/test-http2-respond-file-compat.js           | 1 -
 test/parallel/test-http2-respond-file-error-dir.js        | 1 -
 test/parallel/test-http2-respond-file-errors.js           | 1 -
 test/parallel/test-http2-respond-file-fd-errors.js        | 1 -
 test/parallel/test-http2-respond-file-fd-invalid.js       | 1 -
 test/parallel/test-http2-respond-file-fd-range.js         | 1 -
 test/parallel/test-http2-respond-file-fd.js               | 1 -
 test/parallel/test-http2-respond-file-push.js             | 1 -
 test/parallel/test-http2-respond-file-range.js            | 1 -
 test/parallel/test-http2-respond-file.js                  | 1 -
 test/parallel/test-http2-respond-no-data.js               | 1 -
 test/parallel/test-http2-response-splitting.js            | 1 -
 test/parallel/test-http2-serve-file.js                    | 1 -
 .../test-http2-server-destroy-before-additional.js        | 1 -
 .../parallel/test-http2-server-destroy-before-priority.js | 1 -
 test/parallel/test-http2-server-destroy-before-push.js    | 1 -
 test/parallel/test-http2-server-destroy-before-respond.js | 1 -
 test/parallel/test-http2-server-destroy-before-rst.js     | 1 -
 test/parallel/test-http2-server-destroy-before-state.js   | 1 -
 test/parallel/test-http2-server-destroy-before-write.js   | 1 -
 test/parallel/test-http2-server-errors.js                 | 2 +-
 test/parallel/test-http2-server-push-disabled.js          | 1 -
 .../parallel/test-http2-server-push-stream-errors-args.js | 1 -
 test/parallel/test-http2-server-push-stream-errors.js     | 1 -
 test/parallel/test-http2-server-push-stream-head.js       | 1 -
 test/parallel/test-http2-server-push-stream.js            | 1 -
 test/parallel/test-http2-server-rst-before-respond.js     | 1 -
 test/parallel/test-http2-server-rst-stream.js             | 1 -
 test/parallel/test-http2-server-set-header.js             | 1 -
 test/parallel/test-http2-server-settimeout-no-callback.js | 1 -
 .../parallel/test-http2-server-shutdown-before-respond.js | 1 -
 test/parallel/test-http2-server-socket-destroy.js         | 1 -
 test/parallel/test-http2-server-socketerror.js            | 1 -
 test/parallel/test-http2-server-startup.js                | 1 -
 test/parallel/test-http2-server-timeout.js                | 1 -
 test/parallel/test-http2-session-settings.js              | 1 -
 test/parallel/test-http2-session-stream-state.js          | 1 -
 test/parallel/test-http2-single-headers.js                | 1 -
 test/parallel/test-http2-status-code-invalid.js           | 1 -
 test/parallel/test-http2-status-code.js                   | 1 -
 test/parallel/test-http2-stream-client.js                 | 1 -
 test/parallel/test-http2-timeouts.js                      | 1 -
 test/parallel/test-http2-too-many-settings.js             | 1 -
 test/parallel/test-http2-trailers.js                      | 1 -
 test/parallel/test-http2-util-asserts.js                  | 2 +-
 test/parallel/test-http2-util-headers-list.js             | 2 +-
 test/parallel/test-http2-window-size.js                   | 1 -
 test/parallel/test-http2-withflag.js                      | 1 -
 test/parallel/test-http2-write-callbacks.js               | 1 -
 test/parallel/test-http2-write-empty-string.js            | 1 -
 test/parallel/test-http2-zero-length-write.js             | 1 -
 test/sequential/test-http2-session-timeout.js             | 1 -
 142 files changed, 12 insertions(+), 174 deletions(-)
 delete mode 100644 test/parallel/test-http2-noflag.js

diff --git a/benchmark/http2/headers.js b/benchmark/http2/headers.js
index dc2fb3a0a1..f6b29347cd 100644
--- a/benchmark/http2/headers.js
+++ b/benchmark/http2/headers.js
@@ -6,7 +6,7 @@ const PORT = common.PORT;
 const bench = common.createBenchmark(main, {
   n: [1e3],
   nheaders: [0, 10, 100, 1000],
-}, { flags: ['--expose-http2', '--no-warnings'] });
+}, { flags: ['--no-warnings'] });
 
 function main(conf) {
   const n = +conf.n;
diff --git a/benchmark/http2/respond-with-fd.js b/benchmark/http2/respond-with-fd.js
index 2c4c767a96..a235bd87d5 100644
--- a/benchmark/http2/respond-with-fd.js
+++ b/benchmark/http2/respond-with-fd.js
@@ -11,7 +11,7 @@ const bench = common.createBenchmark(main, {
   requests: [100, 1000, 10000, 100000, 1000000],
   streams: [100, 200, 1000],
   clients: [1, 2]
-}, { flags: ['--expose-http2', '--no-warnings'] });
+}, { flags: ['--no-warnings'] });
 
 function main(conf) {
 
diff --git a/benchmark/http2/simple.js b/benchmark/http2/simple.js
index d0674fd952..8d7767197b 100644
--- a/benchmark/http2/simple.js
+++ b/benchmark/http2/simple.js
@@ -12,7 +12,7 @@ const bench = common.createBenchmark(main, {
   requests: [100, 1000, 10000, 100000],
   streams: [100, 200, 1000],
   clients: [1, 2]
-}, { flags: ['--expose-http2', '--no-warnings'] });
+}, { flags: ['--no-warnings'] });
 
 function main(conf) {
   const n = +conf.requests;
diff --git a/benchmark/http2/write.js b/benchmark/http2/write.js
index 03fe128c6b..bee1c1b351 100644
--- a/benchmark/http2/write.js
+++ b/benchmark/http2/write.js
@@ -6,7 +6,7 @@ const PORT = common.PORT;
 const bench = common.createBenchmark(main, {
   streams: [100, 200, 1000],
   length: [64 * 1024, 128 * 1024, 256 * 1024, 1024 * 1024],
-}, { flags: ['--expose-http2', '--no-warnings'] });
+}, { flags: ['--no-warnings'] });
 
 function main(conf) {
   const m = +conf.streams;
diff --git a/doc/api/cli.md b/doc/api/cli.md
index b2e5afabca..4b2f78d94a 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -175,13 +175,6 @@ added: v6.0.0
 
 Silence all process warnings (including deprecations).
 
-### `--expose-http2`
-<!-- YAML
-added: v8.4.0
--->
-
-Enable the experimental `'http2'` module.
-
 ### `--abort-on-uncaught-exception`
 <!-- YAML
 added: v0.10
diff --git a/doc/api/http2.md b/doc/api/http2.md
index b745b6fb3e..d307f6d9d6 100644
--- a/doc/api/http2.md
+++ b/doc/api/http2.md
@@ -9,9 +9,6 @@ can be accessed using:
 const http2 = require('http2');
 ```
 
-*Note*: Node.js must be launched with the `--expose-http2` command line flag
-in order to use the `'http2'` module.
-
 ## Core API
 
 The Core API provides a low-level interface designed specifically around
diff --git a/doc/node.1 b/doc/node.1
index 36c44d6b2c..523a5cd721 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -130,10 +130,6 @@ Emit pending deprecation warnings.
 .BR \-\-no\-warnings
 Silence all process warnings (including deprecations).
 
-.TP
-.BR \-\-expose\-http2
-Enable the experimental `'http2'` module.
-
 .TP
 .BR \-\-napi\-modules
 Enable loading native modules compiled with the ABI-stable Node.js API (N-API)
diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js
index 4a941b5385..e7676c0867 100644
--- a/lib/internal/bootstrap_node.js
+++ b/lib/internal/bootstrap_node.js
@@ -510,9 +510,6 @@
 
   const config = process.binding('config');
 
-  if (!config.exposeHTTP2)
-    delete NativeModule._source.http2;
-
   NativeModule.require = function(id) {
     if (id === 'native_module') {
       return NativeModule;
diff --git a/lib/internal/module.js b/lib/internal/module.js
index a6da58a8d7..c5a26a0419 100644
--- a/lib/internal/module.js
+++ b/lib/internal/module.js
@@ -78,15 +78,11 @@ function stripShebang(content) {
 
 const builtinLibs = [
   'assert', 'async_hooks', 'buffer', 'child_process', 'cluster', 'crypto',
-  'dgram', 'dns', 'domain', 'events', 'fs', 'http', 'https', 'net',
+  'dgram', 'dns', 'domain', 'events', 'fs', 'http', 'http2', 'https', 'net',
   'os', 'path', 'perf_hooks', 'punycode', 'querystring', 'readline', 'repl',
   'stream', 'string_decoder', 'tls', 'tty', 'url', 'util', 'v8', 'vm', 'zlib'
 ];
 
-const { exposeHTTP2 } = process.binding('config');
-if (exposeHTTP2)
-  builtinLibs.push('http2');
-
 function addBuiltinLibsToObject(object) {
   // Make built-in modules available directly (loaded lazily).
   builtinLibs.forEach((name) => {
diff --git a/src/node.cc b/src/node.cc
index 27951f8a56..35db43a178 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -244,9 +244,6 @@ std::string config_warning_file;  // NOLINT(runtime/string)
 // that is used by lib/internal/bootstrap_node.js
 bool config_expose_internals = false;
 
-// Set in node.cc by ParseArgs when --expose-http2 is used.
-bool config_expose_http2 = false;
-
 bool v8_initialized = false;
 
 bool linux_at_secure = false;
@@ -3801,7 +3798,6 @@ static void PrintHelp() {
          "  --abort-on-uncaught-exception\n"
          "                             aborting instead of exiting causes a\n"
          "                             core file to be generated for analysis\n"
-         "  --expose-http2             enable experimental HTTP2 support\n"
          "  --trace-warnings           show stack traces on process warnings\n"
          "  --redirect-warnings=file\n"
          "                             write warnings to file instead of\n"
@@ -3925,7 +3921,7 @@ static void CheckIfAllowedInEnv(const char* exe, bool is_env,
     "--pending-deprecation",
     "--no-warnings",
     "--napi-modules",
-    "--expose-http2",
+    "--expose-http2",   // keep as a non-op through v9.x
     "--trace-warnings",
     "--redirect-warnings",
     "--trace-sync-io",
@@ -4127,7 +4123,7 @@ static void ParseArgs(int* argc,
       config_expose_internals = true;
     } else if (strcmp(arg, "--expose-http2") == 0 ||
                strcmp(arg, "--expose_http2") == 0) {
-      config_expose_http2 = true;
+      // Keep as a non-op through v9.x
     } else if (strcmp(arg, "-") == 0) {
       break;
     } else if (strcmp(arg, "--") == 0) {
diff --git a/src/node_config.cc b/src/node_config.cc
index 2f45a5e971..3f0dbbee8b 100644
--- a/src/node_config.cc
+++ b/src/node_config.cc
@@ -74,9 +74,6 @@ static void InitConfig(Local<Object> target,
   if (config_expose_internals)
     READONLY_BOOLEAN_PROPERTY("exposeInternals");
 
-  if (config_expose_http2)
-    READONLY_BOOLEAN_PROPERTY("exposeHTTP2");
-
   READONLY_PROPERTY(target,
                     "bits",
                     Number::New(env->isolate(), 8 * sizeof(intptr_t)));
diff --git a/src/node_internals.h b/src/node_internals.h
index fd8cc26a28..13e6b12d1d 100644
--- a/src/node_internals.h
+++ b/src/node_internals.h
@@ -86,8 +86,6 @@ extern std::string openssl_config;
 // that is used by lib/module.js
 extern bool config_preserve_symlinks;
 
-// Set in node.cc by ParseArgs when --expose-http2 is used.
-extern bool config_expose_http2;
 // Set in node.cc by ParseArgs when --experimental-modules is used.
 // Used in node_config.cc to set a constant on process.binding('config')
 // that is used by lib/module.js
diff --git a/test/parallel/test-http2-binding.js b/test/parallel/test-http2-binding.js
index 22c4783b1f..5b7a74a032 100644
--- a/test/parallel/test-http2-binding.js
+++ b/test/parallel/test-http2-binding.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-client-data-end.js b/test/parallel/test-http2-client-data-end.js
index 8c50389f3b..569979e73e 100644
--- a/test/parallel/test-http2-client-data-end.js
+++ b/test/parallel/test-http2-client-data-end.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-client-destroy-before-connect.js b/test/parallel/test-http2-client-destroy-before-connect.js
index 3c99b8d661..f39e808cc6 100644
--- a/test/parallel/test-http2-client-destroy-before-connect.js
+++ b/test/parallel/test-http2-client-destroy-before-connect.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-client-destroy-before-request.js b/test/parallel/test-http2-client-destroy-before-request.js
index b8510f6a44..fd66dcd386 100644
--- a/test/parallel/test-http2-client-destroy-before-request.js
+++ b/test/parallel/test-http2-client-destroy-before-request.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-client-destroy-goaway.js b/test/parallel/test-http2-client-destroy-goaway.js
index c393cfc070..2be33049a4 100644
--- a/test/parallel/test-http2-client-destroy-goaway.js
+++ b/test/parallel/test-http2-client-destroy-goaway.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-client-destroy.js b/test/parallel/test-http2-client-destroy.js
index f109566031..698f752b10 100644
--- a/test/parallel/test-http2-client-destroy.js
+++ b/test/parallel/test-http2-client-destroy.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-client-onconnect-errors.js b/test/parallel/test-http2-client-onconnect-errors.js
index 2e9f946194..51ceb83677 100644
--- a/test/parallel/test-http2-client-onconnect-errors.js
+++ b/test/parallel/test-http2-client-onconnect-errors.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const {
diff --git a/test/parallel/test-http2-client-priority-before-connect.js b/test/parallel/test-http2-client-priority-before-connect.js
index 7fd81c8b93..7fc3841622 100644
--- a/test/parallel/test-http2-client-priority-before-connect.js
+++ b/test/parallel/test-http2-client-priority-before-connect.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-client-promisify-connect.js b/test/parallel/test-http2-client-promisify-connect.js
index 5b6dccad6a..f13f5f1408 100644
--- a/test/parallel/test-http2-client-promisify-connect.js
+++ b/test/parallel/test-http2-client-promisify-connect.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-client-request-options-errors.js b/test/parallel/test-http2-client-request-options-errors.js
index 92dad5c843..5d3fc0ab5a 100644
--- a/test/parallel/test-http2-client-request-options-errors.js
+++ b/test/parallel/test-http2-client-request-options-errors.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-client-rststream-before-connect.js b/test/parallel/test-http2-client-rststream-before-connect.js
index 1a4aa938da..073b2d4837 100644
--- a/test/parallel/test-http2-client-rststream-before-connect.js
+++ b/test/parallel/test-http2-client-rststream-before-connect.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-client-set-priority.js b/test/parallel/test-http2-client-set-priority.js
index 08c799a6e1..f3e1d7afa5 100644
--- a/test/parallel/test-http2-client-set-priority.js
+++ b/test/parallel/test-http2-client-set-priority.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-client-settings-before-connect.js b/test/parallel/test-http2-client-settings-before-connect.js
index 2ebb0654a3..27caa9e601 100644
--- a/test/parallel/test-http2-client-settings-before-connect.js
+++ b/test/parallel/test-http2-client-settings-before-connect.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-client-shutdown-before-connect.js b/test/parallel/test-http2-client-shutdown-before-connect.js
index 316a41d0f7..4fed0ee3ad 100644
--- a/test/parallel/test-http2-client-shutdown-before-connect.js
+++ b/test/parallel/test-http2-client-shutdown-before-connect.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-client-socket-destroy.js b/test/parallel/test-http2-client-socket-destroy.js
index 9d2fdd3b44..f56a45cc3b 100644
--- a/test/parallel/test-http2-client-socket-destroy.js
+++ b/test/parallel/test-http2-client-socket-destroy.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-client-stream-destroy-before-connect.js b/test/parallel/test-http2-client-stream-destroy-before-connect.js
index 05ba63f0b5..4eefc4b9f3 100644
--- a/test/parallel/test-http2-client-stream-destroy-before-connect.js
+++ b/test/parallel/test-http2-client-stream-destroy-before-connect.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-client-unescaped-path.js b/test/parallel/test-http2-client-unescaped-path.js
index 645fb33163..3a7a607bc3 100644
--- a/test/parallel/test-http2-client-unescaped-path.js
+++ b/test/parallel/test-http2-client-unescaped-path.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-client-upload.js b/test/parallel/test-http2-client-upload.js
index cee86e3fc6..c9c6ebaa7a 100644
--- a/test/parallel/test-http2-client-upload.js
+++ b/test/parallel/test-http2-client-upload.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 // Verifies that uploading data from a client works
diff --git a/test/parallel/test-http2-client-write-before-connect.js b/test/parallel/test-http2-client-write-before-connect.js
index ed46840266..26674dcad3 100644
--- a/test/parallel/test-http2-client-write-before-connect.js
+++ b/test/parallel/test-http2-client-write-before-connect.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-errors.js b/test/parallel/test-http2-compat-errors.js
index dacb39c6df..5774d1a922 100644
--- a/test/parallel/test-http2-compat-errors.js
+++ b/test/parallel/test-http2-compat-errors.js
@@ -1,4 +1,4 @@
-// Flags: --expose-http2 --expose-internals
+// Flags: --expose-internals
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-expect-continue-check.js b/test/parallel/test-http2-compat-expect-continue-check.js
index 14e7815520..800df1c432 100644
--- a/test/parallel/test-http2-compat-expect-continue-check.js
+++ b/test/parallel/test-http2-compat-expect-continue-check.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-expect-continue.js b/test/parallel/test-http2-compat-expect-continue.js
index 291a70e0f2..6f08e813ef 100644
--- a/test/parallel/test-http2-compat-expect-continue.js
+++ b/test/parallel/test-http2-compat-expect-continue.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-expect-handling.js b/test/parallel/test-http2-compat-expect-handling.js
index 774d276b64..0a5de368c6 100644
--- a/test/parallel/test-http2-compat-expect-handling.js
+++ b/test/parallel/test-http2-compat-expect-handling.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-method-connect.js b/test/parallel/test-http2-compat-method-connect.js
index 8e6202317a..1f43b3891b 100644
--- a/test/parallel/test-http2-compat-method-connect.js
+++ b/test/parallel/test-http2-compat-method-connect.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverrequest-end.js b/test/parallel/test-http2-compat-serverrequest-end.js
index a84f73883d..60a4876482 100644
--- a/test/parallel/test-http2-compat-serverrequest-end.js
+++ b/test/parallel/test-http2-compat-serverrequest-end.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverrequest-headers.js b/test/parallel/test-http2-compat-serverrequest-headers.js
index 286a0e19c8..05e645a362 100644
--- a/test/parallel/test-http2-compat-serverrequest-headers.js
+++ b/test/parallel/test-http2-compat-serverrequest-headers.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverrequest-pause.js b/test/parallel/test-http2-compat-serverrequest-pause.js
index 6024181572..f8494bb0dd 100644
--- a/test/parallel/test-http2-compat-serverrequest-pause.js
+++ b/test/parallel/test-http2-compat-serverrequest-pause.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverrequest-pipe.js b/test/parallel/test-http2-compat-serverrequest-pipe.js
index b952372841..a8ef688fd7 100644
--- a/test/parallel/test-http2-compat-serverrequest-pipe.js
+++ b/test/parallel/test-http2-compat-serverrequest-pipe.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverrequest-settimeout.js b/test/parallel/test-http2-compat-serverrequest-settimeout.js
index 7cdae697cc..460eb576bf 100644
--- a/test/parallel/test-http2-compat-serverrequest-settimeout.js
+++ b/test/parallel/test-http2-compat-serverrequest-settimeout.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverrequest-trailers.js b/test/parallel/test-http2-compat-serverrequest-trailers.js
index 7fa649fe7f..713e4babd2 100644
--- a/test/parallel/test-http2-compat-serverrequest-trailers.js
+++ b/test/parallel/test-http2-compat-serverrequest-trailers.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverrequest.js b/test/parallel/test-http2-compat-serverrequest.js
index 8c72e38765..31cc5ff4ef 100644
--- a/test/parallel/test-http2-compat-serverrequest.js
+++ b/test/parallel/test-http2-compat-serverrequest.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverresponse-close.js b/test/parallel/test-http2-compat-serverresponse-close.js
index 9b42ae05dc..35e39b9670 100644
--- a/test/parallel/test-http2-compat-serverresponse-close.js
+++ b/test/parallel/test-http2-compat-serverresponse-close.js
@@ -1,4 +1,4 @@
-// Flags: --expose-http2 --expose-internals
+// Flags: --expose-internals
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverresponse-createpushresponse.js b/test/parallel/test-http2-compat-serverresponse-createpushresponse.js
index ecc8fea74c..bd9d5c1399 100644
--- a/test/parallel/test-http2-compat-serverresponse-createpushresponse.js
+++ b/test/parallel/test-http2-compat-serverresponse-createpushresponse.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverresponse-destroy.js b/test/parallel/test-http2-compat-serverresponse-destroy.js
index 20329e0d8f..e8f648bf29 100644
--- a/test/parallel/test-http2-compat-serverresponse-destroy.js
+++ b/test/parallel/test-http2-compat-serverresponse-destroy.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverresponse-drain.js b/test/parallel/test-http2-compat-serverresponse-drain.js
index 312b7c75ab..e2465cfa00 100644
--- a/test/parallel/test-http2-compat-serverresponse-drain.js
+++ b/test/parallel/test-http2-compat-serverresponse-drain.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverresponse-end.js b/test/parallel/test-http2-compat-serverresponse-end.js
index 957983b0ae..76cb692938 100644
--- a/test/parallel/test-http2-compat-serverresponse-end.js
+++ b/test/parallel/test-http2-compat-serverresponse-end.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const { mustCall, mustNotCall, hasCrypto, skip } = require('../common');
diff --git a/test/parallel/test-http2-compat-serverresponse-finished.js b/test/parallel/test-http2-compat-serverresponse-finished.js
index e54255f67c..cd17ff492b 100644
--- a/test/parallel/test-http2-compat-serverresponse-finished.js
+++ b/test/parallel/test-http2-compat-serverresponse-finished.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverresponse-flushheaders.js b/test/parallel/test-http2-compat-serverresponse-flushheaders.js
index f02732df87..48bf4dd2d4 100644
--- a/test/parallel/test-http2-compat-serverresponse-flushheaders.js
+++ b/test/parallel/test-http2-compat-serverresponse-flushheaders.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverresponse-headers.js b/test/parallel/test-http2-compat-serverresponse-headers.js
index d753b3e6cc..25ec4fc11b 100644
--- a/test/parallel/test-http2-compat-serverresponse-headers.js
+++ b/test/parallel/test-http2-compat-serverresponse-headers.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverresponse-settimeout.js b/test/parallel/test-http2-compat-serverresponse-settimeout.js
index 6b5bf03d52..6d06d07f7d 100644
--- a/test/parallel/test-http2-compat-serverresponse-settimeout.js
+++ b/test/parallel/test-http2-compat-serverresponse-settimeout.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverresponse-statuscode.js b/test/parallel/test-http2-compat-serverresponse-statuscode.js
index ace05ddefe..96b033328f 100644
--- a/test/parallel/test-http2-compat-serverresponse-statuscode.js
+++ b/test/parallel/test-http2-compat-serverresponse-statuscode.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverresponse-statusmessage-property-set.js b/test/parallel/test-http2-compat-serverresponse-statusmessage-property-set.js
index bec056d013..45a876d674 100644
--- a/test/parallel/test-http2-compat-serverresponse-statusmessage-property-set.js
+++ b/test/parallel/test-http2-compat-serverresponse-statusmessage-property-set.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverresponse-statusmessage-property.js b/test/parallel/test-http2-compat-serverresponse-statusmessage-property.js
index 3b3ef6bdc2..21a5b6ea4e 100644
--- a/test/parallel/test-http2-compat-serverresponse-statusmessage-property.js
+++ b/test/parallel/test-http2-compat-serverresponse-statusmessage-property.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverresponse-statusmessage.js b/test/parallel/test-http2-compat-serverresponse-statusmessage.js
index 0c74a2c8f2..841bafe724 100644
--- a/test/parallel/test-http2-compat-serverresponse-statusmessage.js
+++ b/test/parallel/test-http2-compat-serverresponse-statusmessage.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverresponse-trailers.js b/test/parallel/test-http2-compat-serverresponse-trailers.js
index 3f3aa2045b..4d93e14dbe 100644
--- a/test/parallel/test-http2-compat-serverresponse-trailers.js
+++ b/test/parallel/test-http2-compat-serverresponse-trailers.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-compat-serverresponse-write-no-cb.js b/test/parallel/test-http2-compat-serverresponse-write-no-cb.js
index bc864af46d..58a4ca053d 100644
--- a/test/parallel/test-http2-compat-serverresponse-write-no-cb.js
+++ b/test/parallel/test-http2-compat-serverresponse-write-no-cb.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const { mustCall,
diff --git a/test/parallel/test-http2-compat-serverresponse-writehead.js b/test/parallel/test-http2-compat-serverresponse-writehead.js
index 12de298346..f6d74630fd 100644
--- a/test/parallel/test-http2-compat-serverresponse-writehead.js
+++ b/test/parallel/test-http2-compat-serverresponse-writehead.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-connect-method.js b/test/parallel/test-http2-connect-method.js
index 3626c7f2e5..78c9a34529 100644
--- a/test/parallel/test-http2-connect-method.js
+++ b/test/parallel/test-http2-connect-method.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-connect.js b/test/parallel/test-http2-connect.js
index 60777dadeb..e5a4e42990 100644
--- a/test/parallel/test-http2-connect.js
+++ b/test/parallel/test-http2-connect.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const { mustCall, hasCrypto, skip, expectsError } = require('../common');
diff --git a/test/parallel/test-http2-cookies.js b/test/parallel/test-http2-cookies.js
index b2f0a3bf6c..48b08b6367 100644
--- a/test/parallel/test-http2-cookies.js
+++ b/test/parallel/test-http2-cookies.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-create-client-connect.js b/test/parallel/test-http2-create-client-connect.js
index 2c40d7c653..a9c63d02b3 100644
--- a/test/parallel/test-http2-create-client-connect.js
+++ b/test/parallel/test-http2-create-client-connect.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 // Tests http2.connect()
diff --git a/test/parallel/test-http2-create-client-secure-session.js b/test/parallel/test-http2-create-client-secure-session.js
index 6e0e2ca43d..b367854f18 100644
--- a/test/parallel/test-http2-create-client-secure-session.js
+++ b/test/parallel/test-http2-create-client-secure-session.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-create-client-session.js b/test/parallel/test-http2-create-client-session.js
index 22ab368f7b..149b516423 100644
--- a/test/parallel/test-http2-create-client-session.js
+++ b/test/parallel/test-http2-create-client-session.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-createsecureserver-nooptions.js b/test/parallel/test-http2-createsecureserver-nooptions.js
index 5a9849f9e1..652a281506 100644
--- a/test/parallel/test-http2-createsecureserver-nooptions.js
+++ b/test/parallel/test-http2-createsecureserver-nooptions.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-createwritereq.js b/test/parallel/test-http2-createwritereq.js
index f4151d94e6..ca394a5d42 100644
--- a/test/parallel/test-http2-createwritereq.js
+++ b/test/parallel/test-http2-createwritereq.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-date-header.js b/test/parallel/test-http2-date-header.js
index d7afeb5e2b..ab0654e64c 100644
--- a/test/parallel/test-http2-date-header.js
+++ b/test/parallel/test-http2-date-header.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-dont-override.js b/test/parallel/test-http2-dont-override.js
index d8573eac34..cc60a2fe80 100644
--- a/test/parallel/test-http2-dont-override.js
+++ b/test/parallel/test-http2-dont-override.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-getpackedsettings.js b/test/parallel/test-http2-getpackedsettings.js
index 8c46afcb57..2f7c76e9b6 100644
--- a/test/parallel/test-http2-getpackedsettings.js
+++ b/test/parallel/test-http2-getpackedsettings.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-goaway-opaquedata.js b/test/parallel/test-http2-goaway-opaquedata.js
index 9ff8b13caf..af1ce27dd4 100644
--- a/test/parallel/test-http2-goaway-opaquedata.js
+++ b/test/parallel/test-http2-goaway-opaquedata.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-head-request.js b/test/parallel/test-http2-head-request.js
index ee86ded549..8c91132b5f 100644
--- a/test/parallel/test-http2-head-request.js
+++ b/test/parallel/test-http2-head-request.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-https-fallback.js b/test/parallel/test-http2-https-fallback.js
index d49c798714..266c6f89f3 100644
--- a/test/parallel/test-http2-https-fallback.js
+++ b/test/parallel/test-http2-https-fallback.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-info-headers.js b/test/parallel/test-http2-info-headers.js
index a1491959df..1ef6f244e2 100644
--- a/test/parallel/test-http2-info-headers.js
+++ b/test/parallel/test-http2-info-headers.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-max-concurrent-streams.js b/test/parallel/test-http2-max-concurrent-streams.js
index be101720dc..a65ac90c53 100644
--- a/test/parallel/test-http2-max-concurrent-streams.js
+++ b/test/parallel/test-http2-max-concurrent-streams.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-methods.js b/test/parallel/test-http2-methods.js
index dac61359ec..36f64f13ab 100644
--- a/test/parallel/test-http2-methods.js
+++ b/test/parallel/test-http2-methods.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-misused-pseudoheaders.js b/test/parallel/test-http2-misused-pseudoheaders.js
index 2744561025..2ccb676b21 100644
--- a/test/parallel/test-http2-misused-pseudoheaders.js
+++ b/test/parallel/test-http2-misused-pseudoheaders.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-multi-content-length.js b/test/parallel/test-http2-multi-content-length.js
index da7fbd33a9..d0f0094d24 100644
--- a/test/parallel/test-http2-multi-content-length.js
+++ b/test/parallel/test-http2-multi-content-length.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-multiheaders-raw.js b/test/parallel/test-http2-multiheaders-raw.js
index f9c7cc5f9b..5db253da3c 100644
--- a/test/parallel/test-http2-multiheaders-raw.js
+++ b/test/parallel/test-http2-multiheaders-raw.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-multiheaders.js b/test/parallel/test-http2-multiheaders.js
index bcdc9458b3..7a118214e8 100644
--- a/test/parallel/test-http2-multiheaders.js
+++ b/test/parallel/test-http2-multiheaders.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-multiplex.js b/test/parallel/test-http2-multiplex.js
index 22622392b8..c818a28572 100644
--- a/test/parallel/test-http2-multiplex.js
+++ b/test/parallel/test-http2-multiplex.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 // Tests opening 100 concurrent simultaneous uploading streams over a single
diff --git a/test/parallel/test-http2-noflag.js b/test/parallel/test-http2-noflag.js
deleted file mode 100644
index 903fd649c5..0000000000
--- a/test/parallel/test-http2-noflag.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// The --expose-http2 flag is not set
-'use strict';
-
-require('../common');
-const assert = require('assert');
-
-assert.throws(() => require('http2'), // eslint-disable-line crypto-check
-              /^Error: Cannot find module 'http2'$/);
diff --git a/test/parallel/test-http2-options-max-headers-block-length.js b/test/parallel/test-http2-options-max-headers-block-length.js
index 6b47a24898..402803dd33 100644
--- a/test/parallel/test-http2-options-max-headers-block-length.js
+++ b/test/parallel/test-http2-options-max-headers-block-length.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-options-max-reserved-streams.js b/test/parallel/test-http2-options-max-reserved-streams.js
index 425ac6eb4e..5e61907770 100644
--- a/test/parallel/test-http2-options-max-reserved-streams.js
+++ b/test/parallel/test-http2-options-max-reserved-streams.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-padding-callback.js b/test/parallel/test-http2-padding-callback.js
index a63f1041f3..af547ad498 100644
--- a/test/parallel/test-http2-padding-callback.js
+++ b/test/parallel/test-http2-padding-callback.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-priority-event.js b/test/parallel/test-http2-priority-event.js
index b577fdb376..b0704902d3 100644
--- a/test/parallel/test-http2-priority-event.js
+++ b/test/parallel/test-http2-priority-event.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-request-response-proto.js b/test/parallel/test-http2-request-response-proto.js
index 3bbf8e8643..9f84f9f475 100644
--- a/test/parallel/test-http2-request-response-proto.js
+++ b/test/parallel/test-http2-request-response-proto.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-respond-file-204.js b/test/parallel/test-http2-respond-file-204.js
index 2a531df464..13818d0243 100644
--- a/test/parallel/test-http2-respond-file-204.js
+++ b/test/parallel/test-http2-respond-file-204.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-respond-file-304.js b/test/parallel/test-http2-respond-file-304.js
index d36dd8411f..04a092b51e 100644
--- a/test/parallel/test-http2-respond-file-304.js
+++ b/test/parallel/test-http2-respond-file-304.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-respond-file-404.js b/test/parallel/test-http2-respond-file-404.js
index b8e2a39c9a..ba62f38448 100644
--- a/test/parallel/test-http2-respond-file-404.js
+++ b/test/parallel/test-http2-respond-file-404.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-respond-file-compat.js b/test/parallel/test-http2-respond-file-compat.js
index 53c5a34d2a..1932592279 100644
--- a/test/parallel/test-http2-respond-file-compat.js
+++ b/test/parallel/test-http2-respond-file-compat.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-respond-file-error-dir.js b/test/parallel/test-http2-respond-file-error-dir.js
index fd212a4c33..18a9540451 100644
--- a/test/parallel/test-http2-respond-file-error-dir.js
+++ b/test/parallel/test-http2-respond-file-error-dir.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-respond-file-errors.js b/test/parallel/test-http2-respond-file-errors.js
index 158c8cb4f0..d5f071b376 100644
--- a/test/parallel/test-http2-respond-file-errors.js
+++ b/test/parallel/test-http2-respond-file-errors.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-respond-file-fd-errors.js b/test/parallel/test-http2-respond-file-fd-errors.js
index 035699da50..faf37f3373 100644
--- a/test/parallel/test-http2-respond-file-fd-errors.js
+++ b/test/parallel/test-http2-respond-file-fd-errors.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-respond-file-fd-invalid.js b/test/parallel/test-http2-respond-file-fd-invalid.js
index 7e08a29e93..f3bcab8904 100644
--- a/test/parallel/test-http2-respond-file-fd-invalid.js
+++ b/test/parallel/test-http2-respond-file-fd-invalid.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-respond-file-fd-range.js b/test/parallel/test-http2-respond-file-fd-range.js
index 13b525c6c1..45d69a0598 100644
--- a/test/parallel/test-http2-respond-file-fd-range.js
+++ b/test/parallel/test-http2-respond-file-fd-range.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 // Tests the ability to minimally request a byte range with respondWithFD
diff --git a/test/parallel/test-http2-respond-file-fd.js b/test/parallel/test-http2-respond-file-fd.js
index 502d6e8629..29a5fe665d 100644
--- a/test/parallel/test-http2-respond-file-fd.js
+++ b/test/parallel/test-http2-respond-file-fd.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-respond-file-push.js b/test/parallel/test-http2-respond-file-push.js
index b16a9e1c60..ed8c6bbd01 100644
--- a/test/parallel/test-http2-respond-file-push.js
+++ b/test/parallel/test-http2-respond-file-push.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-respond-file-range.js b/test/parallel/test-http2-respond-file-range.js
index a4fda25a90..92dd8491ec 100644
--- a/test/parallel/test-http2-respond-file-range.js
+++ b/test/parallel/test-http2-respond-file-range.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-respond-file.js b/test/parallel/test-http2-respond-file.js
index 3c5272f77f..30e0c15450 100644
--- a/test/parallel/test-http2-respond-file.js
+++ b/test/parallel/test-http2-respond-file.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-respond-no-data.js b/test/parallel/test-http2-respond-no-data.js
index b2fbf44af1..74f85a9cd0 100644
--- a/test/parallel/test-http2-respond-no-data.js
+++ b/test/parallel/test-http2-respond-no-data.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-response-splitting.js b/test/parallel/test-http2-response-splitting.js
index 557967a3df..8aae2156e4 100644
--- a/test/parallel/test-http2-response-splitting.js
+++ b/test/parallel/test-http2-response-splitting.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 // Response splitting is no longer an issue with HTTP/2. The underlying
diff --git a/test/parallel/test-http2-serve-file.js b/test/parallel/test-http2-serve-file.js
index b7149963a1..492f2fcda8 100644
--- a/test/parallel/test-http2-serve-file.js
+++ b/test/parallel/test-http2-serve-file.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-destroy-before-additional.js b/test/parallel/test-http2-server-destroy-before-additional.js
index 5e04a87323..c05c67d3a3 100644
--- a/test/parallel/test-http2-server-destroy-before-additional.js
+++ b/test/parallel/test-http2-server-destroy-before-additional.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-destroy-before-priority.js b/test/parallel/test-http2-server-destroy-before-priority.js
index 74d7c011ba..20ed2bc558 100644
--- a/test/parallel/test-http2-server-destroy-before-priority.js
+++ b/test/parallel/test-http2-server-destroy-before-priority.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-destroy-before-push.js b/test/parallel/test-http2-server-destroy-before-push.js
index 429f37e2c6..65c53b823d 100644
--- a/test/parallel/test-http2-server-destroy-before-push.js
+++ b/test/parallel/test-http2-server-destroy-before-push.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-destroy-before-respond.js b/test/parallel/test-http2-server-destroy-before-respond.js
index 4ea64e8281..4023be431f 100644
--- a/test/parallel/test-http2-server-destroy-before-respond.js
+++ b/test/parallel/test-http2-server-destroy-before-respond.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-destroy-before-rst.js b/test/parallel/test-http2-server-destroy-before-rst.js
index f066e76b5f..d067021253 100644
--- a/test/parallel/test-http2-server-destroy-before-rst.js
+++ b/test/parallel/test-http2-server-destroy-before-rst.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-destroy-before-state.js b/test/parallel/test-http2-server-destroy-before-state.js
index f5dce3e30a..b8ef65fb50 100644
--- a/test/parallel/test-http2-server-destroy-before-state.js
+++ b/test/parallel/test-http2-server-destroy-before-state.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-destroy-before-write.js b/test/parallel/test-http2-server-destroy-before-write.js
index 724e12624e..911fe015a7 100644
--- a/test/parallel/test-http2-server-destroy-before-write.js
+++ b/test/parallel/test-http2-server-destroy-before-write.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-errors.js b/test/parallel/test-http2-server-errors.js
index 9280d63edb..7d7db6a245 100644
--- a/test/parallel/test-http2-server-errors.js
+++ b/test/parallel/test-http2-server-errors.js
@@ -1,4 +1,4 @@
-// Flags: --expose-http2 --expose-internals
+// Flags: --expose-internals
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-push-disabled.js b/test/parallel/test-http2-server-push-disabled.js
index a9cdbd6239..c0148fe63b 100644
--- a/test/parallel/test-http2-server-push-disabled.js
+++ b/test/parallel/test-http2-server-push-disabled.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-push-stream-errors-args.js b/test/parallel/test-http2-server-push-stream-errors-args.js
index 7d0c104594..5055c081b4 100644
--- a/test/parallel/test-http2-server-push-stream-errors-args.js
+++ b/test/parallel/test-http2-server-push-stream-errors-args.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-push-stream-errors.js b/test/parallel/test-http2-server-push-stream-errors.js
index ad26874f8a..42d58c2ca1 100644
--- a/test/parallel/test-http2-server-push-stream-errors.js
+++ b/test/parallel/test-http2-server-push-stream-errors.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-push-stream-head.js b/test/parallel/test-http2-server-push-stream-head.js
index a1172b8ecf..c2fc8db4a9 100644
--- a/test/parallel/test-http2-server-push-stream-head.js
+++ b/test/parallel/test-http2-server-push-stream-head.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-push-stream.js b/test/parallel/test-http2-server-push-stream.js
index c79ff7caec..3957438691 100644
--- a/test/parallel/test-http2-server-push-stream.js
+++ b/test/parallel/test-http2-server-push-stream.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-rst-before-respond.js b/test/parallel/test-http2-server-rst-before-respond.js
index d8e9d0a6cc..25dfa7e010 100644
--- a/test/parallel/test-http2-server-rst-before-respond.js
+++ b/test/parallel/test-http2-server-rst-before-respond.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-rst-stream.js b/test/parallel/test-http2-server-rst-stream.js
index 90966f7695..edaaed35c6 100644
--- a/test/parallel/test-http2-server-rst-stream.js
+++ b/test/parallel/test-http2-server-rst-stream.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-set-header.js b/test/parallel/test-http2-server-set-header.js
index b681469ece..ed27638f68 100644
--- a/test/parallel/test-http2-server-set-header.js
+++ b/test/parallel/test-http2-server-set-header.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-settimeout-no-callback.js b/test/parallel/test-http2-server-settimeout-no-callback.js
index eff0418fa7..cdea67f4e8 100644
--- a/test/parallel/test-http2-server-settimeout-no-callback.js
+++ b/test/parallel/test-http2-server-settimeout-no-callback.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-shutdown-before-respond.js b/test/parallel/test-http2-server-shutdown-before-respond.js
index f870edc7be..c3ad9714b5 100644
--- a/test/parallel/test-http2-server-shutdown-before-respond.js
+++ b/test/parallel/test-http2-server-shutdown-before-respond.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-socket-destroy.js b/test/parallel/test-http2-server-socket-destroy.js
index d77f735567..0218f7357a 100644
--- a/test/parallel/test-http2-server-socket-destroy.js
+++ b/test/parallel/test-http2-server-socket-destroy.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-socketerror.js b/test/parallel/test-http2-server-socketerror.js
index 5bbb2130f0..cad92fd299 100644
--- a/test/parallel/test-http2-server-socketerror.js
+++ b/test/parallel/test-http2-server-socketerror.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-server-startup.js b/test/parallel/test-http2-server-startup.js
index ba7c3f1f25..73964a8886 100644
--- a/test/parallel/test-http2-server-startup.js
+++ b/test/parallel/test-http2-server-startup.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 // Tests the basic operation of creating a plaintext or TLS
diff --git a/test/parallel/test-http2-server-timeout.js b/test/parallel/test-http2-server-timeout.js
index c3a8ef8851..28ab6efb87 100755
--- a/test/parallel/test-http2-server-timeout.js
+++ b/test/parallel/test-http2-server-timeout.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-session-settings.js b/test/parallel/test-http2-session-settings.js
index 7f54bc2f02..53dff5b139 100644
--- a/test/parallel/test-http2-session-settings.js
+++ b/test/parallel/test-http2-session-settings.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-session-stream-state.js b/test/parallel/test-http2-session-stream-state.js
index f122b27189..9bbac3f482 100644
--- a/test/parallel/test-http2-session-stream-state.js
+++ b/test/parallel/test-http2-session-stream-state.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-single-headers.js b/test/parallel/test-http2-single-headers.js
index cf66e570f9..bb2f57cba1 100644
--- a/test/parallel/test-http2-single-headers.js
+++ b/test/parallel/test-http2-single-headers.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-status-code-invalid.js b/test/parallel/test-http2-status-code-invalid.js
index 0fe8319db4..3a0d882dea 100644
--- a/test/parallel/test-http2-status-code-invalid.js
+++ b/test/parallel/test-http2-status-code-invalid.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-status-code.js b/test/parallel/test-http2-status-code.js
index 9a6821b1d6..e8f64da368 100644
--- a/test/parallel/test-http2-status-code.js
+++ b/test/parallel/test-http2-status-code.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-stream-client.js b/test/parallel/test-http2-stream-client.js
index 658c66ce7a..3b802f6e6d 100644
--- a/test/parallel/test-http2-stream-client.js
+++ b/test/parallel/test-http2-stream-client.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-timeouts.js b/test/parallel/test-http2-timeouts.js
index e1382e6e03..e3163a3dc8 100644
--- a/test/parallel/test-http2-timeouts.js
+++ b/test/parallel/test-http2-timeouts.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-too-many-settings.js b/test/parallel/test-http2-too-many-settings.js
index 849e24af4e..4feda98c05 100644
--- a/test/parallel/test-http2-too-many-settings.js
+++ b/test/parallel/test-http2-too-many-settings.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 // Tests that attempting to send too many non-acknowledged
diff --git a/test/parallel/test-http2-trailers.js b/test/parallel/test-http2-trailers.js
index 282899e65e..5e0db6a30c 100644
--- a/test/parallel/test-http2-trailers.js
+++ b/test/parallel/test-http2-trailers.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-util-asserts.js b/test/parallel/test-http2-util-asserts.js
index fd902f01a3..3e1703d158 100644
--- a/test/parallel/test-http2-util-asserts.js
+++ b/test/parallel/test-http2-util-asserts.js
@@ -1,4 +1,4 @@
-// Flags: --expose-internals --expose-http2
+// Flags: --expose-internals
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-util-headers-list.js b/test/parallel/test-http2-util-headers-list.js
index 7e6bb7ece2..0bc06bb727 100644
--- a/test/parallel/test-http2-util-headers-list.js
+++ b/test/parallel/test-http2-util-headers-list.js
@@ -1,4 +1,4 @@
-// Flags: --expose-internals --expose-http2
+// Flags: --expose-internals
 'use strict';
 
 // Tests the internal utility function that is used to prepare headers
diff --git a/test/parallel/test-http2-window-size.js b/test/parallel/test-http2-window-size.js
index 57e27ac29b..d6c6bf3fed 100644
--- a/test/parallel/test-http2-window-size.js
+++ b/test/parallel/test-http2-window-size.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 // This test ensures that servers are able to send data independent of window
diff --git a/test/parallel/test-http2-withflag.js b/test/parallel/test-http2-withflag.js
index 069212257c..0a01efc517 100644
--- a/test/parallel/test-http2-withflag.js
+++ b/test/parallel/test-http2-withflag.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-write-callbacks.js b/test/parallel/test-http2-write-callbacks.js
index e45e8ccb7d..e196ca8d3c 100644
--- a/test/parallel/test-http2-write-callbacks.js
+++ b/test/parallel/test-http2-write-callbacks.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 // Verifies that write callbacks are called
diff --git a/test/parallel/test-http2-write-empty-string.js b/test/parallel/test-http2-write-empty-string.js
index e7a55e5c0a..fea2619171 100644
--- a/test/parallel/test-http2-write-empty-string.js
+++ b/test/parallel/test-http2-write-empty-string.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/parallel/test-http2-zero-length-write.js b/test/parallel/test-http2-zero-length-write.js
index f261cc7296..899c28bace 100644
--- a/test/parallel/test-http2-zero-length-write.js
+++ b/test/parallel/test-http2-zero-length-write.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');
diff --git a/test/sequential/test-http2-session-timeout.js b/test/sequential/test-http2-session-timeout.js
index a7c6184442..7a401e90ea 100644
--- a/test/sequential/test-http2-session-timeout.js
+++ b/test/sequential/test-http2-session-timeout.js
@@ -1,4 +1,3 @@
-// Flags: --expose-http2
 'use strict';
 
 const common = require('../common');