The cyclin-dependent kinase (CDK)-activating kinase CAK has been proposed to function in the control of cell cycle progression, DNA repair and RNA polymerase II (pol II) transcription. Most CAK exists as complexes of three subunits: CDK7, cyclin H (CycH) and MAT1. This tripartite CAK occurs in a free form and in association with 'core' TFIIH, which functions in both pol II transcription and DNA repair. We investigated the substrate specificities of different forms of CAK. Addition of the MAT1 subunit to recombinant bipartite CDK7-CycH switched its substrate preference to favour the pol II large subunit C-terminal domain (CTD) over CDK2. We suggest that the MAT1 protein, previously shown to function as an assembly factor for CDK7-CycH, also acts to modulate CAK substrate specificity. The substrate specificities of natural TFIIH and free CAK were also compared. TFIIH had a strong preference for the CTD over CDK2 relative to free CAK. TFIIH, but not free CAK, could efficiently hyperphosphorylate the CTD. In the context of TFIIH, the kinase also acquired specificity for the general transcription factors TFIIE and TFIIF which were not recognized by free CAK. We conclude that the substrate preference of the CDK7-CycH kinase is governed by association with both MAT1 and 'core' TFIIH.