diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc
index d0c3c0992..ea5648a2a 100644
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
@@ -151,7 +151,7 @@ consonant_position (hb_codepoint_t u, hb_ot_map_t *map, hb_font_t *font)
 				)
 #define MATRA_POS_TOP(u)	( /* BENG and MLYM don't have top matras. */ \
 				  IS_DEVA(u) ? POS_AFTER_SUB  : \
-				  IS_GURM(u) ? POS_AFTER_SUB  : \
+				  IS_GURM(u) ? POS_AFTER_POST  : /* Deviate from spec */ \
 				  IS_GUJA(u) ? POS_AFTER_SUB  : \
 				  IS_ORYA(u) ? POS_AFTER_MAIN : \
 				  IS_TAML(u) ? POS_AFTER_SUB  : \
diff --git a/test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/misc/misc.txt b/test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/misc/misc.txt
index bbc664690..27a39f65c 100644
--- a/test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/misc/misc.txt
+++ b/test/shaping/texts/in-tree/shaper-indic/indic/script-gurmukhi/misc/misc.txt
@@ -1 +1,2 @@
 ਕ੍ਹ
+ਤ੍ਯੋ