diff --git a/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmn b/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmn
index 3416755a07..e462491840 100644
--- a/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmn	
+++ b/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmn	
@@ -1,6 +1,6 @@
 c Description: Tests a simple deadkey rule in Unicode
-c keys: [SHIFT K_6][K_A][SHIFT K_6][K_SHIFT][K_A][SHIFT K_6][RALT K_B][K_A][SHIFT K_6][K_CAPS][K_A]
-c expected: pass.pass.pass.pass.
+c keys: [SHIFT K_6][K_A]
+c expected: \u00E2
 c context:
 
 store(&VERSION) '9.0'
@@ -11,4 +11,4 @@ group(main) using keys
 
 + '^' > deadkey(1)
 
-dk(1) + [K_A] > 'pass.'
+dk(1) + 'a' >  U+00E2
diff --git a/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmx b/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmx
index 738f057e09..68d8f4a313 100644
Binary files a/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmx and b/common/core/desktop/tests/unit/kmx/013 - deadkeys.kmx differ
diff --git a/common/core/desktop/tests/unit/kmx/031 - caps lock.kmn b/common/core/desktop/tests/unit/kmx/031 - caps lock.kmn
index b2b6151386..8a3f3468b1 100644
--- a/common/core/desktop/tests/unit/kmx/031 - caps lock.kmn	
+++ b/common/core/desktop/tests/unit/kmx/031 - caps lock.kmn	
@@ -1,6 +1,6 @@
 c Description: Tests Caps Lock
-c keys: [K_1][SHIFT K_2][SHIFT K_3][K_A][SHIFT K_B][K_C][K_CAPS][K_D]
-c expected: pass.pass.pass.pass.pass.pass.pass.
+c keys: [K_1][SHIFT K_2][SHIFT K_3][K_A][SHIFT K_B]
+c expected: pass.pass.pass.pass.pass.
 c capsLock: 1
 c context:
 
@@ -24,11 +24,3 @@ group(Main) using keys
 
 + 'b' > 'pass.'
 + 'B' > 'fail.'
-
-c Caps is on. The virtual key should match.
-+ [SHIFT K_C] > 'fail.'
-+ [K_C] > 'pass.'
-
-c Caps was pressed and released, so Caps is now off.  The virtual key should still match.
-+ [SHIFT K_D] > 'fail.'
-+ [K_D] > 'pass.'
diff --git a/common/core/desktop/tests/unit/kmx/031 - caps lock.kmx b/common/core/desktop/tests/unit/kmx/031 - caps lock.kmx
index 27533f5a2a..e317f13349 100644
Binary files a/common/core/desktop/tests/unit/kmx/031 - caps lock.kmx and b/common/core/desktop/tests/unit/kmx/031 - caps lock.kmx differ
diff --git a/common/core/desktop/tests/unit/kmx/048 - modifier keys keep context.kmn b/common/core/desktop/tests/unit/kmx/048 - modifier keys keep context.kmn
new file mode 100644
index 0000000000..629b9b2422
--- /dev/null
+++ b/common/core/desktop/tests/unit/kmx/048 - modifier keys keep context.kmn	
@@ -0,0 +1,14 @@
+c Description: Tests that modifier keys don't reset context (#5591)
+c keys: [K_A][K_SHIFT][K_B][K_A][K_ALT][K_B][K_A][K_CAPS][K_B]
+c expected: pass.pass.pass.
+c context:
+
+store(&VERSION) '9.0'
+
+begin unicode > use(main)
+
+group(main) using keys
+
++ [K_A] > 'a'
+
+'a' + [K_B] > 'pass.'
diff --git a/common/core/desktop/tests/unit/kmx/048 - modifier keys keep context.kmx b/common/core/desktop/tests/unit/kmx/048 - modifier keys keep context.kmx
new file mode 100644
index 0000000000..52c70f61e0
Binary files /dev/null and b/common/core/desktop/tests/unit/kmx/048 - modifier keys keep context.kmx differ
diff --git a/common/core/desktop/tests/unit/kmx/meson.build b/common/core/desktop/tests/unit/kmx/meson.build
index 783a936f92..28b53051bd 100644
--- a/common/core/desktop/tests/unit/kmx/meson.build
+++ b/common/core/desktop/tests/unit/kmx/meson.build
@@ -69,7 +69,8 @@ tests = [
   '044 - if and context',
   '045 - deadkey and context',
   '046 - deadkey and contextex',
-  '047 - caps always off initially on'
+  '047 - caps always off initially on',
+  '048 - modifier keys keep context'
 ]
 
 if build_machine.system() == 'windows'