--- a/kerneltest/f32test/locl/t_filematch.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/locl/t_filematch.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -114,8 +114,7 @@
 	r = dir.Open(TheFs, name, KEntryAttNormal);
 	test_KErrNone(r);
 	TEntry entry;
-	r = dir.Read(entry);
-	test_KErrNone(r);
+	test(dir.Read(entry) == KErrNone);
 	dir.Close();
 	}
 
@@ -129,8 +128,7 @@
 	r = dir.Open(TheFs, name, KEntryAttNormal);
 	test_KErrNone(r);
 	TEntry entry;
-	r = dir.Read(entry);
-	test_Equal(KErrEof, r);
+	test(dir.Read(entry) == KErrEof);
 	dir.Close();
 	}
 
@@ -186,11 +184,11 @@
     F32_Test_Utils::SetConsole(test.Console()); 
     
     TInt nRes=TheFs.CharToDrive(gDriveToTest, gDriveNum);
-    test_KErrNone(nRes);
+    test(nRes==KErrNone);
     
     PrintDrvInfo(TheFs, gDriveNum);
 
-    if(Is_SimulatedSystemDrive(TheFs, gDriveNum) || Is_Fat(TheFs, gDriveNum) || Is_Lffs(TheFs, gDriveNum))
+    if(Is_Win32(TheFs, gDriveNum) || Is_Fat(TheFs, gDriveNum) || Is_Lffs(TheFs, gDriveNum))
         {
 	    TestFilenameMatches();
         }