--- a/featuremgmt/featuremgr/group/featmgrserver.mmp	Mon May 03 14:09:14 2010 +0300
+++ b/featuremgmt/featuremgr/group/featmgrserver.mmp	Fri May 14 17:36:33 2010 +0300
@@ -13,21 +13,20 @@
 // Description:
 //
 
+#ifdef __FEATMGR_TESTCFG__
+TARGET          test_featmgrserver.exe
+CAPABILITY      AllFiles
+#else
+TARGET          featmgrserver.exe
+#endif // __FEATMGR_TESTCFG__
 
-#ifndef __FEATMGR_TESTCFG__
-TARGET          featmgrserver.exe
 // Since this is an exe with no alternate implementations,
 // just use same UID for both UID2 and UID3
 UID             0x10205054 0x10205054
-#else
-TARGET          test_featmgrserver.exe
-UID             0x102836E5 0x102836E5
-#endif // __FEATMGR_TESTCFG__
-
+CAPABILITY      ProtServ ReadDeviceData
 TARGETTYPE      exe
 VENDORID        0x70000001
 
-CAPABILITY      ProtServ ReadDeviceData
 
 //CodeWarrior compilation options - disable the "illegal pragma" warning
 OPTION CW -w noillpragmas