The mitochondrial contact site and cristae organizing system (MICOS) and Optic atrophy 1 (OPA1) control cristae shape, thus affecting mitochondrial function and apoptosis. Whether and how they physically and functionally interact is unclear. Here, we provide evidence that OPA1 is epistatic to MICOS in the regulation of cristae shape. Proteomic analysis identifies multiple MICOS components in native OPA1-containing high molecular weight complexes disrupted during cristae remodeling. MIC60, a core MICOS protein, physically interacts with OPA1, and together, they control cristae junction number and stability, OPA1 being epistatic to MIC60. OPA1 defines cristae width and junction diameter independently of MIC60. Our combination of proteomics, biochemistry, genetics, and electron tomography provides a unifying model for mammalian cristae biogenesis by OPA1 and MICOS.