From 307ea52edad5b2fb769244654f600e60ef7b52c4 Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Thu, 28 Sep 2017 19:01:04 -0700
Subject: [PATCH 1/2] http2: expose http2 by default, add NODE_NO_HTTP2

Make `--expose-http2` a non-op,
Expose http2 by default.
Add `NODE_NO_HTTP2=1` to suppress http2
---
 doc/api/cli.md   |  7 +++++++
 doc/api/http2.md |  3 ---
 doc/node.1       |  8 ++++----
 src/node.cc      | 16 +++++++++++-----
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 75cd1fcd81e632..e28614111cf873 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -432,6 +432,13 @@ added: v7.5.0
 
 When set to `1`, process warnings are silenced.
 
+### `NODE_NO_HTTP2=1`
+<!-- YAML
+added: REPLACEME
+-->
+
+When set to `1`, the `http2` module is suppressed.
+
 ### `NODE_OPTIONS=options...`
 <!-- YAML
 added: v8.0.0
diff --git a/doc/api/http2.md b/doc/api/http2.md
index ca2ac644a0d4bc..6e9c1d6b8a248d 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 36c44d6b2cf8c9..80fe1c6ab9549e 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)
@@ -280,6 +276,10 @@ with small\-icu support.
 .BR NODE_NO_WARNINGS =\fI1\fR
 When set to \fI1\fR, process warnings are silenced.
 
+.TP
+.BR NODE_NO_HTTP2 =\fI1\fR
+When set to \fI1\fR, the http2 module is suppressed.
+
 .TP
 .BR NODE_OPTIONS =\fIoptions...\fR
 A space-separated list of command line options. \fBoptions...\fR are interpreted
diff --git a/src/node.cc b/src/node.cc
index 5d6dae1d70605e..7b1465a68c64e2 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -246,8 +246,8 @@ 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;
+// Set to false in node.cc when NODE_NO_HTTP2=1 is used.
+bool config_expose_http2 = true;
 
 bool v8_initialized = false;
 
@@ -3830,7 +3830,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"
@@ -3894,7 +3893,8 @@ static void PrintHelp() {
 #endif
 #endif
          "NODE_NO_WARNINGS             set to 1 to silence process warnings\n"
-#if !defined(NODE_WITHOUT_NODE_OPTIONS)
+         "NODE_NO_HTTP2                set to 1 to suppress the http2 module\n"
+         #if !defined(NODE_WITHOUT_NODE_OPTIONS)
          "NODE_OPTIONS                 set CLI options in the environment\n"
          "                             via a space-separated list\n"
 #endif
@@ -4173,7 +4173,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;
+      // Intentional non-op
     } else if (strcmp(arg, "-") == 0) {
       break;
     } else if (strcmp(arg, "--") == 0) {
@@ -4550,6 +4550,12 @@ void Init(int* argc,
         SafeGetenv("NODE_PENDING_DEPRECATION", &text) && text[0] == '1';
   }
 
+  {
+    std::string text;
+    config_expose_http2 =
+      !(SafeGetenv("NODE_NO_HTTP2", &text) && text[0] == '1');
+  }
+
   // Allow for environment set preserving symlinks.
   {
     std::string text;

From 9ccf0afc12dfa2143222e9592581ca950add632f Mon Sep 17 00:00:00 2001
From: James M Snell <jasnell@gmail.com>
Date: Fri, 29 Sep 2017 08:23:50 -0700
Subject: [PATCH 2/2] http2: remove --expose-http2 flag from tests, etc

Remove the --expose-http2 flag from tests and benchmarks
---
 benchmark/http2/headers.js                                | 2 +-
 benchmark/http2/respond-with-fd.js                        | 2 +-
 benchmark/http2/simple.js                                 | 2 +-
 benchmark/http2/write.js                                  | 2 +-
 test/parallel/test-http2-binding.js                       | 1 -
 test/parallel/test-http2-client-data-end.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                | 2 +-
 test/parallel/test-http2-date-header.js                   | 2 +-
 test/parallel/test-http2-dont-override.js                 | 2 +-
 test/parallel/test-http2-getpackedsettings.js             | 2 +-
 test/parallel/test-http2-goaway-opaquedata.js             | 2 +-
 test/parallel/test-http2-head-request.js                  | 2 +-
 test/parallel/test-http2-https-fallback.js                | 2 +-
 test/parallel/test-http2-info-headers.js                  | 2 +-
 test/parallel/test-http2-max-concurrent-streams.js        | 2 +-
 test/parallel/test-http2-methods.js                       | 2 +-
 test/parallel/test-http2-misused-pseudoheaders.js         | 2 +-
 test/parallel/test-http2-multi-content-length.js          | 2 +-
 test/parallel/test-http2-multiheaders-raw.js              | 2 +-
 test/parallel/test-http2-multiheaders.js                  | 2 +-
 test/parallel/test-http2-multiplex.js                     | 2 +-
 test/parallel/test-http2-noflag.js                        | 8 --------
 .../test-http2-options-max-headers-block-length.js        | 2 +-
 test/parallel/test-http2-options-max-reserved-streams.js  | 2 +-
 test/parallel/test-http2-padding-callback.js              | 2 +-
 test/parallel/test-http2-priority-event.js                | 2 +-
 test/parallel/test-http2-request-response-proto.js        | 2 +-
 test/parallel/test-http2-respond-file-204.js              | 2 +-
 test/parallel/test-http2-respond-file-304.js              | 2 +-
 test/parallel/test-http2-respond-file-404.js              | 2 +-
 test/parallel/test-http2-respond-file-compat.js           | 2 +-
 test/parallel/test-http2-respond-file-error-dir.js        | 2 +-
 test/parallel/test-http2-respond-file-errors.js           | 2 +-
 test/parallel/test-http2-respond-file-fd-errors.js        | 2 +-
 test/parallel/test-http2-respond-file-fd-invalid.js       | 2 +-
 test/parallel/test-http2-respond-file-fd-range.js         | 2 +-
 test/parallel/test-http2-respond-file-fd.js               | 2 +-
 test/parallel/test-http2-respond-file-push.js             | 2 +-
 test/parallel/test-http2-respond-file-range.js            | 2 +-
 test/parallel/test-http2-respond-file.js                  | 2 +-
 test/parallel/test-http2-respond-no-data.js               | 2 +-
 test/parallel/test-http2-response-splitting.js            | 2 +-
 test/parallel/test-http2-serve-file.js                    | 2 +-
 .../test-http2-server-destroy-before-additional.js        | 2 +-
 .../parallel/test-http2-server-destroy-before-priority.js | 2 +-
 test/parallel/test-http2-server-destroy-before-push.js    | 2 +-
 test/parallel/test-http2-server-destroy-before-respond.js | 2 +-
 test/parallel/test-http2-server-destroy-before-rst.js     | 2 +-
 test/parallel/test-http2-server-destroy-before-state.js   | 2 +-
 test/parallel/test-http2-server-destroy-before-write.js   | 2 +-
 test/parallel/test-http2-server-errors.js                 | 2 +-
 test/parallel/test-http2-server-push-disabled.js          | 2 +-
 .../parallel/test-http2-server-push-stream-errors-args.js | 2 +-
 test/parallel/test-http2-server-push-stream-errors.js     | 2 +-
 test/parallel/test-http2-server-push-stream-head.js       | 2 +-
 test/parallel/test-http2-server-push-stream.js            | 2 +-
 test/parallel/test-http2-server-rst-before-respond.js     | 2 +-
 test/parallel/test-http2-server-rst-stream.js             | 2 +-
 test/parallel/test-http2-server-set-header.js             | 2 +-
 test/parallel/test-http2-server-settimeout-no-callback.js | 2 +-
 .../parallel/test-http2-server-shutdown-before-respond.js | 2 +-
 test/parallel/test-http2-server-socket-destroy.js         | 2 +-
 test/parallel/test-http2-server-socketerror.js            | 2 +-
 test/parallel/test-http2-server-startup.js                | 2 +-
 test/parallel/test-http2-server-timeout.js                | 2 +-
 test/parallel/test-http2-session-settings.js              | 2 +-
 test/parallel/test-http2-session-stream-state.js          | 2 +-
 test/parallel/test-http2-single-headers.js                | 2 +-
 test/parallel/test-http2-status-code-invalid.js           | 2 +-
 test/parallel/test-http2-status-code.js                   | 2 +-
 test/parallel/test-http2-stream-client.js                 | 2 +-
 test/parallel/test-http2-timeouts.js                      | 2 +-
 test/parallel/test-http2-too-many-settings.js             | 2 +-
 test/parallel/test-http2-trailers.js                      | 2 +-
 test/parallel/test-http2-util-asserts.js                  | 2 +-
 test/parallel/test-http2-util-headers-list.js             | 2 +-
 test/parallel/test-http2-window-size.js                   | 2 +-
 test/parallel/test-http2-withflag.js                      | 2 +-
 test/parallel/test-http2-write-callbacks.js               | 2 +-
 test/parallel/test-http2-write-empty-string.js            | 2 +-
 test/parallel/test-http2-zero-length-write.js             | 2 +-
 test/sequential/test-http2-session-timeout.js             | 2 +-
 131 files changed, 81 insertions(+), 138 deletions(-)
 delete mode 100644 test/parallel/test-http2-noflag.js

diff --git a/benchmark/http2/headers.js b/benchmark/http2/headers.js
index dc2fb3a0a1fd18..f6b29347cdb5b2 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 2c4c767a96f7cc..a235bd87d51bcc 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 d0674fd95231b6..8d7767197bc30e 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 20deff8930b296..e4f64cc05dedb3 100644
--- a/benchmark/http2/write.js
+++ b/benchmark/http2/write.js
@@ -7,7 +7,7 @@ const bench = common.createBenchmark(main, {
   streams: [100, 200, 1000],
   length: [64 * 1024, 128 * 1024, 256 * 1024, 1024 * 1024],
   size: [100000]
-}, { flags: ['--expose-http2', '--no-warnings'] });
+}, { flags: ['--no-warnings'] });
 
 function main(conf) {
   const m = +conf.streams;
diff --git a/test/parallel/test-http2-binding.js b/test/parallel/test-http2-binding.js
index 22c4783b1fabf5..5b7a74a0324ef8 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 8c50389f3b85e1..569979e73efb5c 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.js b/test/parallel/test-http2-client-destroy.js
index 9a4877578fd384..f10bf60ce34fc0 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 2e9f946194b05a..51ceb83677ccf2 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 7fd81c8b9332f0..7fc3841622e1dd 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 5b6dccad6a223e..f13f5f1408d307 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 92dad5c8430428..5d3fc0ab5a1fd8 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 1a4aa938da6a75..073b2d4837d2d2 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 08c799a6e1ffe0..f3e1d7afa50d7e 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 2ebb0654a3135a..27caa9e601897b 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 316a41d0f79d9b..4fed0ee3ad0703 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 9d2fdd3b44865c..f56a45cc3b5ed6 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 05ba63f0b54d41..4eefc4b9f322b3 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 645fb331638846..3a7a607bc3539a 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 cee86e3fc65389..c9c6ebaa7a2236 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 ed46840266a58a..26674dcad369e3 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 dacb39c6dfe361..5774d1a922bd52 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 14e78155204770..800df1c432944f 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 291a70e0f27317..6f08e813ef385a 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 774d276b64e4ae..0a5de368c6cfff 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 8e6202317aafc3..1f43b3891b24ed 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 a06b13ce9c2711..b6bfd04089a103 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 5d62e56640a70d..58cc52c64f6c91 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 60241815727737..f8494bb0ddee39 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 46926a3c1cccf8..a19b3191874a69 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 7cdae697cc0b63..460eb576bfd4f6 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 7fa649fe7fa0bf..713e4babd20107 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 64f7b1ad9756eb..edcd7a8f8cdea4 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 9b42ae05dc24b4..35e39b9670868e 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 b45e4f3d9f530d..da7c4adbbfff16 100755
--- 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 41f6062d5bce51..77e761b6227702 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 312b7c75ab6eb8..e2465cfa00d1f6 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 da45c4467117a9..fafb3ea76dd204 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 {
diff --git a/test/parallel/test-http2-compat-serverresponse-finished.js b/test/parallel/test-http2-compat-serverresponse-finished.js
index d0e67e57ef3c2e..b816b922202dd6 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 c91fac16fb561c..68d4789f69be53 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 debb746e63730e..aae1d96c552ebe 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 6b5bf03d522045..6d06d07f7dc0ab 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 ace05ddefe7372..96b033328f2855 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 bec056d013816d..45a876d674313b 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 3b3ef6bdc2c46e..21a5b6ea4e2820 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 0c74a2c8f2e8ab..841bafe724a7a8 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 3f3aa2045b4929..4d93e14dbec4b4 100755
--- 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 bc864af46df4cc..58a4ca053d222c 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 2e826132adbe54..704f199ca27e99 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 3626c7f2e51a26..78c9a345293c12 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 60777dadeb8e1e..e5a4e429907090 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 b2f0a3bf6c25cc..48b08b6367b4b3 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 73935d286bba57..7fdea9aef41a08 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 03d4202dd42372..7447d4e5c635ed 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 22ab368f7bc59e..149b5164231a21 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 5a9849f9e11ab6..652a28150690f9 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 f4151d94e6aa10..509c9ecdcdb8b2 100644
--- a/test/parallel/test-http2-createwritereq.js
+++ b/test/parallel/test-http2-createwritereq.js
@@ -1,4 +1,4 @@
-// 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 d7afeb5e2b90bc..dd525f39fa179a 100644
--- a/test/parallel/test-http2-date-header.js
+++ b/test/parallel/test-http2-date-header.js
@@ -1,4 +1,4 @@
-// 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 d8573eac340b1d..992492a9056c35 100644
--- a/test/parallel/test-http2-dont-override.js
+++ b/test/parallel/test-http2-dont-override.js
@@ -1,4 +1,4 @@
-// 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 8c46afcb57fd82..ebcf14f71568b0 100644
--- a/test/parallel/test-http2-getpackedsettings.js
+++ b/test/parallel/test-http2-getpackedsettings.js
@@ -1,4 +1,4 @@
-// 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 9ff8b13cafd2ca..05744bfb6cf7db 100644
--- a/test/parallel/test-http2-goaway-opaquedata.js
+++ b/test/parallel/test-http2-goaway-opaquedata.js
@@ -1,4 +1,4 @@
-// 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 ee86ded5498808..e6ef65791f5c55 100644
--- a/test/parallel/test-http2-head-request.js
+++ b/test/parallel/test-http2-head-request.js
@@ -1,4 +1,4 @@
-// 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 9fd3d94b3ca4b5..724da070d64068 100644
--- a/test/parallel/test-http2-https-fallback.js
+++ b/test/parallel/test-http2-https-fallback.js
@@ -1,4 +1,4 @@
-// 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 22340c48ee8022..572e38781ff892 100644
--- a/test/parallel/test-http2-info-headers.js
+++ b/test/parallel/test-http2-info-headers.js
@@ -1,4 +1,4 @@
-// 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 be101720dc478b..93815f913650fd 100644
--- a/test/parallel/test-http2-max-concurrent-streams.js
+++ b/test/parallel/test-http2-max-concurrent-streams.js
@@ -1,4 +1,4 @@
-// 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 dac61359ec010e..066da32e48933b 100644
--- a/test/parallel/test-http2-methods.js
+++ b/test/parallel/test-http2-methods.js
@@ -1,4 +1,4 @@
-// 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 2744561025dcde..2068c42520da5a 100644
--- a/test/parallel/test-http2-misused-pseudoheaders.js
+++ b/test/parallel/test-http2-misused-pseudoheaders.js
@@ -1,4 +1,4 @@
-// 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 da7fbd33a9f86c..e28c697883b26e 100644
--- a/test/parallel/test-http2-multi-content-length.js
+++ b/test/parallel/test-http2-multi-content-length.js
@@ -1,4 +1,4 @@
-// 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 f9c7cc5f9bd484..9adc41a4a794e8 100644
--- a/test/parallel/test-http2-multiheaders-raw.js
+++ b/test/parallel/test-http2-multiheaders-raw.js
@@ -1,4 +1,4 @@
-// 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 bcdc9458b32778..5e1fee7fffc9db 100644
--- a/test/parallel/test-http2-multiheaders.js
+++ b/test/parallel/test-http2-multiheaders.js
@@ -1,4 +1,4 @@
-// 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 22622392b8c841..fbd7b3cd8e465b 100644
--- a/test/parallel/test-http2-multiplex.js
+++ b/test/parallel/test-http2-multiplex.js
@@ -1,4 +1,4 @@
-// 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 903fd649c5e458..00000000000000
--- 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 6b47a248980b6c..35b0e5f6428719 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,4 @@
-// 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 6d4957342d7fd9..81c176851f90f1 100644
--- a/test/parallel/test-http2-options-max-reserved-streams.js
+++ b/test/parallel/test-http2-options-max-reserved-streams.js
@@ -1,4 +1,4 @@
-// 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 a63f1041f3f8f4..ee28dddf80f502 100644
--- a/test/parallel/test-http2-padding-callback.js
+++ b/test/parallel/test-http2-padding-callback.js
@@ -1,4 +1,4 @@
-// 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 b577fdb37637e1..34a978f80ea94d 100644
--- a/test/parallel/test-http2-priority-event.js
+++ b/test/parallel/test-http2-priority-event.js
@@ -1,4 +1,4 @@
-// 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 3bbf8e86434489..2dae2c77147cc5 100644
--- a/test/parallel/test-http2-request-response-proto.js
+++ b/test/parallel/test-http2-request-response-proto.js
@@ -1,4 +1,4 @@
-// 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 d52a35136d5fbf..cd2026e9837a68 100644
--- a/test/parallel/test-http2-respond-file-204.js
+++ b/test/parallel/test-http2-respond-file-204.js
@@ -1,4 +1,4 @@
-// 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 dcda6319738ecd..67c40fd6a1486c 100644
--- a/test/parallel/test-http2-respond-file-304.js
+++ b/test/parallel/test-http2-respond-file-304.js
@@ -1,4 +1,4 @@
-// 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 b8e2a39c9a2c88..75afd07e266fbf 100644
--- a/test/parallel/test-http2-respond-file-404.js
+++ b/test/parallel/test-http2-respond-file-404.js
@@ -1,4 +1,4 @@
-// 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 230f2aa23d40dd..193e8f37403c92 100644
--- a/test/parallel/test-http2-respond-file-compat.js
+++ b/test/parallel/test-http2-respond-file-compat.js
@@ -1,4 +1,4 @@
-// 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 fd212a4c339dc1..633d182530b9d6 100644
--- a/test/parallel/test-http2-respond-file-error-dir.js
+++ b/test/parallel/test-http2-respond-file-error-dir.js
@@ -1,4 +1,4 @@
-// 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 cb87202e02c075..e816a2f7693e41 100644
--- a/test/parallel/test-http2-respond-file-errors.js
+++ b/test/parallel/test-http2-respond-file-errors.js
@@ -1,4 +1,4 @@
-// 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 99cb13e083864e..a80b8171484069 100644
--- a/test/parallel/test-http2-respond-file-fd-errors.js
+++ b/test/parallel/test-http2-respond-file-fd-errors.js
@@ -1,4 +1,4 @@
-// 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 7e08a29e93709b..228012e7a470d0 100644
--- a/test/parallel/test-http2-respond-file-fd-invalid.js
+++ b/test/parallel/test-http2-respond-file-fd-invalid.js
@@ -1,4 +1,4 @@
-// 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 ddd91b3f848414..c82cfe9744906f 100644
--- a/test/parallel/test-http2-respond-file-fd-range.js
+++ b/test/parallel/test-http2-respond-file-fd-range.js
@@ -1,4 +1,4 @@
-// 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 4d5aa7670c1c5c..7cfa8a4cff8e63 100644
--- a/test/parallel/test-http2-respond-file-fd.js
+++ b/test/parallel/test-http2-respond-file-fd.js
@@ -1,4 +1,4 @@
-// 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 abcd72d598be54..a9e2dc75c8a790 100644
--- a/test/parallel/test-http2-respond-file-push.js
+++ b/test/parallel/test-http2-respond-file-push.js
@@ -1,4 +1,4 @@
-// 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 a4fda25a9017a8..7f033cbdee2e1a 100644
--- a/test/parallel/test-http2-respond-file-range.js
+++ b/test/parallel/test-http2-respond-file-range.js
@@ -1,4 +1,4 @@
-// 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 9ca17b32513b39..c948203067aeaa 100644
--- a/test/parallel/test-http2-respond-file.js
+++ b/test/parallel/test-http2-respond-file.js
@@ -1,4 +1,4 @@
-// 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 b2fbf44af193df..9fce8d5c151a9d 100644
--- a/test/parallel/test-http2-respond-no-data.js
+++ b/test/parallel/test-http2-respond-no-data.js
@@ -1,4 +1,4 @@
-// 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 557967a3df6c81..0c7bffbdb7d3f5 100644
--- a/test/parallel/test-http2-response-splitting.js
+++ b/test/parallel/test-http2-response-splitting.js
@@ -1,4 +1,4 @@
-// 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 6f39094328af7b..961257e392d778 100644
--- a/test/parallel/test-http2-serve-file.js
+++ b/test/parallel/test-http2-serve-file.js
@@ -1,4 +1,4 @@
-// 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 5e04a87323e4c1..cc94c8fdc8b5aa 100644
--- a/test/parallel/test-http2-server-destroy-before-additional.js
+++ b/test/parallel/test-http2-server-destroy-before-additional.js
@@ -1,4 +1,4 @@
-// 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 74d7c011ba0be1..33fb700e03ca9b 100644
--- a/test/parallel/test-http2-server-destroy-before-priority.js
+++ b/test/parallel/test-http2-server-destroy-before-priority.js
@@ -1,4 +1,4 @@
-// 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 429f37e2c68362..26f65766cf3fe0 100644
--- a/test/parallel/test-http2-server-destroy-before-push.js
+++ b/test/parallel/test-http2-server-destroy-before-push.js
@@ -1,4 +1,4 @@
-// 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 4ea64e82812be1..3b5457ff1708b9 100644
--- a/test/parallel/test-http2-server-destroy-before-respond.js
+++ b/test/parallel/test-http2-server-destroy-before-respond.js
@@ -1,4 +1,4 @@
-// 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 f066e76b5f97de..ee0a1d47d573fc 100644
--- a/test/parallel/test-http2-server-destroy-before-rst.js
+++ b/test/parallel/test-http2-server-destroy-before-rst.js
@@ -1,4 +1,4 @@
-// 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 f5dce3e30a272d..2ed552ca0bff83 100644
--- a/test/parallel/test-http2-server-destroy-before-state.js
+++ b/test/parallel/test-http2-server-destroy-before-state.js
@@ -1,4 +1,4 @@
-// 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 724e12624ef608..dab35703f53ec2 100644
--- a/test/parallel/test-http2-server-destroy-before-write.js
+++ b/test/parallel/test-http2-server-destroy-before-write.js
@@ -1,4 +1,4 @@
-// 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 9280d63edb6233..7d7db6a24538fd 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 a9cdbd6239739d..1ba0fb068f545e 100644
--- a/test/parallel/test-http2-server-push-disabled.js
+++ b/test/parallel/test-http2-server-push-disabled.js
@@ -1,4 +1,4 @@
-// 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 9924517d406c58..dcc503aa24c694 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,4 @@
-// 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 d686fc15f1bca8..17b067fd3a0d00 100644
--- a/test/parallel/test-http2-server-push-stream-errors.js
+++ b/test/parallel/test-http2-server-push-stream-errors.js
@@ -1,4 +1,4 @@
-// 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 a1172b8ecf3789..8ccf4b368d1803 100644
--- a/test/parallel/test-http2-server-push-stream-head.js
+++ b/test/parallel/test-http2-server-push-stream-head.js
@@ -1,4 +1,4 @@
-// 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 c79ff7caecf0a9..ff00ded3d1bd5a 100644
--- a/test/parallel/test-http2-server-push-stream.js
+++ b/test/parallel/test-http2-server-push-stream.js
@@ -1,4 +1,4 @@
-// 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 d8e9d0a6cc5bff..2761a9c5c5095d 100644
--- a/test/parallel/test-http2-server-rst-before-respond.js
+++ b/test/parallel/test-http2-server-rst-before-respond.js
@@ -1,4 +1,4 @@
-// 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 38bfb62af546eb..38dd761d16092c 100644
--- a/test/parallel/test-http2-server-rst-stream.js
+++ b/test/parallel/test-http2-server-rst-stream.js
@@ -1,4 +1,4 @@
-// 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 b681469ece2b18..3174bb24dcc787 100644
--- a/test/parallel/test-http2-server-set-header.js
+++ b/test/parallel/test-http2-server-set-header.js
@@ -1,4 +1,4 @@
-// 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 eff0418fa7b6c2..e138aa71d3f56f 100644
--- a/test/parallel/test-http2-server-settimeout-no-callback.js
+++ b/test/parallel/test-http2-server-settimeout-no-callback.js
@@ -1,4 +1,4 @@
-// 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 f870edc7be6eb2..11d2e68c0bd841 100644
--- a/test/parallel/test-http2-server-shutdown-before-respond.js
+++ b/test/parallel/test-http2-server-shutdown-before-respond.js
@@ -1,4 +1,4 @@
-// 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 d77f7355676f02..d947f201982f63 100644
--- a/test/parallel/test-http2-server-socket-destroy.js
+++ b/test/parallel/test-http2-server-socket-destroy.js
@@ -1,4 +1,4 @@
-// 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 5bbb2130f0ec17..dbef9ae4d3dd6a 100644
--- a/test/parallel/test-http2-server-socketerror.js
+++ b/test/parallel/test-http2-server-socketerror.js
@@ -1,4 +1,4 @@
-// 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 fc76f9b21703e4..701424f7f698ff 100644
--- a/test/parallel/test-http2-server-startup.js
+++ b/test/parallel/test-http2-server-startup.js
@@ -1,4 +1,4 @@
-// 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 c3a8ef88517bb5..fd4853b97fd355 100755
--- a/test/parallel/test-http2-server-timeout.js
+++ b/test/parallel/test-http2-server-timeout.js
@@ -1,4 +1,4 @@
-// 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 4570d23ad38a15..a1582588823253 100644
--- a/test/parallel/test-http2-session-settings.js
+++ b/test/parallel/test-http2-session-settings.js
@@ -1,4 +1,4 @@
-// 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 f122b2718997f9..ce3d50b7a6fedb 100644
--- a/test/parallel/test-http2-session-stream-state.js
+++ b/test/parallel/test-http2-session-stream-state.js
@@ -1,4 +1,4 @@
-// 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 cf66e570f91b19..2f3c4a50eedae8 100644
--- a/test/parallel/test-http2-single-headers.js
+++ b/test/parallel/test-http2-single-headers.js
@@ -1,4 +1,4 @@
-// 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 0fe8319db4140e..47e7354a016d05 100644
--- a/test/parallel/test-http2-status-code-invalid.js
+++ b/test/parallel/test-http2-status-code-invalid.js
@@ -1,4 +1,4 @@
-// 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 9a6821b1d664db..800b7679493000 100644
--- a/test/parallel/test-http2-status-code.js
+++ b/test/parallel/test-http2-status-code.js
@@ -1,4 +1,4 @@
-// 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 658c66ce7af895..8b427c7a7d86da 100644
--- a/test/parallel/test-http2-stream-client.js
+++ b/test/parallel/test-http2-stream-client.js
@@ -1,4 +1,4 @@
-// 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 66fabdbbd809a7..84ee7a2178475f 100755
--- a/test/parallel/test-http2-timeouts.js
+++ b/test/parallel/test-http2-timeouts.js
@@ -1,4 +1,4 @@
-// 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 849e24af4e7ff3..67ba47d6cbe0c1 100644
--- a/test/parallel/test-http2-too-many-settings.js
+++ b/test/parallel/test-http2-too-many-settings.js
@@ -1,4 +1,4 @@
-// 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 282899e65ebf5d..230cf84e3a74e3 100644
--- a/test/parallel/test-http2-trailers.js
+++ b/test/parallel/test-http2-trailers.js
@@ -1,4 +1,4 @@
-// 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 fd902f01a3d29a..3e1703d158ff63 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 7e6bb7ece205bc..0bc06bb7277b50 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 57e27ac29bf73d..a63c117424b3ef 100644
--- a/test/parallel/test-http2-window-size.js
+++ b/test/parallel/test-http2-window-size.js
@@ -1,4 +1,4 @@
-// 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 069212257c2f0b..c1d0b2ebaa8bc0 100644
--- a/test/parallel/test-http2-withflag.js
+++ b/test/parallel/test-http2-withflag.js
@@ -1,4 +1,4 @@
-// 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 e45e8ccb7d4a1d..e8f74402ccd525 100644
--- a/test/parallel/test-http2-write-callbacks.js
+++ b/test/parallel/test-http2-write-callbacks.js
@@ -1,4 +1,4 @@
-// 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 e7a55e5c0a440b..7483c018c7726e 100644
--- a/test/parallel/test-http2-write-empty-string.js
+++ b/test/parallel/test-http2-write-empty-string.js
@@ -1,4 +1,4 @@
-// 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 f261cc72961e51..c033b88a9a5c24 100644
--- a/test/parallel/test-http2-zero-length-write.js
+++ b/test/parallel/test-http2-zero-length-write.js
@@ -1,4 +1,4 @@
-// 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 a7c6184442aabc..4486484cdf0772 100644
--- a/test/sequential/test-http2-session-timeout.js
+++ b/test/sequential/test-http2-session-timeout.js
@@ -1,4 +1,4 @@
-// Flags: --expose-http2
+// 
 'use strict';
 
 const common = require('../common');