This disclosure describes techniques for intra-prediction mode signaling for video coding. In one example a video coder is configured to determine for a block of video data a set of most probable intra-prediction modes such that the set of most probable intra-prediction modes has a size that is equal to a predetermined number that is greater than or equal to two. The video coder is also configured to code a value representative of an actual intra-prediction mode for the block based at least in part on the set of most probable intra-prediction modes and code the block using the actual intra-prediction mode. The video coder may further 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.