diff --git a/base/WindowTestCase.qml b/base/WindowTestCase.qml
index 7501e5e..7584e28 100644
--- a/base/WindowTestCase.qml
+++ b/base/WindowTestCase.qml
@@ -21,4 +21,12 @@ TestCase {
 
         visible: true
     }
+
+    function initTestCase() {
+        window.show()
+    }
+
+    function cleanupTestCase() {
+        window.close()
+    }
 }
diff --git a/tst_chatinfotoolbar.qml b/tst_chatinfotoolbar.qml
index 4f18564..d41740f 100644
--- a/tst_chatinfotoolbar.qml
+++ b/tst_chatinfotoolbar.qml
@@ -53,15 +53,6 @@ WindowTestCase {
         }
     }
 
-
-    function initTestCase() {
-        window.show()
-    }
-
-    function cleanupTestCase() {
-        window.close()
-    }
-
     function test_clickFunctions() {
         // Verify than signal exists
         verify(clickedSpy.valid, "Signal " + clickedSpy.signalName + "is not valid")
diff --git a/tst_choose_chat_name_modal.qml b/tst_choose_chat_name_modal.qml
index 122f299..b8858ae 100644
--- a/tst_choose_chat_name_modal.qml
+++ b/tst_choose_chat_name_modal.qml
@@ -72,15 +72,6 @@ WindowTestCase {
     }
 
 
-    function initTestCase() {
-        window.show()
-    }
-
-    function cleanupTestCase() {
-        window.close()
-    }
-
-
     function test_case_ChooseChatNameModal_height_width() {
 
         var genKeyModal = popupComponent.createObject(window)
diff --git a/tst_get_started_modal.qml b/tst_get_started_modal.qml
index cd44be2..8fcc4e7 100644
--- a/tst_get_started_modal.qml
+++ b/tst_get_started_modal.qml
@@ -26,17 +26,6 @@ WindowTestCase {
     }
 
 
-
-
-    function initTestCase() {
-        window.show()
-    }
-
-    function cleanupTestCase() {
-        window.close()
-    }
-
-
     function test_case1_BeforeGetStartedModal_height_width() {
 
         var beforeGetStartedModal = popupComponent.createObject(window)
diff --git a/tst_profile_popup.qml b/tst_profile_popup.qml
index 662ca32..4dd5101 100644
--- a/tst_profile_popup.qml
+++ b/tst_profile_popup.qml
@@ -36,14 +36,6 @@ WindowTestCase {
 
     ///////
 
-    function initTestCase() {
-        window.show()
-    }
-
-    function cleanupTestCase() {
-        window.close()
-    }
-
     function test_case1() {
         var propfilePopup = popupComponent.createObject(window)
         propfilePopup.openPopup(true, "Test user", "Some author", "", "bla bla test it bitch", "Nickname")
diff --git a/tst_statusButton.qml b/tst_statusButton.qml
index 4bc7377..53b9558 100644
--- a/tst_statusButton.qml
+++ b/tst_statusButton.qml
@@ -41,16 +41,6 @@ WindowTestCase {
     }
 
 
-
-    function initTestCase() {
-        window.show()
-    }
-
-    function cleanupTestCase() {
-        window.close()
-    }
-
-
     function test_case1_statusButton_clicked() {
 
         var statusButton = popupComponent.createObject(window)
diff --git a/tst_statusChatInfoButton.qml b/tst_statusChatInfoButton.qml
index b769eb5..6a1f166 100644
--- a/tst_statusChatInfoButton.qml
+++ b/tst_statusChatInfoButton.qml
@@ -36,16 +36,6 @@ WindowTestCase {
     }
 
 
-
-    function initTestCase() {
-        window.show()
-    }
-
-    function cleanupTestCase() {
-        window.close()
-    }
-
-
     function test_case1_statusChatInfoButton_clicked() {
 
         var statusChatInfoButton = popupComponent.createObject(window)
diff --git a/tst_statusexpandableitem.qml b/tst_statusexpandableitem.qml
index bcd88be..1a43ea5 100644
--- a/tst_statusexpandableitem.qml
+++ b/tst_statusexpandableitem.qml
@@ -25,14 +25,6 @@ WindowTestCase {
         }
     }
 
-    function initTestCase() {
-        window.show()
-    }
-
-    function cleanupTestCase() {
-        window.close()
-    }
-
     function test_expand() {
         verify(!expandableItem.expanded)
 
diff --git a/tst_statuslistitem.qml b/tst_statuslistitem.qml
index 537043e..16f8bd3 100644
--- a/tst_statuslistitem.qml
+++ b/tst_statuslistitem.qml
@@ -30,14 +30,6 @@ WindowTestCase {
         subTitle: "Subtitle"
     }
 
-    function initTestCase() {
-        window.show()
-    }
-
-    function cleanupTestCase() {
-        window.close()
-    }
-
     function test_clickFunctions() {
         // Verify than signal exists
         verify(clickedSpy.valid, "Signal " + clickedSpy.signalName + "is not valid")
diff --git a/ui-tests.pro b/ui-tests.pro
index bfa2655..04cb007 100644
--- a/ui-tests.pro
+++ b/ui-tests.pro
@@ -8,7 +8,7 @@ DEFINES += PROJECT_PATH=\"$${PWD}\"
 
 #DISTFILES += $$
 
-DISTFILES += $$files("$$PWD/*", true)
+DISTFILES += $$files("$$PWD/*.qml", true)
 
 QML_IMPORT_PATH += status-desktop/ui/StatusQ/src