diff --git a/.vscode/launch.json b/.vscode/launch.json
index 8b1ffa3f4..e9111194b 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -11,6 +11,18 @@
       "skipFiles": [
         "<node_internals>/**/*.js"
       ],
+    },
+    {
+      "name": "Debug Example: running a test fixture against local ts-node/esm loader",
+      "type": "pwa-node",
+      "request": "launch",
+      "cwd": "${workspaceFolder}/tests/esm",
+      "runtimeArgs": ["--loader", "../../ts-node/esm"],
+      "program": "throw error.ts",
+      "outputCapture": "std",
+      "skipFiles": [
+        "<node_internals>/**/*.js"
+      ],
     }
   ],
 }
diff --git a/package-lock.json b/package-lock.json
index bb969e51a..8dba42678 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -314,14 +314,15 @@
     "@cspotcode/source-map-consumer": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz",
-      "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg=="
+      "integrity": "sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==",
+      "dev": true
     },
     "@cspotcode/source-map-support": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz",
-      "integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==",
+      "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.0.tgz",
+      "integrity": "sha512-pOQRG+w/T1KogjiuO4uqqa+dw/IIb8kDY0ctYfiJstWv7TOTmtuAkx8ZB4YgauDNn2huHR33oruOgi45VcatOg==",
       "requires": {
-        "@cspotcode/source-map-consumer": "0.8.0"
+        "@jridgewell/trace-mapping": "0.3.9"
       }
     },
     "@istanbuljs/load-nyc-config": {
@@ -401,6 +402,25 @@
         "chalk": "^4.0.0"
       }
     },
+    "@jridgewell/resolve-uri": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.6.tgz",
+      "integrity": "sha512-R7xHtBSNm+9SyvpJkdQl+qrM3Hm2fea3Ef197M3mUug+v+yR+Rhfbs7PBtcBUVnIWJ4JcAdjvij+c8hXS9p5aw=="
+    },
+    "@jridgewell/sourcemap-codec": {
+      "version": "1.4.11",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz",
+      "integrity": "sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="
+    },
+    "@jridgewell/trace-mapping": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
+      "requires": {
+        "@jridgewell/resolve-uri": "^3.0.3",
+        "@jridgewell/sourcemap-codec": "^1.4.10"
+      }
+    },
     "@microsoft/api-extractor": {
       "version": "7.19.4",
       "resolved": "https://registry.npmjs.org/@microsoft/api-extractor/-/api-extractor-7.19.4.tgz",
@@ -4563,6 +4583,17 @@
         "make-error": "^1.1.1",
         "v8-compile-cache-lib": "^3.0.0",
         "yn": "3.1.1"
+      },
+      "dependencies": {
+        "@cspotcode/source-map-support": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz",
+          "integrity": "sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==",
+          "dev": true,
+          "requires": {
+            "@cspotcode/source-map-consumer": "0.8.0"
+          }
+        }
       }
     },
     "tslib": {
diff --git a/package.json b/package.json
index f48dda011..4483c3859 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
     }
   },
   "dependencies": {
-    "@cspotcode/source-map-support": "0.7.0",
+    "@cspotcode/source-map-support": "^0.8.0",
     "@tsconfig/node10": "^1.0.7",
     "@tsconfig/node12": "^1.0.7",
     "@tsconfig/node14": "^1.0.0",
diff --git a/src/test/esm-loader.spec.ts b/src/test/esm-loader.spec.ts
index 5bc9f648f..54242abff 100644
--- a/src/test/esm-loader.spec.ts
+++ b/src/test/esm-loader.spec.ts
@@ -48,22 +48,24 @@ test.suite('esm', (test) => {
       expect(err).toBe(null);
       expect(stdout).toBe('foo bar baz biff libfoo\n');
     });
-    test('should use source maps', async () => {
-      const { err, stdout } = await exec(
+    test('should use source maps', async (t) => {
+      const { err, stdout, stderr } = await exec(
         `${CMD_ESM_LOADER_WITHOUT_PROJECT} "throw error.ts"`,
         {
           cwd: join(TEST_DIR, './esm'),
         }
       );
       expect(err).not.toBe(null);
+      const expectedModuleUrl = pathToFileURL(
+        join(TEST_DIR, './esm/throw error.ts')
+      ).toString();
       expect(err!.message).toMatch(
         [
-          `${pathToFileURL(join(TEST_DIR, './esm/throw error.ts'))
-            .toString()
-            .replace(/%20/g, ' ')}:100`,
+          `${expectedModuleUrl}:100`,
           "  bar() { throw new Error('this is a demo'); }",
           '                ^',
           'Error: this is a demo',
+          `    at Foo.bar (${expectedModuleUrl}:100:17)`,
         ].join('\n')
       );
     });