diff --git a/common/test/keyboards/baseline/README.md b/common/test/keyboards/baseline/README.md
index 7894490d9b..090fdcbd5b 100644
--- a/common/test/keyboards/baseline/README.md
+++ b/common/test/keyboards/baseline/README.md
@@ -26,3 +26,21 @@ The keyboards can be built with:
 
 This builds the keyboards with debug information and no compiler version
 embedded.
+
+## Grouping of the test fixtures
+
+Fixtures that test similar functionality are roughly grouped together.
+There is some overlap between different groups, so this was done
+mainly by test name.
+
+| Name     | Test group                               |
+|----------|------------------------------------------|
+| k_00xx_* | Tests that didn't fit in any other group |
+| k_01xx_* | Basic rules                              |
+| k_02xx_* | RALT                                     |
+| k_03xx_* | deadkeys                                 |
+| k_04xx_* | Using multiple groups                    |
+| k_05xx_* | Options                                  |
+| k_06xx_* | System stores                            |
+| k_07xx_* | Caps related tests                       |
+| k_08xx_* | Context related                          |
diff --git a/core/tests/unit/kmx/meson.build b/core/tests/unit/kmx/meson.build
index a3af0a741e..8193fe5046 100644
--- a/core/tests/unit/kmx/meson.build
+++ b/core/tests/unit/kmx/meson.build
@@ -86,7 +86,7 @@ tests = [
   'k_0810___nul_and_index',
   'k_0811___if_and_index',
   'k_0812___nul_and_contextex',
-  # Skipped: 'k_0813___deadkey_cancelled_by_arrow',
+  # TODO-web-core: Skipped: 'k_0813___deadkey_cancelled_by_arrow',
 ]
 
 
diff --git a/web/src/test/auto/e2e/baseline/baseline.tests.ts b/web/src/test/auto/e2e/baseline/baseline.tests.ts
index 38e45bb8b1..630330d156 100644
--- a/web/src/test/auto/e2e/baseline/baseline.tests.ts
+++ b/web/src/test/auto/e2e/baseline/baseline.tests.ts
@@ -63,12 +63,8 @@ const testsToFix = {
   // TODO: fix these tests (#15342)
   '.js': [
     'k_0000___null_keyboard.kmn',
-    // 'k_0103___vkey_input__shift_ctrl_.kmn',
     'k_0104___vkey_input__ctrl_alt_.kmn',
-    // 'k_0105___vkey_input__ctrl_alt_2_.kmn',
-    // 'k_0200___ralt.kmn',
     'k_0203___generic_ctrlalt.kmn',
-    // 'k_0400___groups_and_virtual_keys.kmn',
     'k_0501___options_with_preset.kmn',
     'k_0503___options_with_save_and_preset.kmn',
     'k_0504___options_with_reset.kmn',