diff --git a/tests/ut_template/ut_template.cpp b/tests/ut_template/ut_template.cpp
index d609c885..224b9ca4 100644
--- a/tests/ut_template/ut_template.cpp
+++ b/tests/ut_template/ut_template.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (directui@nokia.com)
 **
-** This file is part of systemui.
+** This file is part of mhome.
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at directui@nokia.com.
@@ -16,16 +16,31 @@
 ** of this file.
 **
 ****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <MApplication>
 #include "ut_template.h"
 
-void Ut_Template::init()
+void Ut_Template::initTestCase()
 {
+    static int argc = 1;
+    static char *app_name[1] = { (char *) "./ut_template" };
+    app = new MApplication(argc, app_name);
+}
 
+void Ut_Template::cleanupTestCase()
+{
+    delete app;
 }
 
-void Ut_Template::cleanup()
+void Ut_Template::init()
 {
+//    m_subject = new Template();
+}
 
+void Ut_Template::cleanup()
+{
+//    delete m_subject;
 }
 
 QTEST_APPLESS_MAIN(Ut_Template)
diff --git a/tests/ut_template/ut_template.h b/tests/ut_template/ut_template.h
index 7d73758d..ee5b52b8 100644
--- a/tests/ut_template/ut_template.h
+++ b/tests/ut_template/ut_template.h
@@ -16,21 +16,35 @@
 ** of this file.
 **
 ****************************************************************************/
-#ifndef _UT_TEST_
-#define _UT_TEST_
 
-#include <QtTest/QtTest>
+#ifndef UT_TEMPLATE_H
+#define UT_TEMPLATE_H
+
 #include <QObject>
 
+class MApplication;
+//class Template;
+
 class Ut_Template : public QObject
 {
     Q_OBJECT
 
 private slots:
-    // Executed once before every test case
+    // Called before the first testfunction is executed
+    void initTestCase();
+    // Called after the last testfunction was executed
+    void cleanupTestCase();
+    // Called before each testfunction is executed
     void init();
-
-    // Executed once after every test case
+    // Called after every testfunction
     void cleanup();
+
+    // Test cases
+private:
+    // MApplication
+    MApplication *app;
+    // The object being tested
+//    Template *m_subject;
 };
-#endif //_UT_TEST_
+
+#endif