--- a/browserui.pro	Fri May 14 15:40:36 2010 +0300
+++ b/browserui.pro	Tue Jun 29 00:46:29 2010 -0400
@@ -2,16 +2,21 @@
 CONFIG += ordered
 
 include (browserui.pri)
+    SUBDIRS += bedrockProvisioning
+    SUBDIRS += browsercore
+    SUBDIRS += ginebra2
+# rom MUST come last because it depends on *_template.pkg files generated by qmake from all the other apps
+    SUBDIRS += rom
 
-SUBDIRS += bedrockProvisioning
-SUBDIRS += browsercore
-SUBDIRS += ginebra2
-# rom MUST come last because it depends on *_template.pkg files generated by qmake from all the other apps
-SUBDIRS += rom
+contains( what, tests ) {
+    exists($$PWD/internal/tests/perfTracing/perfTracing.pro): SUBDIRS += internal/tests/perfTracing/perfTracing.pro
+    exists($$PWD/internal/tests/mw/mw.pro): SUBDIRS += internal/tests/mw/mw.pro
+    exists($$PWD/internal/tests/Bookmarks_Test/Bookmarks_Test.pro): SUBDIRS += internal/tests/mw/Bookmarks_Test/Bookmarks_Test.pro
+}
 
 symbian: { 
 
-contains(what, plat_101 ) {
+contains(browser_addon, no ) {
     BLD_INF_RULES.prj_exports += "$${LITERAL_HASH}include <platform_paths.hrh>" \
                                  "rom/browser.iby  CORE_APP_LAYER_IBY_EXPORT_PATH(browser.iby)"
     }