It is interesting that in Finnish university there was actually possibility to enter a track aiming at PhD from the start. With more rigorous math and other things. So you could work towards just Master's Degree or PhD from start. With different course load.