diff --git a/core/tests/javascript/media.html b/core/tests/javascript/media.html
new file mode 100644
index 00000000..449fee1e
--- /dev/null
+++ b/core/tests/javascript/media.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Pyodide Media Module Test</title>
+  <link rel="stylesheet" href="../../dist/core.css">
+  <script type="module" src="../../dist/core.js"></script>
+</head>
+<body>
+<h1>Pyodide Media Module Test</h1>
+<div id="test-results">Running tests...</div>
+
+<script type="py" terminal>
+  from pyscript import window, document
+  from pyscript import media
+
+  async def run_tests():
+      # Test basic module structure
+      assert hasattr(media, "Device"), "media module should have Device class"
+      assert hasattr(media, "list_devices"), "media module should have list_devices function"
+
+      # Test device enumeration
+      devices = await media.list_devices()
+      assert isinstance(devices, list), "list_devices should return a list"
+
+      # If we have devices, test properties of one
+      if devices:
+          device = devices[0]
+          assert hasattr(device, "id"), "Device should have id property"
+          assert hasattr(device, "group"), "Device should have group property"
+          assert hasattr(device, "kind"), "Device should have kind property"
+          assert hasattr(device, "label"), "Device should have label property"
+
+      document.getElementById('test-results').innerText = "Success!"
+      document.documentElement.classList.add('media-ok')
+
+  await run_tests()
+</script>
+</body>
+</html>
diff --git a/core/tests/js_tests.spec.js b/core/tests/js_tests.spec.js
index c389d896..b891b409 100644
--- a/core/tests/js_tests.spec.js
+++ b/core/tests/js_tests.spec.js
@@ -171,3 +171,24 @@ test('MicroPython buffered NO error', async ({ page }) => {
   const body = await page.evaluate(() => document.body.textContent.trim());
   await expect(body).toBe('');
 });
+
+test('Pyodide media module', async ({ page }) => {
+  await page.context().grantPermissions(['camera', 'microphone']);
+  await page.context().addInitScript(() => {
+    const originalEnumerateDevices = navigator.mediaDevices.enumerateDevices;
+    navigator.mediaDevices.enumerateDevices = async function() {
+      const realDevices = await originalEnumerateDevices.call(this);
+      if (!realDevices || realDevices.length === 0) {
+        return [
+          { deviceId: 'camera1', groupId: 'group1', kind: 'videoinput', label: 'Simulated Camera' },
+          { deviceId: 'mic1', groupId: 'group2', kind: 'audioinput', label: 'Simulated Microphone' }
+        ];
+      }
+      return realDevices;
+    };
+  });
+  await page.goto('http://localhost:8080/tests/javascript/media.html');
+  await page.waitForSelector('html.media-ok', { timeout: 10000 });
+  const isSuccess = await page.evaluate(() => document.documentElement.classList.contains('media-ok'));
+  expect(isSuccess).toBe(true);
+});
