A method for coding a current block using an intra-prediction mode includes defining a mapping from available intra-prediction modes to intra-prediction classes; determining, using the mapping, a first intra-prediction class of a first intra-prediction mode used for decoding a first neighboring block of the current block; determining, using the mapping, a second intra-prediction class of a second intra-prediction mode used for decoding a second neighboring block of the current block; using the first intra-prediction class and the second intra-prediction class as indices into a list of available context models to select a context model for coding the intra-prediction mode; and coding the intra-prediction mode using the context model. A first number of the intra-prediction classes is smaller than a second number of the available intra-prediction modes. each class is an ordinal value, and each available intra-prediction mode uniquely maps to one class of the intra-prediction classes.