diff -r 26645d81f48d -r cc28652e0254 featuremgmt/featuremgr/group/featmgrserver.mmp
--- a/featuremgmt/featuremgr/group/featmgrserver.mmp	Tue Aug 31 16:57:14 2010 +0300
+++ b/featuremgmt/featuremgr/group/featmgrserver.mmp	Wed Sep 01 12:39:58 2010 +0100
@@ -13,21 +13,21 @@
 // Description:
 //
 
-#ifdef __FEATMGR_TESTCFG__
-TARGET          test_featmgrserver.exe
-CAPABILITY      AllFiles ProtServ ReadDeviceData
-#else
+
+#ifndef __FEATMGR_TESTCFG__
 TARGET          featmgrserver.exe
-CAPABILITY      ProtServ ReadDeviceData
-#endif // __FEATMGR_TESTCFG__
-
 // 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__
 
 TARGETTYPE      exe
 VENDORID        0x70000001
 
+CAPABILITY      ProtServ ReadDeviceData
 
 //CodeWarrior compilation options - disable the "illegal pragma" warning
 OPTION CW -w noillpragmas