diff --git a/bin/run_unittests.bat b/bin/run_unittests.bat
index 85f8f75..5e443dc 100644
--- a/bin/run_unittests.bat
+++ b/bin/run_unittests.bat
@@ -15,7 +15,13 @@ if %ERRORLEVEL% NEQ 0 (
 echo Gefundene Testdateien:
 for /f "delims=" %%f in ('dir /b "%PROJECT_LIB%\Elemente\*_tests.py" 2^>nul') do echo   %%f
 echo.
-"%VIRTUAL_ENV%\Scripts\python.exe" -m unittest discover -t %PROJECT_LIB% -s %PROJECT_LIB%\Elemente -p "*_tests.py" -v
+cd /d "%PROJECT%"
+if errorlevel 1 (
+    echo ERROR: Failed to change to project directory: %PROJECT%
+    CALL manage_interpreter.bat deactivate
+    exit /b 1
+)
+"%VIRTUAL_ENV%\Scripts\python.exe" -m unittest discover -t "%PROJECT%" -s lib\Elemente -p "*_tests.py" -v
 if %ERRORLEVEL% NEQ 0 (
     echo.
     echo Tests failed!