In 1865, Okita became the captain of the first unit of the Shinsengumi and also served as a kenjutsu instructor; later that year, he was appointed by Kondo Isami to be the fifth master of the Tennen Rishin-ryu after him.