Tip-clearance cavitation is one of the most aggressive and widespread forms of cavitation in hydraulic machinery that occurs due to liquid leaking through narrow gaps between tips or end faces of blades/vanes and a stator wall. The research is aimed at the study of a passive control of tip-leakage flow and tip-clearance cavitation by modifying the gap geometry. The test object was a NACA0022-34 hydrofoil with a 100 mm chord that was equipped with a double-sided axis of rotation. The gap geometry was changed by mounting side plates with different end surfaces (flat and grooved) to the hydrofoil end face. We used high-speed imaging to analyze the temporal and spatial cavity evolution simultaneously on the foil suction side and inside the clearance using three cameras. The implemented control method was shown to allow an effective management of the tip-leakage flow and tip-clearance cavitation, especially at higher angles of attack. The modified end plate makes the tip-leakage flow less prone to cavitation as compared to the original one, i.e. the tip-clearance cavitation inception and development appear to be hampered.