=== modified file 'tests/unit/tst_components_benchmark/tst_components_benchmark.cpp'
--- tests/unit/tst_components_benchmark/tst_components_benchmark.cpp	2014-11-25 09:58:33 +0000
+++ tests/unit/tst_components_benchmark/tst_components_benchmark.cpp	2015-05-15 09:59:19 +0000
@@ -22,6 +22,7 @@
 
 #include <QDir>
 #include <QUrl>
+#include <ucnamespace.h>
 
 class tst_components_benchmark: public QObject
 {
@@ -32,7 +33,8 @@
         QTest::addColumn<QString>("fileName");
 
         QDir dir;
-        dir.setPath(UBUNTU_COMPONENT_PATH);
+        dir.setPath(QString("%1/%2.%3").arg(UBUNTU_COMPONENT_PATH).arg(MAJOR_VERSION(LATEST_UITK_VERSION)).arg(MINOR_VERSION(LATEST_UITK_VERSION)));
+        QVERIFY2(dir.exists(), qPrintable(dir.absolutePath()));
         QStringList nameFilters;
         nameFilters << "*.qml";
         dir.setNameFilters(nameFilters);
@@ -40,8 +42,7 @@
         dir.setSorting(QDir::Size | QDir::Reversed);
 
         QFileInfoList list = dir.entryInfoList();
-
-        qDebug() << "Found" << list.size() << "tests.";
+        QVERIFY2(list.size(), qPrintable(dir.absolutePath()));
 
         for (int i = 0; i < list.size(); ++i) {
             QFileInfo fileInfo = list.at(i);
@@ -52,8 +53,6 @@
     void benchmark_creation_components() {
         QFETCH(QString, fileName);
 
-        qDebug() << "Loading" << fileName;
-
         QQmlComponent component(&engine, fileName);
         QObject *obj = component.create();
         obj->deleteLater();
@@ -67,7 +66,8 @@
         QTest::addColumn<QString>("fileName");
 
         QDir dir;
-        dir.setPath(QString(UBUNTU_COMPONENT_PATH)+"/ListItems");
+        dir.setPath(QString("%1/ListItems/%2.%3").arg(UBUNTU_COMPONENT_PATH).arg(MAJOR_VERSION(LATEST_UITK_VERSION)).arg(MINOR_VERSION(LATEST_UITK_VERSION)));
+        QVERIFY2(dir.exists(), qPrintable(dir.absolutePath()));
         QStringList nameFilters;
         nameFilters << "*.qml";
         dir.setNameFilters(nameFilters);
@@ -75,8 +75,7 @@
         dir.setSorting(QDir::Size | QDir::Reversed);
 
         QFileInfoList list = dir.entryInfoList();
-
-        qDebug() << "Found" << list.size() << "tests.";
+        QVERIFY2(list.size(), qPrintable(dir.absolutePath()));
 
         for (int i = 0; i < list.size(); ++i) {
             QFileInfo fileInfo = list.at(i);
@@ -87,8 +86,6 @@
     void benchmark_creation_listitems() {
         QFETCH(QString, fileName);
 
-        qDebug() << "Loading" << fileName;
-
         QQmlComponent component(&engine, fileName);
         QObject *obj = component.create();
         obj->deleteLater();