diff --git a/release.nix b/release.nix
index ff87baf5..d6dfbb60 100644
--- a/release.nix
+++ b/release.nix
@@ -96,6 +96,7 @@ let
     tests.nixpkgs-overlays = makeTest ./tests/nixpkgs-overlays.nix;
     tests.services-activate-system = makeTest ./tests/services-activate-system.nix;
     tests.system-defaults-write = makeTest ./tests/system-defaults-write.nix;
+    tests.system-keyboard-mapping = makeTest ./tests/system-keyboard-mapping.nix;
     tests.system-packages = makeTest ./tests/system-packages.nix;
     tests.system-path-bash = makeTest ./tests/system-path-bash.nix;
     tests.system-path-fish = makeTest ./tests/system-path-fish.nix;
diff --git a/tests/system-keyboard-mapping.nix b/tests/system-keyboard-mapping.nix
new file mode 100644
index 00000000..0440161d
--- /dev/null
+++ b/tests/system-keyboard-mapping.nix
@@ -0,0 +1,16 @@
+{ config, pkgs, ... }:
+
+{
+  system.keyboard.enableKeyMapping = true;
+  system.keyboard.remapCapsLockToControl = true;
+  system.keyboard.remapCapsLockToEscape = true;
+
+  test = ''
+    echo checking keyboard mappings in /activate >&2
+    grep "hidutil property --set '{\"UserKeyMapping\":.*}'" ${config.out}/activate
+    grep "\"HIDKeyboardModifierMappingSrc\":30064771129" ${config.out}/activate
+    grep "\"HIDKeyboardModifierMappingDst\":30064771296" ${config.out}/activate
+    grep "\"HIDKeyboardModifierMappingDst\":30064771113" ${config.out}/activate
+  '';
+}
+