diff --git a/include/mbedtls/asn1.h b/include/mbedtls/asn1.h
index 8d35c4245..75b7b3dfb 100644
--- a/include/mbedtls/asn1.h
+++ b/include/mbedtls/asn1.h
@@ -99,9 +99,9 @@
  *     | Class | P/C | Tag number |
  *     +-------+-----+------------+
  */
-#define MBEDTLS_ASN1_TAG_CLASS_MASK          ( 0x03 << 6 )
-#define MBEDTLS_ASN1_TAG_PC_MASK             ( 0x01 << 5 )
-#define MBEDTLS_ASN1_TAG_VALUE_MASK          ( 0x1F << 0 )
+#define MBEDTLS_ASN1_TAG_CLASS_MASK          0xC0
+#define MBEDTLS_ASN1_TAG_PC_MASK             0x20
+#define MBEDTLS_ASN1_TAG_VALUE_MASK          0x1F
 
 /* \} name */
 /* \} addtogroup asn1_module */