--- a/kerneltest/e32test/window/t_mmcpw.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kerneltest/e32test/window/t_mmcpw.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -18,7 +18,6 @@
 
 #include <e32svr.h>
 
-#define __E32TEST_EXTENSION__
 #include <e32test.h>
 #include <e32twin.h>
 #include <e32def.h>
@@ -36,8 +35,8 @@
 	RNotifier n;
 	
 	test.Next(_L("Connected to notify server."));
-	TInt r = n.Connect();
-	test_KErrNone(r);
+	TInt r;
+	test((r = n.Connect()) == KErrNone);
 
 	TPckgBuf<TMediaPswdSendNotifyInfoV1> send;
 	send().iVersion = TVersion(1, 0, 0);