diff --git a/addons/addon-ligatures/.gitignore b/addons/addon-ligatures/.gitignore
index f172c3a1..7b48eed8 100644
--- a/addons/addon-ligatures/.gitignore
+++ b/addons/addon-ligatures/.gitignore
@@ -3,7 +3,6 @@ node_modules/
 coverage/
 
 lib/
-fonts/
 
 .env
 .vscode/
diff --git a/addons/addon-ligatures/fonts/FiraCode-Regular.otf b/addons/addon-ligatures/fonts/FiraCode-Regular.otf
new file mode 100644
index 00000000..e7a9fda6
Binary files /dev/null and b/addons/addon-ligatures/fonts/FiraCode-Regular.otf differ
diff --git a/addons/addon-ligatures/fonts/Monoid-Regular.ttf b/addons/addon-ligatures/fonts/Monoid-Regular.ttf
new file mode 100644
index 00000000..a09e9faf
Binary files /dev/null and b/addons/addon-ligatures/fonts/Monoid-Regular.ttf differ
diff --git a/addons/addon-ligatures/fonts/UbuntuMono-Regular.ttf b/addons/addon-ligatures/fonts/UbuntuMono-Regular.ttf
new file mode 100644
index 00000000..fdd309d7
Binary files /dev/null and b/addons/addon-ligatures/fonts/UbuntuMono-Regular.ttf differ
diff --git a/addons/addon-ligatures/fonts/iosevka-regular.ttf b/addons/addon-ligatures/fonts/iosevka-regular.ttf
new file mode 100644
index 00000000..963cbe2a
Binary files /dev/null and b/addons/addon-ligatures/fonts/iosevka-regular.ttf differ
diff --git a/addons/addon-ligatures/test/index.test.ts b/addons/addon-ligatures/src/fontLigatures/index.test.ts
similarity index 96%
rename from addons/addon-ligatures/test/index.test.ts
rename to addons/addon-ligatures/src/fontLigatures/index.test.ts
index ecef7661..d8af5dfa 100644
--- a/addons/addon-ligatures/test/index.test.ts
+++ b/addons/addon-ligatures/src/fontLigatures/index.test.ts
@@ -6,9 +6,7 @@
 import * as path from 'path';
 import * as fs from 'fs';
 import { assert } from 'chai';
-
-const fontLigatures = require('../out-esbuild/fontLigatures/index');
-const loadBuffer: (buffer: ArrayBuffer, options?: { cacheSize?: number }) => Font = fontLigatures.loadBuffer;
+import { loadBuffer } from './index';
 
 interface Font {
   findLigatures(text: string): { outputGlyphs: number[]; contextRanges: [number, number][] };
@@ -263,10 +261,10 @@ const ubuntuCases: TestCase[] = [
 ];
 
 const fontPaths: Record<string, string> = {
-  'Fira Code': path.join(__dirname, '../fonts/FiraCode-Regular.otf'),
-  'Iosevka': path.join(__dirname, '../fonts/iosevka-regular.ttf'),
-  'Monoid': path.join(__dirname, '../fonts/Monoid-Regular.ttf'),
-  'Ubuntu Mono': path.join(__dirname, '../fonts/UbuntuMono-Regular.ttf')
+  'Fira Code': path.join(__dirname, '../../fonts/FiraCode-Regular.otf'),
+  'Iosevka': path.join(__dirname, '../../fonts/iosevka-regular.ttf'),
+  'Monoid': path.join(__dirname, '../../fonts/Monoid-Regular.ttf'),
+  'Ubuntu Mono': path.join(__dirname, '../../fonts/UbuntuMono-Regular.ttf')
 };
 
 const fontCache: Map<string, Font> = new Map();
diff --git a/addons/addon-ligatures/test/merge.test.ts b/addons/addon-ligatures/src/fontLigatures/merge.test.ts
similarity index 98%
rename from addons/addon-ligatures/test/merge.test.ts
rename to addons/addon-ligatures/src/fontLigatures/merge.test.ts
index 0dc157f2..e56c8dae 100644
--- a/addons/addon-ligatures/test/merge.test.ts
+++ b/addons/addon-ligatures/src/fontLigatures/merge.test.ts
@@ -4,8 +4,7 @@
  */
 
 import { assert } from 'chai';
-
-const mergeTrees = require('../out-esbuild/fontLigatures/merge').default;
+import mergeTrees from './merge';
 
 interface LookupResult {
   contextRange: [number, number];
diff --git a/addons/addon-ligatures/test/mergeRange.test.ts b/addons/addon-ligatures/src/fontLigatures/mergeRange.test.ts
similarity index 94%
rename from addons/addon-ligatures/test/mergeRange.test.ts
rename to addons/addon-ligatures/src/fontLigatures/mergeRange.test.ts
index 91642e8d..790ea666 100644
--- a/addons/addon-ligatures/test/mergeRange.test.ts
+++ b/addons/addon-ligatures/src/fontLigatures/mergeRange.test.ts
@@ -4,8 +4,7 @@
  */
 
 import { assert } from 'chai';
-
-const mergeRange = require('../out-esbuild/fontLigatures/mergeRange').default;
+import mergeRange from './mergeRange';
 
 describe('addon-ligatures - mergeRange', () => {
   it('inserts a new range before the existing ones', () => {
diff --git a/addons/addon-ligatures/test/parse.test.ts b/addons/addon-ligatures/src/parse.test.ts
similarity index 97%
rename from addons/addon-ligatures/test/parse.test.ts
rename to addons/addon-ligatures/src/parse.test.ts
index de846f4a..d2150e9d 100644
--- a/addons/addon-ligatures/test/parse.test.ts
+++ b/addons/addon-ligatures/src/parse.test.ts
@@ -4,8 +4,7 @@
  */
 
 import { assert } from 'chai';
-
-const parse = require('../out-esbuild/parse').default;
+import parse from './parse';
 
 // TODO: integrate tests from http://test.csswg.org/suites/css-fonts-4_dev/nightly-unstable/
 describe('addon-ligatures - parse', () => {
diff --git a/addons/addon-ligatures/src/tsconfig.json b/addons/addon-ligatures/src/tsconfig.json
index cc9a9bef..f54111a3 100644
--- a/addons/addon-ligatures/src/tsconfig.json
+++ b/addons/addon-ligatures/src/tsconfig.json
@@ -9,7 +9,9 @@
     "noUnusedLocals": true,
     "preserveWatchOutput": true,
     "types": [
-      "../../../node_modules/@types/mocha"
+      "../../../node_modules/@types/mocha",
+      // HACK: src shouldn't use node types but it's needed for index.test.ts
+      "../../../node_modules/@types/node"
     ],
     "paths": {
       "@xterm/addon-ligatures" : [