The present disclosure describes techniques for intra-prediction mode signaling for video coding. In one example, the video coder is configured to determine a set of most probable intra-prediction modes for a block of video data such that the set of most likely intra prediction modes has the same size as a predetermined number of two or more. The video coder is also configured to code a value indicative of the actual intra-prediction mode for the block based at least in part on the set of most probable intra prediction modes and to code the block using the actual intra-prediction mode. The video coder may also be configured to code the block using the actual intra-prediction mode, e.g., to encode or decode the block. Video encoders and video decoders may implement these techniques.