Better teasing on Java8

on a kind advice from @hlassiege