--- a/kerneltest/f32test/server/t_file.cpp	Wed Dec 23 11:43:31 2009 +0000
+++ b/kerneltest/f32test/server/t_file.cpp	Thu Jan 07 13:38:45 2010 +0200
@@ -3032,13 +3032,13 @@
 
     TInt nRes=TheFs.CharToDrive(gDriveToTest, gDriveNum);
     test(nRes==KErrNone);
-
+    
     PrintDrvInfo(TheFs, gDriveNum);
 
     //-- FAT Supports short file names
     if(Is_Fat(TheFs, gDriveNum))
         gShortFileNamesSupported = ETrue;
-    else
+    
     if(Is_Win32(TheFs, gDriveNum)) 
     {//-- find out if this is NTFS and if it supports short names (this feature can be switched OFF)
         
@@ -3052,15 +3052,17 @@
         
         nRes = TheFs.Delete(KLongFN);
         test(nRes==KErrNone);
+
+        DeleteTestDirectory();
     }
-
-
-
-
-	DeleteTestDirectory();
+    else
+    {
+        nRes = FormatDrive(TheFs, gDriveNum, ETrue);
+        test(nRes==KErrNone);
+    }
+
 	CreateTestDirectory(_L("\\F32-TST\\TFILE\\"));
 
-
 	testFileRename();
 	testSetSize();
 	CopyFileToTestDirectory();