diff --git a/packages/pg/lib/connection.js b/packages/pg/lib/connection.js
index 62d38fa69..115831d29 100644
--- a/packages/pg/lib/connection.js
+++ b/packages/pg/lib/connection.js
@@ -2,7 +2,7 @@
 
 const EventEmitter = require('events').EventEmitter
 
-const { parse, serialize } = require('pg-protocol')
+const { parse, serialize } = require('pg-protocol/dist/index.js')
 const stream = require('./stream')
 const { getStream } = stream
 
diff --git a/packages/pg/lib/index.js b/packages/pg/lib/index.js
index e8b746149..c6b2b071d 100644
--- a/packages/pg/lib/index.js
+++ b/packages/pg/lib/index.js
@@ -7,7 +7,7 @@ const Result = require('./result')
 const utils = require('./utils')
 const Pool = require('pg-pool')
 const TypeOverrides = require('./type-overrides')
-const { DatabaseError } = require('pg-protocol')
+const { DatabaseError } = require('pg-protocol/dist/index.js')
 const { escapeIdentifier, escapeLiteral } = require('./utils')
 
 const poolFactory = (Client) => {
diff --git a/packages/pg/test/unit/protocol-import-tests.js b/packages/pg/test/unit/protocol-import-tests.js
new file mode 100644
index 000000000..c85276f8d
--- /dev/null
+++ b/packages/pg/test/unit/protocol-import-tests.js
@@ -0,0 +1,16 @@
+'use strict'
+
+const assert = require('assert')
+const fs = require('fs')
+const helper = require('./test-helper')
+const suite = new helper.Suite()
+const test = suite.test.bind(suite)
+
+const connectionSource = fs.readFileSync(require.resolve('../../lib/connection'), 'utf8')
+const indexSource = fs.readFileSync(require.resolve('../../lib'), 'utf8')
+
+test('uses the exported pg-protocol CommonJS entrypoint', function () {
+  require.resolve('pg-protocol/dist/index.js')
+  assert.match(connectionSource, /require\('pg-protocol\/dist\/index\.js'\)/)
+  assert.match(indexSource, /require\('pg-protocol\/dist\/index\.js'\)/)
+})