diff --git a/addons/addon-image/test/ImageAddon.test.ts b/addons/addon-image/test/ImageAddon.test.ts
index c6f16d8c..54ea635a 100644
--- a/addons/addon-image/test/ImageAddon.test.ts
+++ b/addons/addon-image/test/ImageAddon.test.ts
@@ -118,7 +118,7 @@ test.describe('ImageAddon', () => {
     strictEqual(await ctx.page.evaluate('window.term._core.buffer.lines.get(0)._data instanceof Uint32Array'), true);
     strictEqual(await ctx.page.evaluate('window.term._core.buffer.lines.get(0)._extendedAttrs instanceof Object'), true);
     // inputhandler privates
-    strictEqual(await ctx.page.evaluate('window.term._core._inputHandler._curAttrData.constructor.name'), 'AttributeData');
+    strictEqual(await ctx.page.evaluate('window.term._core._inputHandler._curAttrData.constructor.name'), '_AttributeData');
     strictEqual(await ctx.page.evaluate('window.term._core._inputHandler._parser.constructor.name'), 'EscapeSequenceParser');
   });
 
diff --git a/bin/esbuild.mjs b/bin/esbuild.mjs
index 7ddecd43..53fca648 100644
--- a/bin/esbuild.mjs
+++ b/bin/esbuild.mjs
@@ -126,12 +126,6 @@ if (config.addon) {
   if (['ligatures'].includes(config.addon)) {
     skipOutTest = true;
   }
-
-  // TODO: Fix these
-  if (config.addon === 'image') {
-    skipOut = true;
-    skipOutTest = true;
-  }
 } else {
   bundleConfig = {
     ...bundleConfig,
diff --git a/bin/esbuild_all.mjs b/bin/esbuild_all.mjs
index c2d6ba72..0c0e27b7 100644
--- a/bin/esbuild_all.mjs
+++ b/bin/esbuild_all.mjs
@@ -13,9 +13,7 @@ jobs.push(createJob('xterm', []));
 // Addon jobs
 const addons = (await readdir('addons')).map(e => e.replace('addon-', ''));
 for (const addon of addons) {
-  if (addon !== 'image') {
-    jobs.push(createJob(`xterm-addon-${addon}`, [`--addon=${addon}`]));
-  }
+  jobs.push(createJob(`xterm-addon-${addon}`, [`--addon=${addon}`]));
 }
 
 // Demo job - This requires the others to be built so it's not included when building all
diff --git a/bin/test_playwright.js b/bin/test_playwright.js
index 8de3b784..3cb6adf6 100644
--- a/bin/test_playwright.js
+++ b/bin/test_playwright.js
@@ -23,8 +23,7 @@ let configs = [
   { name: 'addon-canvas',            path: 'addons/addon-canvas/out-esbuild-test/playwright.config.js' },
   { name: 'addon-clipboard',         path: 'addons/addon-clipboard/out-esbuild-test/playwright.config.js' },
   { name: 'addon-fit',               path: 'addons/addon-fit/out-esbuild-test/playwright.config.js' },
-  // TODO: Move onto esbuild sources
-  { name: 'addon-image',             path: 'addons/addon-image/out-test/playwright.config.js' },
+  { name: 'addon-image',             path: 'addons/addon-image/out-esbuild-test/playwright.config.js' },
   { name: 'addon-search',            path: 'addons/addon-search/out-esbuild-test/playwright.config.js' },
   { name: 'addon-serialize',         path: 'addons/addon-serialize/out-esbuild-test/playwright.config.js' },
   { name: 'addon-unicode-graphemes', path: 'addons/addon-unicode-graphemes/out-esbuild-test/playwright.config.js' },