diff --git a/entries-api/idlharness-manual.html b/entries-api/idlharness-manual.html
deleted file mode 100644
index 72bdf67dfa678b..00000000000000
--- a/entries-api/idlharness-manual.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>Entries API: IDL Tests</title>
-<link rel=help href="https://wicg.github.io/entries-api/#idl-index">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/WebIDLParser.js"></script>
-<script src="/resources/idlharness.js"></script>
-<script src="support.js"></script>
-<script>
-'use strict';
-
-entry_test((t, entry, item) => {
-  assert_true(entry.isDirectory);
-  Promise.all([
-    getEntriesAsPromise(entry),
-    fetch('/interfaces/entries-api.idl').then(r => r.text())
-  ]).then(t.step_func(([entries, idls]) => {
-    window.samples = {
-      item: item,
-      dirEntry: entries.filter(entry => entry.isDirectory)[0],
-      fileEntry: entries.filter(entry => entry.isFile)[0],
-      fileSystem: entry.filesystem,
-    };
-
-    const idl_array = new IdlArray();
-
-    // https://w3c.github.io/FileAPI/#dfn-file
-    idl_array.add_untested_idls('[Exposed=(Window,Worker)] interface File {};');
-
-    // https://html.spec.whatwg.org/multipage/forms.html#htmlinputelement
-    idl_array.add_untested_idls('interface HTMLInputElement {};');
-
-    // https://html.spec.whatwg.org/multipage/interaction.html#datatransferitem
-    idl_array.add_untested_idls('interface DataTransferItem {};');
-
-    idl_array.add_idls(idls);
-
-    idl_array.add_objects({
-      File: ['new File([], "example.txt")'],
-      HTMLInputElement: ['document.createElement("input")'],
-      DataTransferItem: ['samples.item'],
-      FileSystemEntry: [],
-      FileSystemDirectoryEntry: ['samples.dirEntry'],
-      FileSystemDirectoryReader: ['samples.dirEntry.createReader()'],
-      FileSystemFileEntry: ['samples.fileEntry'],
-      FileSystem: ['samples.fileSystem'],
-    });
-
-    idl_array.test();
-    t.done();
-  }));
-}, 'Entries API: IDL');
-</script>
diff --git a/entries-api/idlharness-manual.window.js b/entries-api/idlharness-manual.window.js
new file mode 100644
index 00000000000000..9f2731bf1d0257
--- /dev/null
+++ b/entries-api/idlharness-manual.window.js
@@ -0,0 +1,46 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+// META: script=support.js
+
+'use strict';
+
+let resolve;
+let globalItem;
+let globalEntry;
+
+let entriesPromise = new Promise(r => {
+  resolve = r;
+});
+
+entry_test((t, entry, item) => {
+  assert_true(entry.isDirectory);
+  resolve(getEntriesAsPromise(entry));
+  globalItem = item;
+  globalEntry = entry;
+  t.done();
+});
+
+idl_test(
+  ['entries-api'],
+  ['FileAPI', 'html', 'dom'],
+  async idl_array => {
+    const entries = await entriesPromise;
+    window.samples = {
+      item: globalItem,
+      dirEntry: entries.filter(entry => entry.isDirectory)[0],
+      fileEntry: entries.filter(entry => entry.isFile)[0],
+      fileSystem: globalEntry.filesystem,
+    };
+
+    idl_array.add_objects({
+      File: ['new File([], "example.txt")'],
+      HTMLInputElement: ['document.createElement("input")'],
+      DataTransferItem: ['samples.item'],
+      FileSystemEntry: [],
+      FileSystemDirectoryEntry: ['samples.dirEntry'],
+      FileSystemDirectoryReader: ['samples.dirEntry.createReader()'],
+      FileSystemFileEntry: ['samples.fileEntry'],
+      FileSystem: ['samples.fileSystem'],
+    });
+  }
+);
diff --git a/entries-api/idlharness.html b/entries-api/idlharness.html
deleted file mode 100644
index 091549eb2dcb57..00000000000000
--- a/entries-api/idlharness.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>Entries API: IDL Tests</title>
-<link rel=help href="https://wicg.github.io/entries-api/#idl-index">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/WebIDLParser.js"></script>
-<script src="/resources/idlharness.js"></script>
-<script>
-'use strict';
-
-promise_test(t => {
-  return fetch('/interfaces/entries-api.idl')
-    .then(r => r.text())
-    .then(idls => {
-
-      const idl_array = new IdlArray();
-
-      // https://w3c.github.io/FileAPI/#dfn-file
-      idl_array.add_untested_idls('[Exposed=(Window,Worker)] interface File {};');
-
-      // https://html.spec.whatwg.org/multipage/forms.html#htmlinputelement
-      idl_array.add_untested_idls('interface HTMLInputElement {};');
-
-      // https://html.spec.whatwg.org/multipage/interaction.html#datatransferitem
-      idl_array.add_untested_idls('interface DataTransferItem {};');
-
-      idl_array.add_idls(idls);
-
-      idl_array.add_objects({
-        File: ['new File([], "example.txt")'],
-        HTMLInputElement: ['document.createElement("input")'],
-      });
-
-      idl_array.test();
-    });
-
-}, 'Entries API: IDL');
-</script>
diff --git a/entries-api/idlharness.window.js b/entries-api/idlharness.window.js
new file mode 100644
index 00000000000000..32527be514ad92
--- /dev/null
+++ b/entries-api/idlharness.window.js
@@ -0,0 +1,15 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+'use strict';
+
+idl_test(
+  ['entries-api'],
+  ['FileAPI', 'html', 'dom'],
+  idl_array => {
+    idl_array.add_objects({
+      File: ['new File([], "example.txt")'],
+      HTMLInputElement: ['document.createElement("input")'],
+    });
+  }
+);
