diff --git a/packages/pg-esm-test/index.test.js b/packages/pg-esm-test/index.test.js
deleted file mode 100644
index 60578ace..00000000
--- a/packages/pg-esm-test/index.test.js
+++ /dev/null
@@ -1,10 +0,0 @@
-// test/my-module.test.js
-import assert from 'node:assert'
-import { describe, it } from 'node:test'
-import { Client } from 'pg'
-
-describe('executeQuery', () => {
-  it('should return a non-empty result for a valid query', async () => {
-    assert.ok(true, 'hi')
-  })
-})
diff --git a/packages/pg-esm-test/package.json b/packages/pg-esm-test/package.json
index 5c06c17d..53a75b7e 100644
--- a/packages/pg-esm-test/package.json
+++ b/packages/pg-esm-test/package.json
@@ -14,7 +14,9 @@
     "test"
   ],
   "dependencies": {
-    "pg": "^8.14.1"
+    "pg": "^8.14.1",
+    "pg-pool": "^3.8.0",
+    "pg-native": "^3.3.0"
   },
   "author": "Brian M. Carlson <brian.m.carlson@gmail.com>",
   "license": "MIT"
diff --git a/packages/pg-esm-test/pg-native.test.js b/packages/pg-esm-test/pg-native.test.js
new file mode 100644
index 00000000..c7a9f83f
--- /dev/null
+++ b/packages/pg-esm-test/pg-native.test.js
@@ -0,0 +1,10 @@
+// test/my-module.test.js
+import assert from 'node:assert'
+import { describe, it } from 'node:test'
+import Client from 'pg-native'
+
+describe('pg-native', () => {
+  it('should export Client constructor', () => {
+    assert.ok(new Client())
+  })
+})
diff --git a/packages/pg-esm-test/pg-pool.test.js b/packages/pg-esm-test/pg-pool.test.js
new file mode 100644
index 00000000..d2dbbc79
--- /dev/null
+++ b/packages/pg-esm-test/pg-pool.test.js
@@ -0,0 +1,10 @@
+// test/my-module.test.js
+import assert from 'node:assert'
+import { describe, it } from 'node:test'
+import Pool from 'pg-pool'
+
+describe('pg-pool', () => {
+  it('should export Pool constructor', () => {
+    assert.ok(new Pool())
+  })
+})
diff --git a/packages/pg-esm-test/pg.test.js b/packages/pg-esm-test/pg.test.js
new file mode 100644
index 00000000..696a1cdc
--- /dev/null
+++ b/packages/pg-esm-test/pg.test.js
@@ -0,0 +1,18 @@
+// test/my-module.test.js
+import assert from 'node:assert'
+import { describe, it } from 'node:test'
+import pg, { Client, Pool } from 'pg'
+
+describe('pg', () => {
+  it('should export Client constructor', () => {
+    assert.ok(new Client())
+  })
+
+  it('should export Pool constructor', () => {
+    assert.ok(new Pool())
+  })
+
+  it('should still provide default export', () => {
+    assert.ok(new pg.Pool())
+  })
+})
diff --git a/packages/pg-native/esm/index.js b/packages/pg-native/esm/index.mjs
similarity index 100%
rename from packages/pg-native/esm/index.js
rename to packages/pg-native/esm/index.mjs
diff --git a/packages/pg-native/package.json b/packages/pg-native/package.json
index 21a1c91a..7d736d7a 100644
--- a/packages/pg-native/package.json
+++ b/packages/pg-native/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "exports": {
     ".": {
-      "import": "./esm/index.js",
+      "import": "./esm/index.mjs",
       "require": "./index.js",
       "default": "./index.js"
     }
diff --git a/packages/pg-pool/esm/index.js b/packages/pg-pool/esm/index.mjs
similarity index 100%
rename from packages/pg-pool/esm/index.js
rename to packages/pg-pool/esm/index.mjs
diff --git a/packages/pg-pool/package.json b/packages/pg-pool/package.json
index 284a1050..04f0c6a4 100644
--- a/packages/pg-pool/package.json
+++ b/packages/pg-pool/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "exports": {
     ".": {
-      "import": "./esm/index.js",
+      "import": "./esm/index.mjs",
       "require": "./index.js",
       "default": "./index.js"
     }
diff --git a/packages/pg/esm/index.js b/packages/pg/esm/index.mjs
similarity index 100%
rename from packages/pg/esm/index.js
rename to packages/pg/esm/index.mjs
diff --git a/packages/pg/package.json b/packages/pg/package.json
index c950336e..451ce2af 100644
--- a/packages/pg/package.json
+++ b/packages/pg/package.json
@@ -21,7 +21,7 @@
   "main": "./lib",
   "exports": {
     ".": {
-      "import": "./esm/index.js",
+      "import": "./esm/index.mjs",
       "require": "./lib/index.js",
       "default": "./lib/index.js"
     }