diff --git a/packages/pg-esm-test/common-js-imports.test.cjs b/packages/pg-esm-test/common-js-imports.test.cjs
index 004164ee1..21c03e049 100644
--- a/packages/pg-esm-test/common-js-imports.test.cjs
+++ b/packages/pg-esm-test/common-js-imports.test.cjs
@@ -2,7 +2,13 @@ const assert = require('node:assert')
 const test = require('node:test')
 const { describe, it } = test
 
-const paths = ['pg', 'pg/lib/index.js', 'pg/lib/connection-parameters.js']
+const paths = [
+  'pg',
+  'pg/lib/index.js',
+  'pg/lib/connection-parameters.js',
+  'pg-protocol/dist/messages.js',
+  'pg-native/lib/build-result.js',
+]
 for (const path of paths) {
   describe(`importing ${path}`, () => {
     it('works with require', () => {
diff --git a/packages/pg-esm-test/package.json b/packages/pg-esm-test/package.json
index bee00e29a..d9e6a7200 100644
--- a/packages/pg-esm-test/package.json
+++ b/packages/pg-esm-test/package.json
@@ -19,7 +19,8 @@
     "pg-cursor": "^2.14.1",
     "pg-native": "^3.4.0",
     "pg-pool": "^3.9.1",
-    "pg-query-stream": "^4.9.1"
+    "pg-query-stream": "^4.9.1",
+    "pg-protocol": "^1.9.0"
   },
   "author": "Brian M. Carlson <brian.m.carlson@gmail.com>",
   "license": "MIT"
diff --git a/packages/pg-esm-test/pg-protocol.test.js b/packages/pg-esm-test/pg-protocol.test.js
new file mode 100644
index 000000000..68fc47229
--- /dev/null
+++ b/packages/pg-esm-test/pg-protocol.test.js
@@ -0,0 +1,18 @@
+import protocol, { NoticeMessage, DatabaseError } from 'pg-protocol/dist/messages.js'
+import { describe, it } from 'node:test'
+import { strict as assert } from 'node:assert'
+
+describe('pg-protocol', () => {
+  it('should export database error', () => {
+    assert.ok(DatabaseError)
+  })
+  it('should export protocol', () => {
+    assert.ok(protocol)
+    assert.ok(protocol.noData)
+    assert.ok(protocol.parseComplete)
+    assert.ok(protocol.NoticeMessage)
+  })
+  it('should export NoticeMessage from file in dist folder', () => {
+    assert.ok(NoticeMessage)
+  })
+})
diff --git a/packages/pg-native/package.json b/packages/pg-native/package.json
index eeeb19273..ad2053028 100644
--- a/packages/pg-native/package.json
+++ b/packages/pg-native/package.json
@@ -49,6 +49,7 @@
   },
   "files": [
     "index.js",
+    "lib",
     "esm"
   ]
 }
diff --git a/packages/pg-protocol/esm/index.js b/packages/pg-protocol/esm/index.js
index 05afca900..c52807d63 100644
--- a/packages/pg-protocol/esm/index.js
+++ b/packages/pg-protocol/esm/index.js
@@ -1,5 +1,5 @@
 // ESM wrapper for pg-protocol
-import protocol from '../dist/index.js'
+import * as protocol from '../dist/index.js'
 
 // Re-export all the properties
 export const DatabaseError = protocol.DatabaseError
diff --git a/packages/pg-protocol/package.json b/packages/pg-protocol/package.json
index 2980fdc64..bbb5bb8fd 100644
--- a/packages/pg-protocol/package.json
+++ b/packages/pg-protocol/package.json
@@ -9,6 +9,11 @@
       "import": "./esm/index.js",
       "require": "./dist/index.js",
       "default": "./dist/index.js"
+    },
+    "./dist/*": {
+      "import": "./dist/*",
+      "require": "./dist/*",
+      "default": "./dist/*"
     }
   },
   "license": "MIT",