Nafi' reported Ibn 'Umar as saying
He who observed the night prayer should make Witr the end of his prayer before dawn. The Messenger of Allah (ﷺ) used to order them thus.