diff --git a/Makefile b/Makefile
index 044986ea52..67a1505163 100644
--- a/Makefile
+++ b/Makefile
@@ -339,7 +339,7 @@ test-all-valgrind: test-build
 
 CI_NATIVE_SUITES := addons addons-napi
 CI_ASYNC_HOOKS := async-hooks
-CI_JS_SUITES := abort doctool inspector known_issues message parallel pseudo-tty sequential
+CI_JS_SUITES := abort doctool es-module inspector known_issues message parallel pseudo-tty sequential
 
 # Build and test addons without building anything else
 test-ci-native: LOGLEVEL := silent
diff --git a/test/README.md b/test/README.md
index 3849f32543..5a8957295d 100644
--- a/test/README.md
+++ b/test/README.md
@@ -12,10 +12,11 @@ On how to run tests in this directory, see
 
 |Directory          |Runs on CI     |Purpose        |
 |-------------------|---------------|---------------|
-|abort              |No             |Tests for when the  ``` --abort-on-uncaught-exception ``` flag is used.|
+|abort              |Yes            |Tests for when the  ``` --abort-on-uncaught-exception ``` flag is used.|
 |addons             |Yes            |Tests for [addon](https://nodejs.org/api/addons.html) functionality along with some tests that require an addon to function  properly.|
 |cctest             |Yes            |C++ test that is run as part of the build process.|
 |common             |               |Common modules shared among many tests. [Documentation](./common/README.md)|
+|es-module          |Yes            |Test ESM module loading.|
 |fixtures           |               |Test fixtures used in various tests throughout the test suite.|
 |gc                 |No             |Tests for garbage collection related functionality.|
 |inspector          |Yes            |Tests for the V8 inspector integration.|
@@ -29,3 +30,7 @@ On how to run tests in this directory, see
 |testpy             |               |Test configuration utility used by various test suites.|
 |tick-processor     |No             |Tests for the V8 tick processor integration. The tests are for the logic in ```lib/internal/v8_prof_processor.js``` and  ```lib/internal/v8_prof_polyfill.js```. The tests confirm that the profile processor packages the correct set of scripts from V8 and introduces the correct platform specific logic.|
 |timers             |No             |Tests for [timing utilities](https://nodejs.org/api/timers.html) (```setTimeout``` and ```setInterval```).|
+
+_When a new test directory is added, make sure to update the `CI_JS_SUITES`
+variable in the `Makefile` and the `js_test_suites` variable in
+`vcbuild.bat`._
diff --git a/test/es-module/test-esm-pkg-over-ext.mjs b/test/es-module/test-esm-pkg-over-ext.mjs
deleted file mode 100644
index 7e47c4c326..0000000000
--- a/test/es-module/test-esm-pkg-over-ext.mjs
+++ /dev/null
@@ -1,8 +0,0 @@
-// Flags: --experimental-modules
-/* eslint-disable required-modules */
-
-import resolved from '../fixtures/module-pkg-over-ext/inner';
-import expected from '../fixtures/module-pkg-over-ext/inner/package.json';
-import assert from 'assert';
-
-assert.strictEqual(resolved, expected);
diff --git a/vcbuild.bat b/vcbuild.bat
index 7601baf37d..6a72636bf8 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -44,7 +44,7 @@ set enable_static=
 set build_addons_napi=
 set test_node_inspect=
 set test_check_deopts=
-set js_test_suites=abort async-hooks inspector known_issues message parallel sequential
+set js_test_suites=abort async-hooks es-module inspector known_issues message parallel sequential
 set v8_test_options=
 set v8_build_options=
 set "common_test_suites=%js_test_suites% doctool addons addons-napi&set build_addons=1&set build_addons_napi=1"