--- a/kerneltest/f32test/group/wintest.bat	Mon May 24 18:45:46 2010 +0100
+++ b/kerneltest/f32test/group/wintest.bat	Thu Jun 10 11:48:01 2010 +0100
@@ -28,6 +28,9 @@
 call :GetParentDirPath F32TEST_PATH
 echo F32TEST_PATH = %F32TEST_PATH%
 set EPOC32_DIR=%EPOCROOT%EPOC32\
+set F32TEST_BUILD_PATH=%EPOC32_DIR%BUILD%F32TEST_PATH%GROUP\
+if exist %EPOC32_DIR%data\z\test\f32test set F32TEST_BUILD_PATH=%EPOC32_DIR%data\z\test\f32test\
+echo F32TEST_BUILD_PATH = %F32TEST_BUILD_PATH%
 echo EPOC32_DIR = %EPOC32_DIR%
 set EMUL_MEDIA_PATH=%EPOC32_DIR%DATA\MEDIA\
 echo EMUL_MEDIA_PATH = %EMUL_MEDIA_PATH%
@@ -100,7 +103,7 @@
 copy %F32TEST_PATH%\SERVER\T_FILE.CPP %EMUL_Z%\TEST\T_FILE.CPP
 copy %F32TEST_PATH%\SERVER\T_FSRV.CPP %EMUL_Z%\TEST\T_FSRV.CPP
 copy %F32TEST_PATH%\SERVER\T_RDSECT.TXT %EMUL_Z%\TEST\T_RDSECT.TXT
-copy %EPOC32_DIR%BUILD%F32TEST_PATH%\GROUP\%1.AUTO.BAT %EMUL_Z%\TEST\%1.AUTO.BAT
+copy %F32TEST_BUILD_PATH%\%1.AUTO.BAT %EMUL_Z%\TEST\%1.AUTO.BAT
 copy %REL_DIR%\T_CHKUID.EXE %EMUL_Z%\TEST\T_CHKUID.EXE
 
 REM Use both Sys and System directories until the switch has been made