Can I fly into Shanghai for 3 day stay from USA continuing to Tokyo

but use one of the days in Shanghai to take the over night train up to Beijing and back to Shanghai that same night without violating the terms of the visa free stay? I am coming to Shanghai to go to Shanghai Disneyland and would like to go up to Beijing to see the great wall and some other sights just for the day.