To accelerate the electrification of road transport, numerous countries are promoting the diffusion of both Battery Electric Vehicles (BEVs) and Fuel-Cell Vehicles (FCVs). Both technologies hold unique advantages and disadvantages while also facing common barriers with regard to production and diffusion. Barriers may be classified into four categories: 1) supply-side (i.e. vehicle production), 2) infrastructure preparation (i.e. charging and fuelling), 3) demand-side (i.e. spurring societal demand) and 4) institutional design (i.e. stimulating investments and the availability of technology). Relative to BEV literature, studies on FCV diffusion efforts are fewer. Also, while many studies highlight numerous diffusion barriers, knowledge on actual governance strategies to overcome these is lacking. Filling this gap, we examine governance measures used by government and industry in Japan to accelerate the development and diffusion of FCVs. The above framework is applied to examine coping strategies employed, unresolved challenges and potential ways to overcome these. Data are sourced from expert interviews and document analysis. Findings reveal robust measures to tackle supply-side and infrastructure challenges. Conversely, demand-side measures rely on public subsidies and lack regulatory instruments to stimulate vehicle demand. Also, institutional strategies to increase the pool of FCV makers are lacking visible outcomes. We thus lay out several policy suggestions to overcome these unresolved challenges.