Fixes: Not all tests are packaged for maemo.

Adds the necessary logic to allow all tests to be installable under maemo platforms.
The packaging system now builds with -tests, and tests must be manually included in
the package *.install files otherwise there will be an error.
Tests that fail have been marked as insignificant_test to allow their results to
be ignored by BIFH. Tests that aren't automated are marked as manual_test to
exclude them from CITA runs.

Change-Id: I9cb7d25ff59b0574f95b784c93b98b0652645e5a

114 files changed, 509 insertions, 249 deletions

diff --git a/features/maemo_tests.prf b/features/maemo_tests.prf
new file mode 100644
index 0000000000..6dbc06fbab
--- /dev/null
+++ b/features/maemo_tests.prf
@@ -0,0 +1,50 @@
+# This file helps with installation of the tests for Maemo platforms so they can be included in the packages.
+installtests.CONFIG = recursive
+!contains(TEMPLATE, subdirs) {
+    testcase|testplugin {
+        # If the test has existing install rules, then we need to move them to the appropriate install path
+        # It's a bit ugly, but ensures we get all the xml test data files
+        !isEmpty(INSTALLS) {
+            NL = $$escape_expand(\\n\\t)
+            for(installItem, $$list($$INSTALLS)){
+                eval(srcPath = $${installItem}.path)
+                srcPath = $$eval($$srcPath)
+                eval(srcFiles = $${installItem}.files)
+                srcFiles = $$eval($$srcFiles)
+                testplugin {
+                    isEmpty(PLUGIN_TYPE) : error (PLUGIN_TYPE not set in $$__PRO_FILE__)
+                    destPath = $$replace(srcPath, $$re_escape($$DESTDIR), \$(INSTALL_ROOT)$$[QT_INSTALL_PREFIX]/tests/qtm/plugins/$$PLUGIN_TYPE/)
+                } testcase {
+                    destPath = $$replace(srcPath, $$re_escape($$DESTDIR), \$(INSTALL_ROOT)$$[QT_INSTALL_PREFIX]/tests/qtm/)
+                }
+                installtests.commands += $(CHK_DIR_EXISTS) $${destPath} || $(MKDIR) $${destPath} $${NL}
+                for(srcFile, $$list($$srcFiles)){
+                    srcFile = $$basename(srcFile)
+                    installtests.commands += $(MOVE) $(INSTALL_ROOT)$$srcPath/$$srcFile $${destPath} $${NL}
+                }
+            }
+        }
+
+        # Install the test binaries and plugins.
+        testcase {
+            target.path = $$[QT_INSTALL_PREFIX]/tests/qtm/
+            INSTALLS += target
+        } testplugin {
+            target.path = $$[QT_INSTALL_PREFIX]/tests/qtm/plugins/$$PLUGIN_TYPE/
+            INSTALLS += target
+        }
+    }
+}
+
+# if a test is marked as insignificant(is not critical test) then we want it to run in CITA but not cause a failure.
+insignificant_test {
+    !isEmpty(installtests.commands) : installtests.commands += $${NL}
+    installtests.commands +=  echo  "insignificant_test"  >> \$(INSTALL_ROOT)$${target.path}/$${TARGET}.insignificant_test
+}
+
+# if a test is marked as manual then it needs to be ignored by CITA
+manual_test {
+    !isEmpty(installtests.commands) : installtests.commands += $${NL}
+    installtests.commands +=  echo  "manual_test"  >> \$(INSTALL_ROOT)$${target.path}/$${TARGET}.manual_test
+}
+QMAKE_EXTRA_TARGETS += installtests
diff --git a/features/platformconfig/harmattan_common.pri b/features/platformconfig/harmattan_common.pri
index e013a72861..b5b25bd130 100644
--- a/features/platformconfig/harmattan_common.pri
+++ b/features/platformconfig/harmattan_common.pri
@@ -3,6 +3,7 @@
 #for example: bluez_enabled = yes|no
 
 QMAKE_CFLAGS += -g1 -O2
+CONFIG += maemo_tests
 
 # Specify the config test that needs to be enabled/disabled 
 qmf_enabled = yes
diff --git a/src/harmattaninstalls/control b/src/harmattaninstalls/control
index 5f084e0755..3f061ffd1e 100644
--- a/src/harmattaninstalls/control
+++ b/src/harmattaninstalls/control
@@ -286,18 +286,18 @@ Description: Qt Mobility Messaging development package
  framework and apply them to phones, netbooks and non-mobile personal
  computers.
 
-#Package: libqtm-messaging-tests
-#Architecture: any
-#Section: libs
-#Depends: ci-testing, ${shlibs:Depends}
-#XB-Maemo-CI-Packages: libqtm-messaging
-#XB-Maemo-CI-Stage: staging
-#Description: Qt Mobility Messaging autotest package
-# Qt Mobility Project delivers a set of new APIs to Qt with features that are
-# well known from the mobile device world, in particular phones. However,
-# these APIs allow the developer to use these features with ease from one
-# framework and apply them to phones, netbooks and non-mobile personal
-# computers.
+Package: libqtm-messaging-tests
+Architecture: any
+Section: libs
+Depends: ci-testing, ${shlibs:Depends},${misc:Depends}
+XB-Maemo-CI-Packages: libqtm-messaging
+XB-Maemo-CI-Stage: staging
+Description: Qt Mobility Messaging autotest package
+ Qt Mobility Project delivers a set of new APIs to Qt with features that are
+ well known from the mobile device world, in particular phones. However,
+ these APIs allow the developer to use these features with ease from one
+ framework and apply them to phones, netbooks and non-mobile personal
+ computers.
 
 Package: libqtm-contacts
 Architecture: any
@@ -517,18 +517,18 @@ Description: Qt Mobility PublishSubscribe development package
  framework and apply them to phones, netbooks and non-mobile personal
  computers.
 
-#Package: libqtm-publishsubscribe-tests
-#Architecture: any
-#Section: libs
-#Depends: ci-testing, ${shlibs:Depends}
-#XB-Maemo-CI-Packages: libqtm-publishsubscribe
-#XB-Maemo-CI-Stage: staging
-#Description: Qt Mobility PublishSubscribe autotest package
-# Qt Mobility Project delivers a set of new APIs to Qt with features that are
-# well known from the mobile device world, in particular phones. However,
-# these APIs allow the developer to use these features with ease from one
-# framework and apply them to phones, netbooks and non-mobile personal
-# computers.
+Package: libqtm-publishsubscribe-tests
+Architecture: any
+Section: libs
+Depends: ci-testing, ${shlibs:Depends}, ${misc:Depends}
+XB-Maemo-CI-Packages: libqtm-publishsubscribe
+XB-Maemo-CI-Stage: staging
+Description: Qt Mobility PublishSubscribe autotest package
+ Qt Mobility Project delivers a set of new APIs to Qt with features that are
+ well known from the mobile device world, in particular phones. However,
+ these APIs allow the developer to use these features with ease from one
+ framework and apply them to phones, netbooks and non-mobile personal
+ computers.
 
 Package: libqtm-location
 Architecture: any
@@ -702,15 +702,15 @@ Description: Qt Mobility Connectivity development package
  framework and apply them to phones, netbooks and non-mobile personal
  computers.
 
-#Package: libqtm-connectivity-tests
-#Architecture: any
-#Section: libs
-#Depends: ci-testing, ${shlibs:Depends}, ${misc:Depends}
-#XB-Maemo-CI-Packages: libqtm-connectivity
-#XB-Maemo-CI-Stage: staging
-#Description: Qt Mobility Connectivity autotest package
-# Qt Mobility Project delivers a set of new APIs to Qt with features that are
-# well known from the mobile device world, in particular phones. However,
-# these APIs allow the developer to use these features with ease from one
-# framework and apply them to phones, netbooks and non-mobile personal
-# computers.
+Package: libqtm-connectivity-tests
+Architecture: any
+Section: libs
+Depends: ci-testing, ${shlibs:Depends}, ${misc:Depends}
+XB-Maemo-CI-Packages: libqtm-connectivity
+XB-Maemo-CI-Stage: staging
+Description: Qt Mobility Connectivity autotest package
+ Qt Mobility Project delivers a set of new APIs to Qt with features that are
+ well known from the mobile device world, in particular phones. However,
+ these APIs allow the developer to use these features with ease from one
+ framework and apply them to phones, netbooks and non-mobile personal
+ computers.
diff --git a/src/harmattaninstalls/libqtm-connectivity-tests.install b/src/harmattaninstalls/libqtm-connectivity-tests.install
new file mode 100644
index 0000000000..236baeaaf3
--- /dev/null
+++ b/src/harmattaninstalls/libqtm-connectivity-tests.install
@@ -0,0 +1,8 @@
+usr/tests/qtm/tst_qnearfieldtagtype2
+usr/tests/qtm/tst_qndefrecord
+usr/tests/qtm/tst_qnearfieldtagtype1
+usr/tests/qtm/tst_qndefmessage
+usr/tests/qtm/tst_qnearfieldmanager
+usr/tests/qtm/tst_qllcpserver
+usr/tests/qtm/tst_qllcpsocket
+usr/share/libqtm-connectivity-tests/tests.xml
diff --git a/src/harmattaninstalls/libqtm-contacts-tests.install b/src/harmattaninstalls/libqtm-contacts-tests.install
new file mode 100644
index 0000000000..0bc159cf75
--- /dev/null
+++ b/src/harmattaninstalls/libqtm-contacts-tests.install
@@ -0,0 +1,41 @@
+usr/tests/qtm/tst_qcontactfilter
+usr/tests/qtm/tst_qcontactdetail
+usr/tests/qtm/tst_qcontact
+usr/tests/qtm/tst_qlatin1constant
+usr/tests/qtm/tst_qcontactmanager
+usr/tests/qtm/tst_qcontactmanagerfiltering
+usr/tests/qtm/tst_qcontactactions
+usr/tests/qtm/tst_bm_contacts
+usr/tests/qtm/tst_qcontactrelationship
+usr/tests/qtm/tst_qcontactdetaildefinition
+usr/tests/qtm/tst_bm_contactsoverhead
+usr/tests/qtm/contacts-tester
+usr/tests/qtm/tst_qdeclarativecontact
+usr/tests/qtm/tst_qcontactmemusage
+usr/tests/qtm/tst_qcontactdetails
+usr/tests/qtm/tst_bm_algorithms
+usr/tests/qtm/tst_qcontactasync
+usr/tests/qtm/tst_qcontactmanagerdetails
+usr/tests/qtm/tst_qcontactmanagerplugins
+usr/tests/qtm/plugins/contacts/xmldata/sendemailactionservice.xml
+usr/tests/qtm/plugins/contacts/xmldata/multiactionservice.xml
+usr/tests/qtm/plugins/contacts/xmldata/numberactionservice.xml
+usr/tests/qtm/plugins/contacts/xmldata/integeractionservice.xml
+usr/tests/qtm/plugins/contacts/xmldata/booleanactionservice.xml
+usr/tests/qtm/plugins/contacts/xmldata/dateactionservice.xml
+usr/tests/qtm/plugins/contacts/xmldata/phonenumberactionservice.xml
+usr/share/libqtm-contacts-tests/tests.xml
+usr/tests/qtm/plugins/contacts/libcontacts_testdummyinvalid.so
+usr/tests/qtm/plugins/contacts/libcontacts_testdummycopy.so
+usr/tests/qtm/plugins/contacts/libcontacts_testdummyempty.so
+usr/tests/qtm/plugins/contacts/libcontacts_testotherdummy.so
+usr/tests/qtm/plugins/contacts/libcontacts_testdummymemory.so
+usr/tests/qtm/plugins/contacts/libcontacts_maliciousplugin.so
+usr/tests/qtm/plugins/contacts/libcontacts_testdummy.so
+usr/tests/qtm/plugins/contacts/libcontacts_booleanaction.so
+usr/tests/qtm/plugins/contacts/libcontacts_multiaction.so
+usr/tests/qtm/plugins/contacts/libcontacts_integeraction.so
+usr/tests/qtm/plugins/contacts/libcontacts_dateaction.so
+usr/tests/qtm/plugins/contacts/libcontacts_numberaction.so
+usr/tests/qtm/plugins/contacts/libcontacts_sendemailaction.so
+usr/tests/qtm/plugins/contacts/libcontacts_phonenumberaction.so
diff --git a/src/harmattaninstalls/libqtm-feedback-tests.install b/src/harmattaninstalls/libqtm-feedback-tests.install
new file mode 100644
index 0000000000..1754af0459
--- /dev/null
+++ b/src/harmattaninstalls/libqtm-feedback-tests.install
@@ -0,0 +1,10 @@
+usr/tests/qtm/tst_qfeedbackmmk
+usr/tests/qtm/tst_qdeclarativefeedback
+usr/tests/qtm/tst_qfeedbackhapticseffect
+usr/tests/qtm/tst_qfeedbackactuator
+usr/tests/qtm/tst_qfeedbackplugin
+usr/tests/qtm/tst_qfeedbacknoplugins
+usr/share/libqtm-feedback-tests/tests.xml
+usr/tests/qtm/plugins/feedback/libqtfeedback_testplugin3.so
+usr/tests/qtm/plugins/feedback/libqtfeedback_testplugin.so
+usr/tests/qtm/plugins/feedback/libqtfeedback_atestplugin.so
diff --git a/src/harmattaninstalls/libqtm-gallery-tests.install b/src/harmattaninstalls/libqtm-gallery-tests.install
new file mode 100644
index 0000000000..6fbb595984
--- /dev/null
+++ b/src/harmattaninstalls/libqtm-gallery-tests.install
@@ -0,0 +1,15 @@
+usr/tests/qtm/tst_qgallerytyperequest
+usr/tests/qtm/tst_qgalleryresource
+usr/tests/qtm/tst_qgalleryquerymodel
+usr/tests/qtm/tst_qgallerytrackerschema
+usr/tests/qtm/tst_qdeclarativedocumentgallerytype
+usr/tests/qtm/tst_qgalleryitemrequest
+usr/tests/qtm/tst_qdocumentgallery
+usr/tests/qtm/tst_qgalleryfilter
+usr/tests/qtm/tst_qgalleryabstractrequest
+usr/tests/qtm/tst_qgallerytrackerresultset
+usr/tests/qtm/tst_qgalleryqueryrequest
+usr/tests/qtm/tst_qdeclarativedocumentgalleryitem
+usr/tests/qtm/tst_qdeclarativedocumentgallerymodel
+usr/tests/qtm/tst_qgalleryabstractresponse
+usr/share/libqtm-gallery-tests/tests.xml
diff --git a/src/harmattaninstalls/libqtm-location-tests.install b/src/harmattaninstalls/libqtm-location-tests.install
new file mode 100644
index 0000000000..f84a7e6243
--- /dev/null
+++ b/src/harmattaninstalls/libqtm-location-tests.install
@@ -0,0 +1,58 @@
+usr/lib/qtmobility/examples/MapViewer
+usr/lib/qtmobility/examples/GeoServiceDemo
+usr/tests/qtm/tst_qlandmarkfilehandler_lmx
+usr/tests/qtm/tst_qgeoplace
+usr/tests/qtm/tst_qgeorouterequest
+usr/tests/qtm/tst_qgeotiledmappingmanagerengine
+usr/tests/qtm/tst_qnmeapositioninfosource_realtime_generic
+usr/tests/qtm/tst_qgeomappolygonobject
+usr/tests/qtm/tst_qdeclarativemap
+usr/tests/qtm/tst_qgeopositioninfo
+usr/tests/qtm/tst_qlandmarkcategory
+usr/tests/qtm/tst_qlandmarkfilehandler_gpx
+usr/tests/qtm/tst_qnmeapositioninfosource_simulation_generic
+usr/tests/qtm/tst_qgeomaprectangleobject
+usr/tests/qtm/tst_geoservicesgeomapplugin
+usr/tests/qtm/tst_qgeosatelliteinfosource
+usr/tests/qtm/tst_qgeoaddress
+usr/tests/qtm/tst_qgeoareamonitor
+usr/tests/qtm/tst_qgeomaneuver
+usr/tests/qtm/tst_qlandmarkmanagerengine
+usr/tests/qtm/tst_qgeosearchreply
+usr/tests/qtm/tst_qnmeapositioninfosource_realtime
+usr/tests/qtm/tst_qgeoboundingbox
+usr/tests/qtm/tst_qnmeapositioninfosource_simulation
+usr/tests/qtm/tst_qgeotiledmapdata
+usr/tests/qtm/tst_qgeomappolylineobject
+usr/tests/qtm/tst_qgeoroutereply
+usr/tests/qtm/tst_qlandmarkmanager
+usr/tests/qtm/tst_qgeomappixmapobject
+usr/tests/qtm/tst_qgeoroutingmanager
+usr/tests/qtm/tst_qdeclarativeposition
+usr/tests/qtm/tst_qlandmark
+usr/tests/qtm/tst_qgeoroutesegment
+usr/tests/qtm/tst_qgeoboundingcircle
+usr/tests/qtm/tst_qlocationutils
+usr/tests/qtm/tst_qgeomapobject
+usr/tests/qtm/tst_qgeomaprouteobject
+usr/tests/qtm/tst_qgeosearchmanager
+usr/tests/qtm/tst_qgeomapcircleobject
+usr/tests/qtm/tst_qgeomapgroupobject
+usr/tests/qtm/tst_qgeomaptextobject
+usr/tests/qtm/tst_qgeoroute
+usr/tests/qtm/tst_qdeclarativelandmark
+usr/tests/qtm/tst_dummynmeapositioninfosource
+usr/tests/qtm/tst_geoservicesgeotiledmapplugin
+usr/tests/qtm/tst_qgeosatelliteinfo
+usr/tests/qtm/tst_qgeocoordinate
+usr/tests/qtm/tst_positionplugin
+usr/tests/qtm/tst_bm_location
+usr/tests/qtm/tst_qgeopositioninfosource
+usr/share/libqtm-location-tests/tests.xml
+usr/tests/qtm/plugins/geoservices/libqtgeoservices_tiledgeomapplugin.so
+usr/tests/qtm/plugins/geoservices/libqtgeoservices_routingplugin.so
+usr/tests/qtm/plugins/geoservices/libqtgeoservices_searchplugin.so
+usr/tests/qtm/plugins/geoservices/libqtgeoservices_geomapobjectplugin.so
+usr/tests/qtm/plugins/geoservices/libqtgeoservices_geomapplugin.so
+usr/tests/qtm/plugins/geoservices/libqtgeoservices_pixelindexplugin.so
+usr/tests/qtm/plugins/position/libqtposition_testplugin.so
diff --git a/src/harmattaninstalls/libqtm-messaging-tests.install b/src/harmattaninstalls/libqtm-messaging-tests.install
new file mode 100644
index 0000000000..8db30a9e19
--- /dev/null
+++ b/src/harmattaninstalls/libqtm-messaging-tests.install
@@ -0,0 +1,6 @@
+usr/tests/qtm/tst_qmessagestorekeys
+usr/tests/qtm/tst_qmessage
+usr/tests/qtm/tst_qmessagestore
+usr/tests/qtm/tst_qmessageservice
+usr/tests/qtm/tst_bm_messaging
+usr/share/libqtm-messaging-tests/tests.xml
diff --git a/src/harmattaninstalls/libqtm-multimedia-tests.install b/src/harmattaninstalls/libqtm-multimedia-tests.install
new file mode 100644
index 0000000000..966d6e7db3
--- /dev/null
+++ b/src/harmattaninstalls/libqtm-multimedia-tests.install
@@ -0,0 +1,32 @@
+usr/tests/qtm/tst_qmediaresource
+usr/tests/qtm/tst_qmediatimerange
+usr/tests/qtm/tst_qaudiooutput
+usr/tests/qtm/tst_qabstractvideosurface
+usr/tests/qtm/tst_qmediaimageviewer
+usr/tests/qtm/tst_qcamera
+usr/tests/qtm/tst_qmediaplayerbackend
+usr/tests/qtm/tst_qvideoframe
+usr/tests/qtm/tst_qabstractvideobuffer
+usr/tests/qtm/tst_qdeclarativevideo
+usr/tests/qtm/tst_qmediapluginloader
+usr/tests/qtm/tst_qmediaplaylist
+usr/tests/qtm/tst_qaudiocapturesource
+usr/tests/qtm/tst_qmediarecorder
+usr/tests/qtm/tst_qmediaserviceprovider
+usr/tests/qtm/tst_qvideowidget
+usr/tests/qtm/tst_qaudioinput
+usr/tests/qtm/tst_qmediacontent
+usr/tests/qtm/tst_qmediaplayer
+usr/tests/qtm/tst_qpaintervideosurface
+usr/tests/qtm/tst_qmediaplaylistnavigator
+usr/tests/qtm/tst_qradiotuner
+usr/tests/qtm/tst_qaudioformat
+usr/tests/qtm/tst_qmediaservice
+usr/tests/qtm/tst_qaudiodeviceinfo
+usr/tests/qtm/tst_qsoundeffect
+usr/tests/qtm/tst_qvideosurfaceformat
+usr/tests/qtm/tst_qgraphicsvideoitem
+usr/tests/qtm/tst_qdeclarativeaudio
+usr/tests/qtm/tst_qmediaobject
+usr/tests/qtm/tst_qcamerabackend
+usr/share/libqtm-multimedia-tests/tests.xml
diff --git a/src/harmattaninstalls/libqtm-organizer-tests.install b/src/harmattaninstalls/libqtm-organizer-tests.install
new file mode 100644
index 0000000000..09942c2a55
--- /dev/null
+++ b/src/harmattaninstalls/libqtm-organizer-tests.install
@@ -0,0 +1,13 @@
+usr/tests/qtm/tst_qorganizeritemdetaildefinition
+usr/tests/qtm/tst_qorganizeritemdetail
+usr/tests/qtm/tst_qmalgorithms
+usr/tests/qtm/tst_qorganizeritem
+usr/tests/qtm/tst_qorganizeritemasync
+usr/tests/qtm/tst_qorganizeritemdetails
+usr/tests/qtm/tst_qorganizermanagerdetails
+usr/tests/qtm/tst_qorganizercollection
+usr/tests/qtm/tst_qorganizeritemfilter
+usr/tests/qtm/tst_qorganizermanager
+usr/tests/qtm/tst_bm_organizer
+usr/share/libqtm-organizer-tests/tests.xml
+usr/tests/qtm/plugins/organizer/libqtorganizer_skeleton.so
diff --git a/src/harmattaninstalls/libqtm-publishsubscribe-tests.install b/src/harmattaninstalls/libqtm-publishsubscribe-tests.install
new file mode 100644
index 0000000000..6ae2939d9a
--- /dev/null
+++ b/src/harmattaninstalls/libqtm-publishsubscribe-tests.install
@@ -0,0 +1,6 @@
+usr/tests/qtm/tst_qvaluespacesubscriber
+usr/tests/qtm/tst_qvaluespacepublisher
+usr/tests/qtm/tst_qvaluespace
+usr/tests/qtm/tst_qcrmlparser
+usr/tests/qtm/tst_qvaluespacesubscriber_oop
+usr/share/libqtm-publishsubscribe-tests/tests.xml
diff --git a/src/harmattaninstalls/libqtm-sensors-tests.install b/src/harmattaninstalls/libqtm-sensors-tests.install
new file mode 100644
index 0000000000..b86b77a099
--- /dev/null
+++ b/src/harmattaninstalls/libqtm-sensors-tests.install
@@ -0,0 +1,2 @@
+usr/tests/qtm/tst_qsensor
+usr/share/libqtm-sensors-tests/tests.xml
diff --git a/src/harmattaninstalls/libqtm-serviceframework-tests.install b/src/harmattaninstalls/libqtm-serviceframework-tests.install
new file mode 100644
index 0000000000..b4e80e850b
--- /dev/null
+++ b/src/harmattaninstalls/libqtm-serviceframework-tests.install
@@ -0,0 +1,26 @@
+usr/tests/qtm/plugins/serviceframework/xmldata/sampleservice.xml
+usr/tests/qtm/plugins/serviceframework/xmldata/sampleservice2.xml
+usr/tests/qtm/plugins/serviceframework/xmldata/testserviceplugin.xml
+usr/tests/qtm/plugins/serviceframework/xmldata/bm_sampleservice.xml
+usr/tests/qtm/tst_qservicemanager
+usr/tests/qtm/tst_qmetaobjectbuilder
+usr/tests/qtm/tst_qabstractsecuritysession
+usr/tests/qtm/tst_servicemetadata
+usr/tests/qtm/tst_qservicecontext
+usr/tests/qtm/tst_qserviceinterfacedescriptor
+usr/tests/qtm/tst_qservicefilter
+usr/tests/qtm/tst_qremoteserviceregister
+usr/tests/qtm/tst_icheck
+usr/tests/qtm/qt_sfw_example_ipc_unittest
+usr/tests/qtm/tst_servicedatabase
+usr/tests/qtm/tst_qservicemanager_ipc
+usr/tests/qtm/tst_qservicedeletion
+usr/tests/qtm/tst_bm_serviceframework
+usr/tests/qtm/xmldata/testdeletion.xml
+usr/tests/qtm/xmldata/ipcexampleservice.xml
+usr/tests/qtm/xmldata/rsrexampleservice.xml
+usr/share/libqtm-serviceframework-tests/tests.xml
+usr/tests/qtm/plugins/serviceframework/libtst_sfw_sampleserviceplugin2.so
+usr/tests/qtm/plugins/serviceframework/libtst_sfw_testservice2plugin.so
+usr/tests/qtm/plugins/serviceframework/libtst_sfw_sampleserviceplugin.so
+usr/tests/qtm/plugins/serviceframework/libtst_bm_sfw_sampleserviceplugin.so
diff --git a/src/harmattaninstalls/libqtm-systeminfo-tests.install b/src/harmattaninstalls/libqtm-systeminfo-tests.install
new file mode 100644
index 0000000000..cc216886bb
--- /dev/null
+++ b/src/harmattaninstalls/libqtm-systeminfo-tests.install
@@ -0,0 +1,18 @@
+usr/tests/qtm/tst_qsystemnetworkinfo_maemo
+usr/tests/qtm/tst_qdeclarativenetworkinfo
+usr/tests/qtm/tst_qsystemdeviceinfo
+usr/tests/qtm/tst_qsystembatteryinfo
+usr/tests/qtm/tst_qdeclarativesysteminfo
+usr/tests/qtm/tst_qsystemdeviceinfo_maemo
+usr/tests/qtm/tst_qdeclarativescreensaver
+usr/tests/qtm/tst_qdeclarativebatteryinfo
+usr/tests/qtm/tst_qsysteminfo
+usr/tests/qtm/tst_qsystemstorageinfo
+usr/tests/qtm/tst_qsystemscreensaver
+usr/tests/qtm/tst_qsystemdisplayinfo
+usr/tests/qtm/tst_qsystemalignedtimer
+usr/tests/qtm/tst_qdeclarativedisplayinfo
+usr/tests/qtm/tst_qsystemnetworkinfo
+usr/tests/qtm/tst_qdeclarativedeviceinfo
+usr/tests/qtm/tst_bm_qsysteminfo
+usr/share/libqtm-systeminfo-tests/tests.xml
diff --git a/src/harmattaninstalls/libqtm-versit-tests.install b/src/harmattaninstalls/libqtm-versit-tests.install
new file mode 100644
index 0000000000..3399f1188c
--- /dev/null
+++ b/src/harmattaninstalls/libqtm-versit-tests.install
@@ -0,0 +1,19 @@
+usr/tests/qtm/tst_qversitcontactplugins
+usr/tests/qtm/tst_qversitcontactimporter
+usr/tests/qtm/tst_qversitwriter
+usr/tests/qtm/tst_qversitdocument
+usr/tests/qtm/tst_qvcard21writer
+usr/tests/qtm/tst_qvcard30writer
+usr/tests/qtm/tst_qversitreader
+usr/tests/qtm/tst_qversitcontactexporter
+usr/tests/qtm/tst_qversitorganizerimporter
+usr/tests/qtm/tst_qversitorganizerexporter
+usr/tests/qtm/tst_qversit
+usr/tests/qtm/tst_qversitproperty
+usr/tests/qtm/tst_bm_versit
+usr/share/libqtm-versit-tests/tests.xml
+usr/tests/qtm/plugins/versit/libversit_plugin5.so
+usr/tests/qtm/plugins/versit/libversit_plugin2.so
+usr/tests/qtm/plugins/versit/libversit_plugin3.so
+usr/tests/qtm/plugins/versit/libversit_plugin4.so
+usr/tests/qtm/plugins/versit/libversit_plugin1.so
diff --git a/src/harmattaninstalls/rules b/src/harmattaninstalls/rules
index 6745d08364..75c2f13fe9 100755
--- a/src/harmattaninstalls/rules
+++ b/src/harmattaninstalls/rules
@@ -46,7 +46,7 @@ DEB_CONFIGURE_NORMAL_ARGS := -maemo6  -prefix /usr -headerdir /usr/include/qt4 \
 		-plugindir /usr/lib/qt4/plugins -modules "$(QTM_MODULES)" \
 		-examples -examplesdir /usr/lib/qtmobility/examples \
 		-demos -demosdir /usr/lib/qtmobility/demos \
-		-silent -release
+		-silent -release -tests
 
 # enable static config if set
 ifeq ($(MOBILITY_ENABLE_STATIC_CONFIG),1)
@@ -60,54 +60,34 @@ ifeq ($(MOBILITY_ENABLE_STATIC_CONFIG),1)
 	DEB_CONFIGURE_EXTRA_FLAGS := -staticconfig harmattan_$(TARGET_BUILD)
 endif
 
-common-build-arch:: build-maemo-tests build-additional-tests
-common-install-arch:: install-autotests install-additional-tests
+common-install-arch:: install-autotests
 
 #List of auto tests
 QTM_MAEMO_TESTDIR := debian/tests
 
-QTM_AUTOTESTS_SIMPLE := $(QTM_MAEMO_TESTDIR)/libqtm-sensors-tests.pri \
-			$(QTM_MAEMO_TESTDIR)/libqtm-location-tests.pri \
-			$(QTM_MAEMO_TESTDIR)/libqtm-contacts-tests.pri \
-			$(QTM_MAEMO_TESTDIR)/libqtm-gallery-tests.pri \
-			$(QTM_MAEMO_TESTDIR)/libqtm-feedback-tests.pri \
-			$(QTM_MAEMO_TESTDIR)/libqtm-multimedia-tests.pri \
-			$(QTM_MAEMO_TESTDIR)/libqtm-systeminfo-tests.pri \
-			$(QTM_MAEMO_TESTDIR)/libqtm-serviceframework-tests.pri \
-			$(QTM_MAEMO_TESTDIR)/libqtm-organizer-tests.pri \
-			$(QTM_MAEMO_TESTDIR)/libqtm-versit-tests.pri
+QTM_AUTOTESTS_SIMPLE := debian/libqtm-connectivity-tests.install \
+			debian/libqtm-contacts-tests.install \
+			debian/libqtm-feedback-tests.install \
+			debian/libqtm-gallery-tests.install \
+			debian/libqtm-location-tests.install \
+			debian/libqtm-messaging-tests.install \
+			debian/libqtm-multimedia-tests.install \
+			debian/libqtm-organizer-tests.install \
+			debian/libqtm-publishsubscribe-tests.install \
+			debian/libqtm-sensors-tests.install \
+			debian/libqtm-serviceframework-tests.install \
+			debian/libqtm-systeminfo-tests.install \
+			debian/libqtm-versit-tests.install
 
 
-export QMAKEFEATURES=$(CURDIR)/debian/tests
 export QTM_TEST_INSTALL_FILE=$(CURDIR)/debian/pkg.install
 
-build-maemo-tests:
-	cp -f $(QTM_AUTOTESTS_SIMPLE) $(QTM_MAEMO_TESTDIR)/qtm-maemo-auto.pro tests/auto/
-	cd tests/auto/ && qmake -r CONFIG+=maemo_tests qtm-maemo-auto.pro && $(DEB_MAKE_INVOKE)
-
-# Add additional tests to be packaged to QTM_ADDITIONAL_TESTS
-# Ensure the targets of these projects are specified in test/libqtm-<package>-tests.install
-# if --fail-missing is enabled
-#QTM_ADDITIONAL_TESTS :=  tests/location-testing-tools/mapviewer
-	
-build-additional-tests:
-	  for testdir in $(QTM_ADDITIONAL_TESTS) ; do \
-	    cd $$testdir && qmake && $(DEB_MAKE_INVOKE) ; \
-	    cd - ; \
-	  done
-
 #installation
 install-autotests:
-	$(DEB_MAKE_INVOKE) -C tests/auto $(DEB_MAKE_INSTALL_TARGET)
+	$(DEB_MAKE_INVOKE) -C tests INSTALL_ROOT=$(DEB_DESTDIR) installtests
 	$(QTM_MAEMO_TESTDIR)/install_tests -d debian -t $(QTM_MAEMO_TESTDIR) \
                 -i $(DEB_DESTDIR) -c -xml $(QTM_AUTOTESTS_SIMPLE)
 				
-install-additional-tests:
-	for testdir in $(QTM_ADDITIONAL_TESTS) ; do \
-	  $(DEB_MAKE_INVOKE) -C  $$testdir $(DEB_MAKE_INSTALL_TARGET); \
-	done
-
-
 PACKAGE_TARGETS := $(foreach pkg,$(DEB_ALL_PACKAGES),binary/$(pkg))
 
 $(PACKAGE_TARGETS)::
@@ -127,9 +107,4 @@ clean::
 	  config.tests/immersion/immersion \
 	  config.tests/maemo6-landmarks/maemo6-landmarks \
 	  config.tests/pulseaudio/pulseaudio
-	# Delete the generated test-installs and pro files
-	rm -f \
-	  debian/libqtm-*-tests.install \
-	  tests/auto/libqtm-*-tests.pri \
-	  tests/auto/qtm-maemo-auto.pro
 
diff --git a/src/harmattaninstalls/tests/install_tests b/src/harmattaninstalls/tests/install_tests
index 48105d0099..320459ea1f 100755
--- a/src/harmattaninstalls/tests/install_tests
+++ b/src/harmattaninstalls/tests/install_tests
@@ -66,47 +66,19 @@ install_tests()
     #derive the package name from the file name
     extension=".$(echo $1 | awk -F"." '{print $NF}')"
     packageName=$(basename "$1" "$extension")
-
     installFile="$packageDir/${packageName}.install"
 
-    testDirList=
-
-    while read line; do case "$line" in
-	    SUBDIRS*)
-		testDirList=$(echo $line | sed -n -e "s/SUBDIRS.*= *\(.*\)$/\1/p")
-		;;
-	esac; done < "$1"
-
-    if [ -z "$testDirList" ]; then
-	return 0
-    fi
     mkdir -p $installDir/$xmlInstallDir/$packageName
     xmlFile="$installDir/$xmlInstallDir/$packageName/tests.xml"
-    # the blacklist file is automaticly generated by maemo_tests.prf
-    blacklistFile="$installDir/$xmlInstallDir/$packageName/blacklist.txt"
-
-    rm -f "$installFile"
 
     begin_test_suite $xmlFile
 
-    for testDir in $testDirList; do
-	export QTM_TEST_INSTALL_FILE="$installFile"
-	export QTM_TEST_BLACKLIST_FILE="$blacklistFile"
-	INSTALL_ROOT="$installDir" make -C tests/auto/$testDir installtests
-    done
-
-	# only run applications, not test data or plugins (which will have a '.' in the name)
-	grep -v -F . "$installFile" | while read testApp; do
-	add_test_set "$testApp" "$xmlFile"
+    # only run applications, not test data or plugins (which will have a '.' in the name)
+    grep -v -F . "$installFile" | while read testApp; do
+        add_test_set "$testApp" "$xmlFile"
     done
 
     end_test_suite $xmlFile
-
-    echo "$xmlInstallDir/$packageName/tests.xml" >> "$installFile"
-	# add the contents of package.install file if it exist in template dir 
-	test -r $templateDir/$packageName.install && cat $templateDir/$packageName.install >> $installFile
-    # remove the black list file to ensure that it is not packaged
-    if [ -r "$blacklistFile" ] ; then rm "$blacklistFile"; fi
 }
 
 #-------------------------------------------------------------------------------
@@ -134,11 +106,17 @@ add_test_set()
     templateSetFile="$templateDir/$testSetTemplate"
     testSuiteName=$(basename $1)
     insignificantTest="false"
-    if [ -r "$blacklistFile" ]; then
-        # a test is insignificant if it is listed in the black list file(blacklisted)
-        grep -q -e "^$1$" $blacklistFile > /dev/null 2>&1 && insignificantTest="true"
+    # *.insignificant_test files indicate that the test should be marked as insignificant - run but not counted
+    if [ -e "$installDir/$1.insignificant_test" ]; then
+        insignificantTest="true"
+        rm "$installDir/$1.insignificant_test"
+    fi
+    # *.manual_test files indicate that the test is not to be run in CITA
+    if [ ! -e "$installDir/$1.manual_test" ]; then
+        add_set_name "$testSuiteName" "$templateSetFile" |add_description "$testSuiteName" |add_case_name "$testSuiteName" |add_insignificant_test "$insignificantTest" | add_step "$1"  >> "$2"
+    else
+        rm "$installDir/$1.manual_test"
     fi
-    add_set_name "$testSuiteName" "$templateSetFile" |add_description "$testSuiteName" |add_case_name "$testSuiteName" |add_insignificant_test "$insignificantTest" | add_step "$1"  >> "$2"
 }
 
 add_set_name()
@@ -162,9 +140,9 @@ add_description()
 add_step()
 {
     if [ -n "$testCliOptions" ]; then
-	optstr="s;<step>.*</step>;<step>$1 $testCliOptions</step>;g"
+	optstr="s;<step>.*</step>;<step>/$1 $testCliOptions</step>;g"
     else
-	optstr="s;<step>.*</step>;<step>$1</step>;g"
+	optstr="s;<step>.*</step>;<step>/$1</step>;g"
     fi
     runsed "$optstr" "$2"
 }
diff --git a/src/harmattaninstalls/tests/libqtm-contacts-tests.pri b/src/harmattaninstalls/tests/libqtm-contacts-tests.pri
deleted file mode 100644
index 6d7d9a5e34..0000000000
--- a/src/harmattaninstalls/tests/libqtm-contacts-tests.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-SUBDIRS += qcontactdetail \
-	qcontactdetaildefinition \
-	qcontactdetails \
-	qcontactfilter \
-	qcontactmemusage \
-	qlatin1constant \
-	qcontactasync \
-	qcontactmanager \
-	qcontactrelationship
-
diff --git a/src/harmattaninstalls/tests/libqtm-feedback-tests.pri b/src/harmattaninstalls/tests/libqtm-feedback-tests.pri
deleted file mode 100644
index 2041770b4f..0000000000
--- a/src/harmattaninstalls/tests/libqtm-feedback-tests.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS +=  qfeedbackhapticseffect
-
diff --git a/src/harmattaninstalls/tests/libqtm-gallery-tests.pri b/src/harmattaninstalls/tests/libqtm-gallery-tests.pri
deleted file mode 100644
index c35b7672ed..0000000000
--- a/src/harmattaninstalls/tests/libqtm-gallery-tests.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-SUBDIRS +=  qdocumentgallery \
-	qgalleryabstractrequest \
-	qgalleryabstractresponse \
-	qgalleryfilter \
-	qgalleryitemrequest \
-	qgalleryquerymodel \
-	qgalleryqueryrequest \
-	qgalleryresource \
-	qgallerytyperequest
-
diff --git a/src/harmattaninstalls/tests/libqtm-location-tests.pri b/src/harmattaninstalls/tests/libqtm-location-tests.pri
deleted file mode 100644
index d092a29aa5..0000000000
--- a/src/harmattaninstalls/tests/libqtm-location-tests.pri
+++ /dev/null
@@ -1,9 +0,0 @@
-SUBDIRS +=  qgeoareamonitor \
-	qgeocoordinate \
-        qgeoboundingbox \
-        qgeosatelliteinfo \
-        qlandmarkmanagerengine \
-        qlandmark \
-        qlandmarkcategory \
-        qlandmarkfilehandler_gpx \
-	qgeopositioninfo
diff --git a/src/harmattaninstalls/tests/libqtm-multimedia-tests.pri b/src/harmattaninstalls/tests/libqtm-multimedia-tests.pri
deleted file mode 100644
index 73f3c16ba7..0000000000
--- a/src/harmattaninstalls/tests/libqtm-multimedia-tests.pri
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS +=  qabstractvideobuffer \
-	qabstractvideosurface \
-	qaudiocapturesource \
-	qmediaobject \
-	qmediaplayer \
-	qmediaplaylistnavigator \
-	qmediarecorder \
-	qmediaresource \
-	qmediaservice \
-	qmediacontent \
-	qradiotuner \
-	qmediatimerange \
-	qaudioformat \
-	qvideoframe \
-	qvideosurfaceformat
-
diff --git a/src/harmattaninstalls/tests/libqtm-organizer-tests.pri b/src/harmattaninstalls/tests/libqtm-organizer-tests.pri
deleted file mode 100644
index 9120a781cc..0000000000
--- a/src/harmattaninstalls/tests/libqtm-organizer-tests.pri
+++ /dev/null
@@ -1,7 +0,0 @@
-SUBDIRS +=  qorganizercollection \
-	qorganizeritem \
-	qorganizeritemdetail \
-	qorganizeritemdetails \
-	qorganizeritemdetaildefinition \
-	qorganizeritemfilter
-
diff --git a/src/harmattaninstalls/tests/libqtm-sensors-tests.pri b/src/harmattaninstalls/tests/libqtm-sensors-tests.pri
deleted file mode 100644
index 3a04ca7b7e..0000000000
--- a/src/harmattaninstalls/tests/libqtm-sensors-tests.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBDIRS +=  qsensor
-
diff --git a/src/harmattaninstalls/tests/libqtm-serviceframework-tests.pri b/src/harmattaninstalls/tests/libqtm-serviceframework-tests.pri
deleted file mode 100644
index 34dc99b47c..0000000000
--- a/src/harmattaninstalls/tests/libqtm-serviceframework-tests.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS +=  qserviceinterfacedescriptor \
-	qservicefilter \
-	qservicecontext
-
diff --git a/src/harmattaninstalls/tests/libqtm-systeminfo-tests.pri b/src/harmattaninstalls/tests/libqtm-systeminfo-tests.pri
deleted file mode 100644
index 3303290349..0000000000
--- a/src/harmattaninstalls/tests/libqtm-systeminfo-tests.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-SUBDIRS +=  qsystemstorageinfo \
-	qsystemnetworkinfo \
-	qsystemscreensaver
-
diff --git a/src/harmattaninstalls/tests/libqtm-versit-tests.pri b/src/harmattaninstalls/tests/libqtm-versit-tests.pri
deleted file mode 100644
index f14d9a8900..0000000000
--- a/src/harmattaninstalls/tests/libqtm-versit-tests.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-SUBDIRS +=  qvcard21writer \
-        qvcard30writer \
-        qversitcontactexporter \
-        qversitcontactimporter \
-        qversitorganizerexporter \
-        qversitdocument \
-	qversitproperty \
-        qversitwriter \
-
-
diff --git a/src/harmattaninstalls/tests/maemo_tests.prf b/src/harmattaninstalls/tests/maemo_tests.prf
deleted file mode 100644
index 4a5d98f7ff..0000000000
--- a/src/harmattaninstalls/tests/maemo_tests.prf
+++ /dev/null
@@ -1,43 +0,0 @@
-installtests.CONFIG = recursive
-!contains(TEMPLATE, subdirs) {
-    NL = $$escape_expand(\\n\\t)
-    # see below for how test data (including plugins) are installed as part of
-    #  the DEPOYMENT rule for the unit test that uses the plugin
-    contains(TEMPLATE, app) {
-        target.path += $$[QT_INSTALL_PREFIX]/tests/qtm/$${target.path}
-        INSTALLS += target
-        installtests.commands = echo $${target.path}$${TARGET} >> \$(QTM_TEST_INSTALL_FILE)
-    }
-    # if a test is marked as insignificant(is not critical test) then add it to the black list
-    insignificant_test {
-        !isEmpty(installtests.commands) : installtests.commands += $${NL}
-        installtests.commands +=  echo  $${target.path}$${TARGET} >> \$(QTM_TEST_BLACKLIST_FILE)
-    }
-
-    # handle the deployment of test data
-    for(deployItem, $$list($$DEPLOYMENT)){
-        eval(itemPath = $${deployItem}.path)
-        eval(itemSources = $${deployItem}.sources)
-        itemPath = $$eval($$itemPath)
-        itemSources = $$eval($$itemSources)
-        origSources = $$itemSources
-        !isEmpty(itemPath):!isEmpty(itemSources){
-            # only support deployment of "data" into a relative directory in tests directory
-            !contains(itemPath, "/"){
-                # as required by packaging system simplify the relative path for deployed data
-                itemPath = $$replace(itemPath, "\\./" , "")
-                itemSources = $$basename(itemSources)
-                !isEmpty(installtests.commands) : installtests.commands += $${NL}
-                installtests.commands += echo $$[QT_INSTALL_PREFIX]/tests/qtm/$${itemPath}/$${itemSources} >> \$(QTM_TEST_INSTALL_FILE) $${NL}
-                installtests.commands += $(CHK_DIR_EXISTS) \$(INSTALL_ROOT)$$[QT_INSTALL_PREFIX]/tests/qtm/$${itemPath} || \$(MKDIR) \$(INSTALL_ROOT)$$[QT_INSTALL_PREFIX]/tests/qtm/$${itemPath} $${NL}
-                installtests.commands += $(COPY_DIR) $$origSources \$(INSTALL_ROOT)$$[QT_INSTALL_PREFIX]/tests/qtm/$${itemPath}/$${itemSources}
-            }else{
-                error(in $$__PRO_FILE__ deployment rule $$deployItem is using absolute path)
-            }
-        }
-    }
-}
-
-
-QMAKE_EXTRA_TARGETS += installtests
-
diff --git a/src/harmattaninstalls/tests/qtm-maemo-auto.pro b/src/harmattaninstalls/tests/qtm-maemo-auto.pro
deleted file mode 100644
index 0dcbc693fe..0000000000
--- a/src/harmattaninstalls/tests/qtm-maemo-auto.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = subdirs
-
-include(libqtm-contacts-tests.pri)
-include(libqtm-feedback-tests.pri)
-include(libqtm-gallery-tests.pri)
-include(libqtm-location-tests.pri)
-include(libqtm-multimedia-tests.pri)
-include(libqtm-organizer-tests.pri)
-include(libqtm-sensors-tests.pri)
-include(libqtm-serviceframework-tests.pri)
-include(libqtm-systeminfo-tests.pri)
-include(libqtm-versit-tests.pri)
-
diff --git a/tests/auto/icheck/icheck.pro b/tests/auto/icheck/icheck.pro
index f0118d60f7..5840460606 100644
--- a/tests/auto/icheck/icheck.pro
+++ b/tests/auto/icheck/icheck.pro
@@ -40,3 +40,4 @@ SOURCES += tst_icheck.cpp \
 HEADERS += ../../../tools/icheck/parsemanager.h \
     ../../../tools/icheck/ichecklib.h
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/location.pro b/tests/auto/location.pro
index 38a9f126d6..f76cef359a 100644
--- a/tests/auto/location.pro
+++ b/tests/auto/location.pro
@@ -60,12 +60,12 @@ meego: {
                qgeosatelliteinfosource
 }
 
-!symbian{
+!symbian:!maemo*{
 SUBDIRS += qgeoserviceproviderplugins \
             qgeoserviceprovider 
 }
 
-!symbian:SUBDIRS +=qlandmarkmanagerplugins
+!symbian:!maemo*:SUBDIRS +=qlandmarkmanagerplugins
 
 contains(QT_CONFIG, declarative) {
     SUBDIRS += qdeclarativeposition
diff --git a/tests/auto/maemo6/qsystemnetworkinfo_maemo/qsystemnetworkinfo_maemo.pro b/tests/auto/maemo6/qsystemnetworkinfo_maemo/qsystemnetworkinfo_maemo.pro
index 19dde58718..4c2ea5ad3a 100644
--- a/tests/auto/maemo6/qsystemnetworkinfo_maemo/qsystemnetworkinfo_maemo.pro
+++ b/tests/auto/maemo6/qsystemnetworkinfo_maemo/qsystemnetworkinfo_maemo.pro
@@ -10,3 +10,5 @@ CONFIG += mobility
 MOBILITY = systeminfo
 
 QT += core dbus
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qabstractsecuritysession/qabstractsecuritysession.pro b/tests/auto/qabstractsecuritysession/qabstractsecuritysession.pro
index 299e9dac23..2f28825899 100644
--- a/tests/auto/qabstractsecuritysession/qabstractsecuritysession.pro
+++ b/tests/auto/qabstractsecuritysession/qabstractsecuritysession.pro
@@ -38,3 +38,5 @@ symbian|wince* {
     addFiles.path = plugins/xmldata
     DEPLOYMENT += addFiles
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qaudioinput/qaudioinput.pro b/tests/auto/qaudioinput/qaudioinput.pro
index 2e253513ef..5e7acd7c0d 100644
--- a/tests/auto/qaudioinput/qaudioinput.pro
+++ b/tests/auto/qaudioinput/qaudioinput.pro
@@ -18,3 +18,4 @@ QT += core
 CONFIG += mobility
 MOBILITY = multimedia
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qaudiooutput/qaudiooutput.pro b/tests/auto/qaudiooutput/qaudiooutput.pro
index 8ec0efc5aa..76fb85a82d 100644
--- a/tests/auto/qaudiooutput/qaudiooutput.pro
+++ b/tests/auto/qaudiooutput/qaudiooutput.pro
@@ -18,3 +18,4 @@ QT += core
 CONFIG += mobility
 MOBILITY = multimedia
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qcamera/qcamera.pro b/tests/auto/qcamera/qcamera.pro
index d7fb3671be..190d6a7b83 100644
--- a/tests/auto/qcamera/qcamera.pro
+++ b/tests/auto/qcamera/qcamera.pro
@@ -15,3 +15,5 @@ symbian {
     TARGET.CAPABILITY = ALL -TCB 
     TARGET.EPOCHEAPSIZE = 0x20000 0x3000000 
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qcamerabackend/qcamerabackend.pro b/tests/auto/qcamerabackend/qcamerabackend.pro
index 581a9ac629..b9d014fd29 100644
--- a/tests/auto/qcamerabackend/qcamerabackend.pro
+++ b/tests/auto/qcamerabackend/qcamerabackend.pro
@@ -15,3 +15,5 @@ symbian {
     TARGET.CAPABILITY = ALL -TCB
     TARGET.EPOCHEAPSIZE = 0x20000 0x3000000
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qcontactactions/qcontactactions.pro b/tests/auto/qcontactactions/qcontactactions.pro
index cc66122cd5..f77bda6d3f 100644
--- a/tests/auto/qcontactactions/qcontactactions.pro
+++ b/tests/auto/qcontactactions/qcontactactions.pro
@@ -1,3 +1,5 @@
+include(../../../staticconfig.pri)
+
 TEMPLATE=subdirs
 SUBDIRS += sendemailaction \
            multiaction \
diff --git a/tests/auto/qcontactactions/unittest/unittest.pro b/tests/auto/qcontactactions/unittest/unittest.pro
index 20eedb0580..9b71238b36 100644
--- a/tests/auto/qcontactactions/unittest/unittest.pro
+++ b/tests/auto/qcontactactions/unittest/unittest.pro
@@ -34,3 +34,5 @@ symbian: {
                         WriteDeviceData \
                         AllFiles \
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qcontactasync/qcontactasync.pro b/tests/auto/qcontactasync/qcontactasync.pro
index f337bf70e8..72aaf19308 100644
--- a/tests/auto/qcontactasync/qcontactasync.pro
+++ b/tests/auto/qcontactasync/qcontactasync.pro
@@ -1,3 +1,5 @@
-TEMPLATE=subdirs
+include(../../../staticconfig.pri)
+
+TEMPLATE = subdirs
 SUBDIRS += maliciousplugin \
            unittest
diff --git a/tests/auto/qcontactasync/unittest/unittest.pro b/tests/auto/qcontactasync/unittest/unittest.pro
index 8eae69986c..f5024f4e4c 100644
--- a/tests/auto/qcontactasync/unittest/unittest.pro
+++ b/tests/auto/qcontactasync/unittest/unittest.pro
@@ -36,3 +36,5 @@ symbian: {
     TARGET.CAPABILITY = ReadUserData \
                         WriteUserData
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qcontactmanager/qcontactmanager.pro b/tests/auto/qcontactmanager/qcontactmanager.pro
index 1ee98a5b44..43ba0bc294 100644
--- a/tests/auto/qcontactmanager/qcontactmanager.pro
+++ b/tests/auto/qcontactmanager/qcontactmanager.pro
@@ -41,3 +41,5 @@ symbian: {
         LIBS += -lcntmodel
     }
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qcontactmanagerdetails/qcontactmanagerdetails.pro b/tests/auto/qcontactmanagerdetails/qcontactmanagerdetails.pro
index 67c1b3b23c..b1ac976a9c 100644
--- a/tests/auto/qcontactmanagerdetails/qcontactmanagerdetails.pro
+++ b/tests/auto/qcontactmanagerdetails/qcontactmanagerdetails.pro
@@ -36,3 +36,5 @@ symbian: {
         LIBS += -lcntmodel
     }
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro b/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro
index 2924a1ed8e..989c554ec7 100644
--- a/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro
+++ b/tests/auto/qcontactmanagerfiltering/qcontactmanagerfiltering.pro
@@ -1,3 +1,5 @@
+include(../../../staticconfig.pri)
+
 TEMPLATE=subdirs
 SUBDIRS+=testactions \
          unittest
diff --git a/tests/auto/qcontactmanagerfiltering/testactions/testactions.pro b/tests/auto/qcontactmanagerfiltering/testactions/testactions.pro
index ac0dbe99bb..2be0e64929 100644
--- a/tests/auto/qcontactmanagerfiltering/testactions/testactions.pro
+++ b/tests/auto/qcontactmanagerfiltering/testactions/testactions.pro
@@ -1,2 +1,4 @@
+include(../../../../staticconfig.pri)
+
 TEMPLATE=subdirs
 SUBDIRS=booleanaction dateaction integeraction numberaction phonenumberaction
diff --git a/tests/auto/qcontactmanagerfiltering/unittest/unittest.pro b/tests/auto/qcontactmanagerfiltering/unittest/unittest.pro
index 0c992eeecb..b827014f9c 100644
--- a/tests/auto/qcontactmanagerfiltering/unittest/unittest.pro
+++ b/tests/auto/qcontactmanagerfiltering/unittest/unittest.pro
@@ -24,3 +24,5 @@ symbian: {
                         ReadDeviceData \
                         WriteDeviceData
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qcontactmanagerplugins/qcontactmanagerplugins.pro b/tests/auto/qcontactmanagerplugins/qcontactmanagerplugins.pro
index e1b2ddc2f3..8bd36ab05d 100644
--- a/tests/auto/qcontactmanagerplugins/qcontactmanagerplugins.pro
+++ b/tests/auto/qcontactmanagerplugins/qcontactmanagerplugins.pro
@@ -1,3 +1,5 @@
+include(../../../staticconfig.pri)
+
 TEMPLATE=subdirs
 SUBDIRS += dummyplugin \
             dummyplugincopy \
diff --git a/tests/auto/qcrmlparser/qcrmlparser.pro b/tests/auto/qcrmlparser/qcrmlparser.pro
index d1047a69d4..2a7136c5bd 100644
--- a/tests/auto/qcrmlparser/qcrmlparser.pro
+++ b/tests/auto/qcrmlparser/qcrmlparser.pro
@@ -21,3 +21,5 @@ wince*|symbian*: {
 }
 
 symbian:TARGET.CAPABILITY = ALL -TCB
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qdeclarativebatteryinfo/qdeclarativebatteryinfo.pro b/tests/auto/qdeclarativebatteryinfo/qdeclarativebatteryinfo.pro
index 26283c97e0..14202a841a 100644
--- a/tests/auto/qdeclarativebatteryinfo/qdeclarativebatteryinfo.pro
+++ b/tests/auto/qdeclarativebatteryinfo/qdeclarativebatteryinfo.pro
@@ -22,3 +22,5 @@ symbian {
 contains(test_use_sim, yes) {
 DEFINES += TESTR QT_SIMULATOR
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qdeclarativedisplayinfo/qdeclarativedisplayinfo.pro b/tests/auto/qdeclarativedisplayinfo/qdeclarativedisplayinfo.pro
index 288eeacfc9..62704e00fc 100644
--- a/tests/auto/qdeclarativedisplayinfo/qdeclarativedisplayinfo.pro
+++ b/tests/auto/qdeclarativedisplayinfo/qdeclarativedisplayinfo.pro
@@ -19,6 +19,9 @@ MOBILITY = systeminfo
 symbian {
     TARGET.CAPABILITY = All -TCB -DRM
 }
+
 contains(test_use_sim, yes) {
 DEFINES += TESTR QT_SIMULATOR
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qdeclarativefeedback/qdeclarativefeedback.pro b/tests/auto/qdeclarativefeedback/qdeclarativefeedback.pro
index 3aa8da4940..20b68f9ce3 100644
--- a/tests/auto/qdeclarativefeedback/qdeclarativefeedback.pro
+++ b/tests/auto/qdeclarativefeedback/qdeclarativefeedback.pro
@@ -25,3 +25,5 @@ OTHER_FILES += \
     data/themeeffect.qml \
     data/themeeffect2.qml \
     data/themeeffect3.qml
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qdeclarativelandmark/qdeclarativelandmark.pro b/tests/auto/qdeclarativelandmark/qdeclarativelandmark.pro
index 9b092eb4dd..26123e5406 100644
--- a/tests/auto/qdeclarativelandmark/qdeclarativelandmark.pro
+++ b/tests/auto/qdeclarativelandmark/qdeclarativelandmark.pro
@@ -52,3 +52,4 @@ symbian|wince* {
     DEFINES += SRCDIR=\\\"$$PWD\\\"
 }
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qdeclarativescreensaver/qdeclarativescreensaver.pro b/tests/auto/qdeclarativescreensaver/qdeclarativescreensaver.pro
index 4b6c5310f0..dcfbe9ac78 100644
--- a/tests/auto/qdeclarativescreensaver/qdeclarativescreensaver.pro
+++ b/tests/auto/qdeclarativescreensaver/qdeclarativescreensaver.pro
@@ -22,3 +22,5 @@ symbian {
 contains(test_use_sim, yes) {
 DEFINES += TESTR QT_SIMULATOR
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qfeedbackmmk/qfeedbackmmk.pro b/tests/auto/qfeedbackmmk/qfeedbackmmk.pro
index a0bf466c1e..f89366a0ce 100644
--- a/tests/auto/qfeedbackmmk/qfeedbackmmk.pro
+++ b/tests/auto/qfeedbackmmk/qfeedbackmmk.pro
@@ -20,3 +20,4 @@ QT += core
 CONFIG += mobility
 MOBILITY = feedback
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qfeedbackplugin/qfeedbackplugin.pro b/tests/auto/qfeedbackplugin/qfeedbackplugin.pro
index dde47f8cf6..050645a4db 100644
--- a/tests/auto/qfeedbackplugin/qfeedbackplugin.pro
+++ b/tests/auto/qfeedbackplugin/qfeedbackplugin.pro
@@ -1,3 +1,4 @@
+include(../../../staticconfig.pri)
 TEMPLATE=subdirs
 SUBDIRS += testplugin \
            unittest \
diff --git a/tests/auto/qgeoboundingcircle/qgeoboundingcircle.pro b/tests/auto/qgeoboundingcircle/qgeoboundingcircle.pro
index 0769018563..a77c4dd173 100644
--- a/tests/auto/qgeoboundingcircle/qgeoboundingcircle.pro
+++ b/tests/auto/qgeoboundingcircle/qgeoboundingcircle.pro
@@ -15,3 +15,5 @@ MOBILITY = location
 symbian {
     TARGET.CAPABILITY = ALL -TCB
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qgeomapcircleobject/qgeomapcircleobject.pro b/tests/auto/qgeomapcircleobject/qgeomapcircleobject.pro
index b51f074552..f1e12faa2d 100644
--- a/tests/auto/qgeomapcircleobject/qgeomapcircleobject.pro
+++ b/tests/auto/qgeomapcircleobject/qgeomapcircleobject.pro
@@ -22,3 +22,4 @@ symbian {
     TARGET.CAPABILITY = ALL -TCB
 }
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qgeomapobject/qgeomapobject.pro b/tests/auto/qgeomapobject/qgeomapobject.pro
index ae96c7df3d..f0206e77a5 100644
--- a/tests/auto/qgeomapobject/qgeomapobject.pro
+++ b/tests/auto/qgeomapobject/qgeomapobject.pro
@@ -22,3 +22,4 @@ symbian {
     TARGET.CAPABILITY = ALL -TCB
 }
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qgeomappixmapobject/qgeomappixmapobject.pro b/tests/auto/qgeomappixmapobject/qgeomappixmapobject.pro
index f3a923d156..a4e2833013 100644
--- a/tests/auto/qgeomappixmapobject/qgeomappixmapobject.pro
+++ b/tests/auto/qgeomappixmapobject/qgeomappixmapobject.pro
@@ -22,3 +22,4 @@ symbian {
     TARGET.CAPABILITY = ALL -TCB
 }
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qgeomaptextobject/qgeomaptextobject.pro b/tests/auto/qgeomaptextobject/qgeomaptextobject.pro
index 74e527cd9d..50edb668f5 100644
--- a/tests/auto/qgeomaptextobject/qgeomaptextobject.pro
+++ b/tests/auto/qgeomaptextobject/qgeomaptextobject.pro
@@ -22,3 +22,4 @@ symbian {
     TARGET.CAPABILITY = ALL -TCB
 }
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qgeopositioninfo/qgeopositioninfo.pro b/tests/auto/qgeopositioninfo/qgeopositioninfo.pro
index 5500e84428..48672dbccf 100644
--- a/tests/auto/qgeopositioninfo/qgeopositioninfo.pro
+++ b/tests/auto/qgeopositioninfo/qgeopositioninfo.pro
@@ -16,3 +16,4 @@ symbian {
         TARGET.CAPABILITY = ALL -TCB
 }
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro b/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro
index 06fb6c24d5..20814d7f05 100644
--- a/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro
+++ b/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro
@@ -24,3 +24,5 @@ symbian {
 
 CONFIG += middleware
 include(../../../features/deploy.pri)
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qgeosearchmanager/qgeosearchmanager.pro b/tests/auto/qgeosearchmanager/qgeosearchmanager.pro
index b214f5e616..5c02be663d 100644
--- a/tests/auto/qgeosearchmanager/qgeosearchmanager.pro
+++ b/tests/auto/qgeosearchmanager/qgeosearchmanager.pro
@@ -21,3 +21,5 @@ symbian {
     INCLUDEPATH += $${EPOCROOT}epoc32/include/osextensions
     TARGET.CAPABILITY = ALL -TCB
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qgeotiledmapdata/qgeotiledmapdata.pro b/tests/auto/qgeotiledmapdata/qgeotiledmapdata.pro
index 8d34eac8b9..2e5b052eb2 100644
--- a/tests/auto/qgeotiledmapdata/qgeotiledmapdata.pro
+++ b/tests/auto/qgeotiledmapdata/qgeotiledmapdata.pro
@@ -23,3 +23,4 @@ symbian {
   TARGET.CAPABILITY = ALL -TCB
 }
       
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
index 663cc2c1b3..749090e928 100644
--- a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
+++ b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
@@ -12,3 +12,4 @@ symbian: TARGET.CAPABILITY = ReadDeviceData WriteDeviceData
 CONFIG += mobility
 MOBILITY = multimedia
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qlandmarkfilehandler_lmx/qlandmarkfilehandler_lmx.pro b/tests/auto/qlandmarkfilehandler_lmx/qlandmarkfilehandler_lmx.pro
index b9ebcbddf8..e84fba2b2e 100644
--- a/tests/auto/qlandmarkfilehandler_lmx/qlandmarkfilehandler_lmx.pro
+++ b/tests/auto/qlandmarkfilehandler_lmx/qlandmarkfilehandler_lmx.pro
@@ -27,3 +27,5 @@ symbian {
     INCLUDEPATH += $${EPOCROOT}epoc32/include/osextensions
     TARGET.CAPABILITY = ALL -TCB
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qlandmarkmanager/qlandmarkmanager.pro b/tests/auto/qlandmarkmanager/qlandmarkmanager.pro
index 6f626b0ce1..ea79fffceb 100644
--- a/tests/auto/qlandmarkmanager/qlandmarkmanager.pro
+++ b/tests/auto/qlandmarkmanager/qlandmarkmanager.pro
@@ -52,3 +52,4 @@ symbian {
         DEPLOYMENT += addFiles
 }
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro b/tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro
index c2bdc103e5..4f9a09a529 100644
--- a/tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro
+++ b/tests/auto/qmediaplayerbackend/qmediaplayerbackend.pro
@@ -22,3 +22,4 @@ SOURCES += \
 CONFIG += mobility
 MOBILITY = multimedia
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qmediaplaylist/qmediaplaylist.pro b/tests/auto/qmediaplaylist/qmediaplaylist.pro
index c01f627472..be1f50d1e5 100644
--- a/tests/auto/qmediaplaylist/qmediaplaylist.pro
+++ b/tests/auto/qmediaplaylist/qmediaplaylist.pro
@@ -28,3 +28,4 @@ INCLUDEPATH += $$QT_MOBILITY_SOURCE_TREE/plugins/multimedia/m3u
 CONFIG += mobility
 MOBILITY = multimedia
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qmessagestore/qmessagestore.pro b/tests/auto/qmessagestore/qmessagestore.pro
index ff59703a69..31b9199038 100644
--- a/tests/auto/qmessagestore/qmessagestore.pro
+++ b/tests/auto/qmessagestore/qmessagestore.pro
@@ -51,3 +51,4 @@ symbian {
                         WriteDeviceData
 }
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qmessagestorekeys/qmessagestorekeys.pro b/tests/auto/qmessagestorekeys/qmessagestorekeys.pro
index d40127d244..856a93140d 100644
--- a/tests/auto/qmessagestorekeys/qmessagestorekeys.pro
+++ b/tests/auto/qmessagestorekeys/qmessagestorekeys.pro
@@ -51,3 +51,4 @@ symbian {
                         WriteDeviceData
 }
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro
index 6d0b030984..87bfbda06e 100644
--- a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro
+++ b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro
@@ -27,3 +27,4 @@ MOBILITY = connectivity
 
 DEFINES += SRCDIR=\\\"$$PWD/../nfcdata\\\"
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro
index ea18fccbb1..7fdc47b6a7 100644
--- a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro
+++ b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro
@@ -27,3 +27,4 @@ MOBILITY = connectivity
 
 DEFINES += SRCDIR=\\\"$$PWD/../nfcdata\\\"
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro
index e537f5ea35..ba7d3e3d89 100644
--- a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro
+++ b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro
@@ -27,3 +27,4 @@ MOBILITY = connectivity
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource.pro
index 71c1880d15..4ba2503f1f 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource.pro
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource.pro
@@ -1,3 +1,5 @@
+include(../../../staticconfig.pri)
+
 TEMPLATE = subdirs
 SUBDIRS += \
     dummynmeapositioninfosource.pro \
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic.pro
index 2c68129bae..592b8d0ed7 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic.pro
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic.pro
@@ -26,3 +26,4 @@ symbian {
         TARGET.CAPABILITY = ALL -TCB
 }
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic.pro
index 22f81587bd..8cf070ed7d 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic.pro
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic.pro
@@ -25,3 +25,4 @@ symbian {
         TARGET.CAPABILITY = ALL -TCB
 }
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qorganizeritemasync/qorganizeritemasync.pro b/tests/auto/qorganizeritemasync/qorganizeritemasync.pro
index f97e63a0c8..9c706a26f0 100644
--- a/tests/auto/qorganizeritemasync/qorganizeritemasync.pro
+++ b/tests/auto/qorganizeritemasync/qorganizeritemasync.pro
@@ -1,4 +1,4 @@
+include(../../../staticconfig.pri)
 TEMPLATE=subdirs
-# disabled because it's failing at the moment.
 SUBDIRS += \
            unittest
diff --git a/tests/auto/qorganizeritemasync/unittest/unittest.pro b/tests/auto/qorganizeritemasync/unittest/unittest.pro
index 6a4d37865a..9b46724001 100644
--- a/tests/auto/qorganizeritemasync/unittest/unittest.pro
+++ b/tests/auto/qorganizeritemasync/unittest/unittest.pro
@@ -23,3 +23,5 @@ symbian: {
     TARGET.CAPABILITY = ReadUserData \
                         WriteUserData
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qorganizermanager/qorganizermanager.pro b/tests/auto/qorganizermanager/qorganizermanager.pro
index 67e9622975..4322497526 100644
--- a/tests/auto/qorganizermanager/qorganizermanager.pro
+++ b/tests/auto/qorganizermanager/qorganizermanager.pro
@@ -22,3 +22,5 @@ symbian: {
     TARGET.CAPABILITY = ReadUserData \
                         WriteUserData
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qorganizermanagerdetails/qorganizermanagerdetails.pro b/tests/auto/qorganizermanagerdetails/qorganizermanagerdetails.pro
index 23a91e63f4..d9dc96ba03 100644
--- a/tests/auto/qorganizermanagerdetails/qorganizermanagerdetails.pro
+++ b/tests/auto/qorganizermanagerdetails/qorganizermanagerdetails.pro
@@ -22,3 +22,5 @@ symbian: {
     TARGET.CAPABILITY = ReadUserData \
                         WriteUserData
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qservicemanager/qservicemanager.pro b/tests/auto/qservicemanager/qservicemanager.pro
index d11bfe543d..fc57bd9ab3 100644
--- a/tests/auto/qservicemanager/qservicemanager.pro
+++ b/tests/auto/qservicemanager/qservicemanager.pro
@@ -41,3 +41,5 @@ symbian|wince* {
     addFiles.path = plugins/xmldata
     DEPLOYMENT += addFiles
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qservicemanager_ipc/client/client.pro b/tests/auto/qservicemanager_ipc/client/client.pro
index e0a52ae20c..99e0de48bd 100644
--- a/tests/auto/qservicemanager_ipc/client/client.pro
+++ b/tests/auto/qservicemanager_ipc/client/client.pro
@@ -17,3 +17,5 @@ HEADERS +=
 symbian {
     TARGET.CAPABILITY = ALL -TCB
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qservicemanager_ipc/qservicemanager_ipc.pro b/tests/auto/qservicemanager_ipc/qservicemanager_ipc.pro
index eb77dfe06c..96e3db4165 100644
--- a/tests/auto/qservicemanager_ipc/qservicemanager_ipc.pro
+++ b/tests/auto/qservicemanager_ipc/qservicemanager_ipc.pro
@@ -1,3 +1,4 @@
+include(../../../staticconfig.pri)
 TEMPLATE = subdirs
 SUBDIRS += client service
 
diff --git a/tests/auto/qservicemanager_ipc/service/service.pro b/tests/auto/qservicemanager_ipc/service/service.pro
index a7a5224940..822067c208 100644
--- a/tests/auto/qservicemanager_ipc/service/service.pro
+++ b/tests/auto/qservicemanager_ipc/service/service.pro
@@ -37,3 +37,4 @@ xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine igno
 INSTALLS += xml
 build_pass:ALL_DEPS+=install_xml
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qsoundeffect/qsoundeffect.pro b/tests/auto/qsoundeffect/qsoundeffect.pro
index 4b4d731056..432ddf8be9 100644
--- a/tests/auto/qsoundeffect/qsoundeffect.pro
+++ b/tests/auto/qsoundeffect/qsoundeffect.pro
@@ -31,3 +31,5 @@ unix:!mac:!symbian {
         DEFINES += QT_MULTIMEDIA_QMEDIAPLAYER
     }
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qsystembatteryinfo/qsystembatteryinfo.pro b/tests/auto/qsystembatteryinfo/qsystembatteryinfo.pro
index b7c4b0ac63..d97847d7c6 100644
--- a/tests/auto/qsystembatteryinfo/qsystembatteryinfo.pro
+++ b/tests/auto/qsystembatteryinfo/qsystembatteryinfo.pro
@@ -17,3 +17,5 @@ symbian {
 contains(test_use_sim, yes) {
     DEFINES += TESTR QT_SIMULATOR
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qsystemdisplayinfo/qsystemdisplayinfo.pro b/tests/auto/qsystemdisplayinfo/qsystemdisplayinfo.pro
index c1fef89308..c91164a8d7 100644
--- a/tests/auto/qsystemdisplayinfo/qsystemdisplayinfo.pro
+++ b/tests/auto/qsystemdisplayinfo/qsystemdisplayinfo.pro
@@ -13,6 +13,9 @@ MOBILITY = systeminfo
 symbian {
     TARGET.CAPABILITY = All -TCB -DRM
 }
+
 contains(test_use_sim, yes) {
 DEFINES += TESTR QT_SIMULATOR
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qvaluespacepublisher/qvaluespacepublisher.pro b/tests/auto/qvaluespacepublisher/qvaluespacepublisher.pro
index 4791fb2423..a729a09b8e 100644
--- a/tests/auto/qvaluespacepublisher/qvaluespacepublisher.pro
+++ b/tests/auto/qvaluespacepublisher/qvaluespacepublisher.pro
@@ -25,3 +25,6 @@ symbian {
 win32 {
     !wince*:LIBS += -ladvapi32
 }
+
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qvaluespacesubscriber/qvaluespacesubscriber.pro b/tests/auto/qvaluespacesubscriber/qvaluespacesubscriber.pro
index 2e5c23918a..17bedaea3c 100644
--- a/tests/auto/qvaluespacesubscriber/qvaluespacesubscriber.pro
+++ b/tests/auto/qvaluespacesubscriber/qvaluespacesubscriber.pro
@@ -1,3 +1,4 @@
+include(../../../staticconfig.pri)
 TEMPLATE = subdirs
 
 SUBDIRS = tst_qvaluespacesubscriber
diff --git a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.pro b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.pro
index bdae62f584..5623e03779 100644
--- a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.pro
+++ b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.pro
@@ -39,3 +39,5 @@ wince* {
     DEPLOYLACKEY.path = .
     DEPLOYMENT += DEPLOYLACKEY
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.pro b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.pro
index ed8c3601af..59619b50f0 100644
--- a/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.pro
+++ b/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.pro
@@ -33,3 +33,5 @@ wince* {
     DEPLOYLACKEY.path = .
     DEPLOYMENT += DEPLOYLACKEY
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qversit/qversit.pro b/tests/auto/qversit/qversit.pro
index c0cb3cb13f..21751770e6 100644
--- a/tests/auto/qversit/qversit.pro
+++ b/tests/auto/qversit/qversit.pro
@@ -43,3 +43,5 @@ symbian: {
     LIBS += -lws32 \
         -lbafl
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/qversitcontactplugins/qversitcontactplugins.pro b/tests/auto/qversitcontactplugins/qversitcontactplugins.pro
index cc636c9069..9200f3e0a3 100644
--- a/tests/auto/qversitcontactplugins/qversitcontactplugins.pro
+++ b/tests/auto/qversitcontactplugins/qversitcontactplugins.pro
@@ -1,3 +1,4 @@
+include(../../../staticconfig.pri)
 TEMPLATE=subdirs
 
 SUBDIRS+=plugin1
diff --git a/tests/auto/qvideowidget/qvideowidget.pro b/tests/auto/qvideowidget/qvideowidget.pro
index 26f331aad6..d04a18e723 100644
--- a/tests/auto/qvideowidget/qvideowidget.pro
+++ b/tests/auto/qvideowidget/qvideowidget.pro
@@ -9,3 +9,4 @@ SOURCES += tst_qvideowidget.cpp
 CONFIG += mobility
 MOBILITY = multimedia
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/servicedatabase/servicedatabase.pro b/tests/auto/servicedatabase/servicedatabase.pro
index be1b401e5e..4d99288d43 100644
--- a/tests/auto/servicedatabase/servicedatabase.pro
+++ b/tests/auto/servicedatabase/servicedatabase.pro
@@ -33,3 +33,5 @@ symbian {
 wince* {
     DEPLOYMENT_PLUGIN += qsqlite
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/auto/servicemetadata/servicemetadata.pro b/tests/auto/servicemetadata/servicemetadata.pro
index d6f61d247b..27cca95f48 100644
--- a/tests/auto/servicemetadata/servicemetadata.pro
+++ b/tests/auto/servicemetadata/servicemetadata.pro
@@ -30,3 +30,5 @@ symbian {
 
 CONFIG += mobility
 MOBILITY = serviceframework
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/benchmarks/contacts/contacts.pro b/tests/benchmarks/contacts/contacts.pro
index 3caf68dc30..da7d84fdd9 100644
--- a/tests/benchmarks/contacts/contacts.pro
+++ b/tests/benchmarks/contacts/contacts.pro
@@ -20,3 +20,4 @@ symbian: {
                         WriteUserData
 }
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/benchmarks/contactsoverhead/contactsoverhead.pro b/tests/benchmarks/contactsoverhead/contactsoverhead.pro
index 412a60d654..e78243d936 100644
--- a/tests/benchmarks/contactsoverhead/contactsoverhead.pro
+++ b/tests/benchmarks/contactsoverhead/contactsoverhead.pro
@@ -33,3 +33,5 @@ symbian {
 maemo {
     QT += dbus xml gui
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/benchmarks/messaging/messaging.pro b/tests/benchmarks/messaging/messaging.pro
index 06435c4918..a0e3fa9495 100644
--- a/tests/benchmarks/messaging/messaging.pro
+++ b/tests/benchmarks/messaging/messaging.pro
@@ -28,3 +28,5 @@ symbian {
 maemo {
     QT += dbus xml gui
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/benchmarks/organizer/organizer.pro b/tests/benchmarks/organizer/organizer.pro
index 175335fc00..15cd208ad1 100644
--- a/tests/benchmarks/organizer/organizer.pro
+++ b/tests/benchmarks/organizer/organizer.pro
@@ -21,3 +21,4 @@ symbian: {
                         WriteUserData
 }
 
+maemo*:CONFIG += insignificant_test
diff --git a/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.pro b/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.pro
index 1d3f578465..432c7825be 100644
--- a/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.pro
+++ b/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.pro
@@ -21,6 +21,7 @@ symbian {
     TARGET.CAPABILITY = ALL -TCB
 }
 
+maemo*:PLUGIN_TYPE=serviceframework
 xml.path = $$DESTDIR/xmldata
 xml.files = xml/bm_sampleservice.xml
 xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean
diff --git a/tests/benchmarks/versit/versit.pro b/tests/benchmarks/versit/versit.pro
index 1ba064aec7..2c11f62077 100644
--- a/tests/benchmarks/versit/versit.pro
+++ b/tests/benchmarks/versit/versit.pro
@@ -34,3 +34,5 @@ symbian: {
     LIBS += -lws32 \
         -lbafl
 }
+
+maemo*:CONFIG += insignificant_test
diff --git a/tests/btclient/btclient.pro b/tests/btclient/btclient.pro
index 77c34ac135..1a96b99ba7 100644
--- a/tests/btclient/btclient.pro
+++ b/tests/btclient/btclient.pro
@@ -1,3 +1,4 @@
+include(../../staticconfig.pri)
 TARGET = btclient
 CONFIG += link_pkgconfig
 PKGCONFIG += dbus-1
diff --git a/tests/contacts-tester/contacts-tester.pro b/tests/contacts-tester/contacts-tester.pro
index 025211c757..f2e2fc0bd8 100644
--- a/tests/contacts-tester/contacts-tester.pro
+++ b/tests/contacts-tester/contacts-tester.pro
@@ -20,3 +20,5 @@ INCLUDEPATH += . \
 # Input
 HEADERS += mainwindow.h
 SOURCES += main.cpp mainwindow.cpp
+
+maemo*:CONFIG += manual_test
diff --git a/tests/location-testing-tools/geoservicedemo/geoservicedemo.pro b/tests/location-testing-tools/geoservicedemo/geoservicedemo.pro
index ce845cb72e..a67697b8ab 100644
--- a/tests/location-testing-tools/geoservicedemo/geoservicedemo.pro
+++ b/tests/location-testing-tools/geoservicedemo/geoservicedemo.pro
@@ -46,3 +46,5 @@ symbian: {
                         ReadDeviceData \
                         WriteDeviceData
 }
+
+maemo*:CONFIG += manual_test
diff --git a/tests/location-testing-tools/location-testing-tools.pro b/tests/location-testing-tools/location-testing-tools.pro
index 0009ea6a42..96df8693cf 100644
--- a/tests/location-testing-tools/location-testing-tools.pro
+++ b/tests/location-testing-tools/location-testing-tools.pro
@@ -1,3 +1,4 @@
+include(../../staticconfig.pri)
 TEMPLATE = subdirs
 
 equals(QT_MAJOR_VERSION, 4):lessThan(QT_MINOR_VERSION, 7) {
diff --git a/tests/location-testing-tools/mapviewer/mapviewer.pro b/tests/location-testing-tools/mapviewer/mapviewer.pro
index 72ab7ba65a..8f41cc4f05 100644
--- a/tests/location-testing-tools/mapviewer/mapviewer.pro
+++ b/tests/location-testing-tools/mapviewer/mapviewer.pro
@@ -36,3 +36,5 @@ symbian: {
     TARGET.EPOCHEAPSIZE = 1048576 67108864
     TARGET.EPOCSTACKSIZE = 0xA000
 }
+
+maemo*:CONFIG += manual_test
diff --git a/tests/manual/qllcpserver/qllcpserver.pro b/tests/manual/qllcpserver/qllcpserver.pro
index ba4f500b46..e386f28d6d 100644
--- a/tests/manual/qllcpserver/qllcpserver.pro
+++ b/tests/manual/qllcpserver/qllcpserver.pro
@@ -13,3 +13,6 @@ CONFIG += mobility
 MOBILITY = connectivity
 
 symbian:TARGET.CAPABILITY = LocalServices
+
+# Prevent this test from being autorun on Maemo
+maemo*:CONFIG += manual_test
diff --git a/tests/manual/qllcpsocket/qllcpsocket.pro b/tests/manual/qllcpsocket/qllcpsocket.pro
index 369bbde4c6..4c4ed6b343 100644
--- a/tests/manual/qllcpsocket/qllcpsocket.pro
+++ b/tests/manual/qllcpsocket/qllcpsocket.pro
@@ -13,3 +13,6 @@ CONFIG += mobility
 MOBILITY = connectivity
 
 symbian:TARGET.CAPABILITY = LocalServices
+
+# Prevent this test from being autorun on Maemo
+maemo*:CONFIG += manual_test
diff --git a/tests/sampleserviceplugin/sampleserviceplugin.pro b/tests/sampleserviceplugin/sampleserviceplugin.pro
index aff185fa12..49909c7749 100644
--- a/tests/sampleserviceplugin/sampleserviceplugin.pro
+++ b/tests/sampleserviceplugin/sampleserviceplugin.pro
@@ -21,6 +21,7 @@ symbian {
     TARGET.CAPABILITY = ALL -TCB
 }
 
+maemo*:PLUGIN_TYPE=serviceframework
 xml.path = $$DESTDIR/xmldata
 xml.files = xml/sampleservice.xml
 xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean
diff --git a/tests/sampleserviceplugin2/sampleserviceplugin2.pro b/tests/sampleserviceplugin2/sampleserviceplugin2.pro
index 79d3737849..ba3527c6b2 100644
--- a/tests/sampleserviceplugin2/sampleserviceplugin2.pro
+++ b/tests/sampleserviceplugin2/sampleserviceplugin2.pro
@@ -21,6 +21,7 @@ symbian {
     TARGET.CAPABILITY = ALL -TCB
 }
 
+maemo*:PLUGIN_TYPE=serviceframework
 xml.path = $$DESTDIR/xmldata
 xml.files = xml/sampleservice2.xml
 xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean
diff --git a/tests/testservice2/testservice2.pro b/tests/testservice2/testservice2.pro
index 24fb20d7ec..bd77822763 100644
--- a/tests/testservice2/testservice2.pro
+++ b/tests/testservice2/testservice2.pro
@@ -21,7 +21,7 @@ symbian {
     TARGET.CAPABILITY = ALL -TCB
 }
 
-
+maemo*:PLUGIN_TYPE=serviceframework
 xml.path = $$DESTDIR/xmldata
 xml.files = xml/testserviceplugin.xml
 xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean