We will work on the computer ____.

until he will come back
by the time he came back
until he comes back
when he will come back
Elementary Grammar Exercises A1
Advanced Grammar Exercises
English Modals Tests
Upper-Intermediate Grammar Exercises