diff --git a/core/tests/unit/ldml/keyboards/k_000_minimal_keyboard.xml b/core/tests/unit/ldml/keyboards/k_000_minimal_keyboard.xml
new file mode 100644
index 00000000000..44c043f8914
--- /dev/null
+++ b/core/tests/unit/ldml/keyboards/k_000_minimal_keyboard.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+Keys that don't show up in a row don't generate an output
+
+@@keys: [K_Q][K_W]
+@@expected: q
+
+-->
+<keyboard3 xmlns="https://schemas.unicode.org/cldr/45/keyboard3" locale="en" conformsTo="45">
+  <info author="eb" layout="qwerty" name="k_000_minimal_keyboard" />
+
+  <keys>
+    <!-- no keys listed, keys-Latn-implied.xml will be implicitly imported -->
+  </keys>
+
+  <layers formId="us">
+    <layer id="base">
+      <row keys="1" />
+      <row keys="q" />
+    </layer>
+  </layers>
+</keyboard3>
diff --git a/core/tests/unit/ldml/keyboards/k_000_null_keyboard.xml b/core/tests/unit/ldml/keyboards/k_000_null_keyboard.xml
deleted file mode 100644
index 73dfce5dd93..00000000000
--- a/core/tests/unit/ldml/keyboards/k_000_null_keyboard.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<!-- TODO: this is not yet a valid keyboard file
-
-  Note that the corresponding .kmx is currently
-  hand-crafted and semi-valid.
-
-@@keys: [K_A][K_B][K_C]
-@@expect:
-
--->
-<keyboard3 />
diff --git a/core/tests/unit/ldml/keyboards/meson.build b/core/tests/unit/ldml/keyboards/meson.build
index 55004f78b87..29aa37541b9 100644
--- a/core/tests/unit/ldml/keyboards/meson.build
+++ b/core/tests/unit/ldml/keyboards/meson.build
@@ -17,8 +17,7 @@ tests_from_cldr = [
 
 # these have 'embedded' (@@) testdata instead of a separate file
 tests_without_testdata = [
-# disabling 000 until we have updates to core or to the keyboard so that it passes
-#  'k_000_null_keyboard',
+  'k_000_minimal_keyboard',
   'k_002_tinyu32',
   'k_003_transform',
   'k_004_tinyshift',