Visual Studio 2017 xunit test working directory

When I run my xunit tests from VS 2017 the working directory is different than it was in VS 2015 and what's even more ugly - it's different for just executing a test and debugging one.

In execute mode its like UnitTestProject\bin\debug\netcoreapp1.1

In debug - C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\

When I run dotnet test from within my project folder it's just UnitTestProject

I prefer the latter and that's actually how it was in VS 2015 - it was always project directory in all three cases.

So the question is how to make VS 2017 (and dotnet test unless there's a new way now) to use the same working dir.