This disclosure describes techniques for intra-prediction mode signaling for video coding. In one example, the video coder is configured to determine the most likely set of intra-prediction modes for a block of video data such that the set of most likely intra prediction modes has a size equal to a predetermined number that is two or more. The video coder is further configured to code a value that indicates 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, eg, to encode or decode the block. Video encoders and video decoders may implement these techniques.