--- a/kerneltest/f32test/server/t_mvdr.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/f32test/server/t_mvdr.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -19,7 +19,6 @@
 //
 
 
-#define __E32TEST_EXTENSION__
 #include <e32test.h>
 #include <f32file.h>
 
@@ -51,7 +50,7 @@
 
 	CFileMan *fm = 0;
 	TRAPD(r, fm = CFileMan::NewL(TheFs));
-	test_KErrNone(r);
+	test(r == KErrNone);
 
 	const TInt KMaxDirs = 32;
 
@@ -80,7 +79,7 @@
 			srcDirName.SetLength(srcDirName.Length() - 1);
 			dstDirName.SetLength(dstDirName.Length() - 1);
 			r = fm->Move(srcDirName, dstDirName);
-			test_KErrNone(r);
+			test(r == KErrNone);
 			}
 		}