diff --git a/file_templates/CMakeLists.txt b/file_templates/CMakeLists.txt
--- a/file_templates/CMakeLists.txt
+++ b/file_templates/CMakeLists.txt
@@ -12,7 +12,7 @@
     testing/cpp_cpputest
     testing/cpp_gtest
     testing/cpp_qtestlib
-    testing/cpp_qtestlib_kde
+    testing/cpp_qtestlib_guiless
     testing/cpp_qtestlib_kdevelop
     testing/python_pyunit
     testing/php_phpunit
diff --git a/file_templates/testing/cpp_qtestlib_kde/class.h b/file_templates/testing/cpp_qtestlib_guiless/class.h
rename from file_templates/testing/cpp_qtestlib_kde/class.h
rename to file_templates/testing/cpp_qtestlib_guiless/class.h
--- a/file_templates/testing/cpp_qtestlib_kde/class.h
+++ b/file_templates/testing/cpp_qtestlib_guiless/class.h
@@ -11,6 +11,7 @@
 
 class {{ name }} : public QObject
 {
+    Q_OBJECT
 private slots:
     void initTestCase();
     void cleanupTestCase();
diff --git a/file_templates/testing/cpp_qtestlib_kde/class.cpp b/file_templates/testing/cpp_qtestlib_guiless/class.cpp
rename from file_templates/testing/cpp_qtestlib_kde/class.cpp
rename to file_templates/testing/cpp_qtestlib_guiless/class.cpp
--- a/file_templates/testing/cpp_qtestlib_kde/class.cpp
+++ b/file_templates/testing/cpp_qtestlib_guiless/class.cpp
@@ -1,40 +1,40 @@
 {% load kdev_filters %}
 {% include "license_header_cpp.txt" %}
 
-
 #include "{{ output_file_header }}"
 
+#include <QTest>
 
 QTEST_GUILESS_MAIN({{ name }});
 
 
-void {{ name }}::initTestCase()
+void {{name}}::initTestCase()
 {
     // Called before the first testfunction is executed
 }
 
 
-void {{ name }}::cleanupTestCase()
+void {{name}}::cleanupTestCase()
 {
     // Called after the last testfunction was executed
 }
 
 
-void {{ name }}::init()
+void {{name}}::init()
 {
     // Called before each testfunction is executed
 }
 
 
-void {{ name }}::cleanup()
+void {{name}}::cleanup()
 {
     // Called after every testfunction
 }
 
 
 {% for case in testCases %}
 
-void {{ name }}::{{ case }}()
+void {{name}}::{{ case }}()
 {
 
 
diff --git a/file_templates/testing/cpp_qtestlib_guiless/cpp_qtestlib_guiless.desktop b/file_templates/testing/cpp_qtestlib_guiless/cpp_qtestlib_guiless.desktop
new file mode 100644
--- /dev/null
+++ b/file_templates/testing/cpp_qtestlib_guiless/cpp_qtestlib_guiless.desktop
@@ -0,0 +1,117 @@
+[General]
+Name=Test Suite for GUI-less code
+Comment=A unit test suite for GUI-less code using the QTest library without a graphical user interface
+Category=C++/Qt
+Language=C++
+Language[bs]=C++
+Language[ca]=C++
+Language[ca@valencia]=C++
+Language[cs]=C++
+Language[da]=C++
+Language[de]=C++
+Language[el]=C++
+Language[en_GB]=C++
+Language[es]=C++
+Language[et]=C++
+Language[fi]=C++
+Language[fr]=C++
+Language[ga]=C++
+Language[gl]=C++
+Language[hu]=C++
+Language[it]=C++
+Language[kk]=C++
+Language[mr]=C++
+Language[nb]=C++
+Language[nds]=C++
+Language[nl]=C++
+Language[nn]=C++
+Language[pl]=C++
+Language[pt]=C++
+Language[pt_BR]=C++
+Language[ru]=C++
+Language[se]=C++
+Language[sk]=C++
+Language[sl]=C++
+Language[sv]=C++
+Language[tr]=C++
+Language[ug]=C++
+Language[uk]=C++
+Language[x-test]=xxC++xx
+Language[zh_CN]=C++
+Language[zh_TW]=C++
+Type=Test
+Files=Header,Implementation
+
+[Header]
+Name=Header
+Name[bs]=Zaglavlje
+Name[ca]=Capçalera
+Name[ca@valencia]=Capçalera
+Name[da]=Header
+Name[de]=Header
+Name[el]=Header
+Name[en_GB]=Header
+Name[es]=Cabecera
+Name[et]=Päis
+Name[fi]=Otsikkotiedosto
+Name[fr]=En-tête
+Name[gl]=Cabeceira
+Name[hu]=Fejléc
+Name[it]=Intestazione
+Name[kk]=Айдар
+Name[mr]=हेडर
+Name[nb]=Hode
+Name[nl]=Kop
+Name[pl]=Nagłówek
+Name[pt]=Inclusão
+Name[pt_BR]=Cabeçalho
+Name[ru]=Заголовок
+Name[sk]=Hlavička
+Name[sl]=Glava
+Name[sv]=Deklaration
+Name[tr]=Başlık
+Name[ug]=بەت قېشى
+Name[uk]=Заголовок
+Name[x-test]=xxHeaderxx
+Name[zh_CN]=头文件
+Name[zh_TW]=標頭
+File=class.h
+OutputFile={{ name }}.h
+
+[Implementation]
+Name=Implementation
+Name[bs]=Implementacija
+Name[ca]=Implementació
+Name[ca@valencia]=Implementació
+Name[cs]=Implementace
+Name[da]=Implementering
+Name[de]=Implementation
+Name[el]=Υλοποίηση
+Name[en_GB]=Implementation
+Name[es]=Implementación
+Name[et]=Teostus
+Name[fi]=Toteutus
+Name[fr]=Implémentation
+Name[gl]=Implementación
+Name[hu]=Megvalósítás
+Name[it]=Implementazione
+Name[kk]=Іске асыруы
+Name[nb]=Implementering
+Name[nds]=Ümsetten
+Name[nl]=Implementatie
+Name[pl]=Implementacja
+Name[pt]=Implementação
+Name[pt_BR]=Implementação
+Name[ru]=Реализация
+Name[sk]=Implementácia
+Name[sl]=Izvedba
+Name[sv]=Implementering
+Name[tr]=Gerçekleme
+Name[ug]=ئەمەلگە ئاشۇرۇش
+Name[uk]=Реалізація
+Name[x-test]=xxImplementationxx
+Name[zh_CN]=实现
+Name[zh_TW]=實作
+File=class.cpp
+OutputFile={{ name }}.cpp
+
diff --git a/file_templates/testing/cpp_qtestlib_kde/cpp_qtestlib_kde.desktop b/file_templates/testing/cpp_qtestlib_kde/cpp_qtestlib_kde.desktop
deleted file mode 100644
--- a/file_templates/testing/cpp_qtestlib_kde/cpp_qtestlib_kde.desktop
+++ /dev/null
@@ -1,176 +0,0 @@
-[General]
-Name=QTestLib with KDE
-Name[bs]=QTestLib s KDE
-Name[ca]=QTestLib amb KDE
-Name[ca@valencia]=QTestLib amb KDE
-Name[da]=QTestLib med KDE
-Name[de]=QTestLib mit KDE
-Name[el]=QTestLib με KDE
-Name[en_GB]=QTestLib with KDE
-Name[es]=QTestLib con KDE
-Name[et]=QTestLib KDE-ga
-Name[fi]=QTestLib KDE:n kanssa
-Name[fr]=QTestLib avec KDE
-Name[gl]=QTestLib con KDE
-Name[hu]=QTestLib KDE-vel
-Name[it]=QTestLib con KDE
-Name[kk]=KDE QTestLib
-Name[nb]=QTestLib med KDE
-Name[nds]=QTestLib mit KDE
-Name[nl]=QTestLib met KDE
-Name[pl]=QTestLib z KDE
-Name[pt]=QTestLib com o KDE
-Name[pt_BR]=QTestLib com o KDE
-Name[ru]=QTestLib с KDE
-Name[sk]=QTestLib s KDE
-Name[sl]=QTestLib s KDE
-Name[sv]=QTest-bibliotek med KDE
-Name[tr]=QTestLib ve KDE
-Name[uk]=QTestLib з KDE
-Name[x-test]=xxQTestLib with KDExx
-Name[zh_CN]=带有 KDE 的 QTestLib
-Name[zh_TW]=QTestLib 含 KDE 延伸
-Comment=A unit test using the QTest library with KDE extensions
-Comment[bs]=Test jedinica koristeći QTest biblioteku s KDE proširenjima
-Comment[ca]=Una prova unitària utilitzant la biblioteca QTest amb les extensions del KDE
-Comment[ca@valencia]=Una prova unitària utilitzant la biblioteca QTest amb les extensions del KDE
-Comment[da]=En unittest-suite som bruger biblioteket QTest med udvidelser til KDE
-Comment[de]=Eine Unit-Test-Suite, die die QTest-Bibliothek mit KDE-Erweiterungen verwendet
-Comment[el]=Ένα unit test με χρήση βιβλιοθήκης QTest και επεκτάσεις KDE
-Comment[en_GB]=A unit test using the QTest library with KDE extensions
-Comment[es]=Una prueba unitaria que usa la biblioteca QTest con extensiones de KDE
-Comment[et]=Ühiktest QTesti teegi abil KDE laiendustega
-Comment[fi]=Yksikkötesti, joka käyttää QTest-kirjastoa KDE-laajennuksien kanssa
-Comment[fr]=Un test unitaire utilisant la bibliothèque QTest avec des extensions KDE
-Comment[gl]=Unha probas de unidades que emprega a biblioteca QTest con extensións para KDE
-Comment[hu]=Egy egységteszt a QTest könyvtár használatával KDE kiterjesztésekkel
-Comment[it]=Un unit test che usa la libreria QTest con le estensioni di KDE
-Comment[kk]=KDE кеңейтулі QTest жиын файлын қолданатын модуль сынақ дестесі
-Comment[nb]=En enhetstest som bruker QTest-biblioteket med KDE-utvidelser
-Comment[nl]=Een test van een eenheid met gebruik van de QTest-bibliotheek met KDE-extensies
-Comment[pl]=Jednostka zestawu testowego wykorzystująca bibliotekę QTest z rozszerzeniami KDE
-Comment[pt]=Um teste unitário, usando a biblioteca QTest, com as extensões do KDE
-Comment[pt_BR]=Teste unitário que usa a biblioteca QTest com as extensões do KDE
-Comment[ru]=Модульный тест на базе библиотеки QTest с расширениями KDE
-Comment[sk]=Unit test pomocou knižnice QTest s KDE rozšíreniami
-Comment[sl]=Preizkus enot z uporabo knjižnice QTest z razširitvami za KDE
-Comment[sv]=En enhetstest som använder QTest-biblioteket med KDE-utökningar
-Comment[tr]=QTest kitaplığını KDE eklentileriyle kullanan birim testi
-Comment[uk]=Перевірка модулів за допомогою бібліотеки QTest з розширеннями KDE
-Comment[x-test]=xxA unit test using the QTest library with KDE extensionsxx
-Comment[zh_CN]=一个使用带有 KDE 扩展的 QTest 库的单元测试
-Comment[zh_TW]=單元測試套件，用 QTest 函式庫，含 KDE 延伸
-Category=C++/KDE
-Language=C++
-Language[bs]=C++
-Language[ca]=C++
-Language[ca@valencia]=C++
-Language[cs]=C++
-Language[da]=C++
-Language[de]=C++
-Language[el]=C++
-Language[en_GB]=C++
-Language[es]=C++
-Language[et]=C++
-Language[fi]=C++
-Language[fr]=C++
-Language[ga]=C++
-Language[gl]=C++
-Language[hu]=C++
-Language[it]=C++
-Language[kk]=C++
-Language[mr]=C++
-Language[nb]=C++
-Language[nds]=C++
-Language[nl]=C++
-Language[nn]=C++
-Language[pl]=C++
-Language[pt]=C++
-Language[pt_BR]=C++
-Language[ru]=C++
-Language[se]=C++
-Language[sk]=C++
-Language[sl]=C++
-Language[sv]=C++
-Language[tr]=C++
-Language[ug]=C++
-Language[uk]=C++
-Language[x-test]=xxC++xx
-Language[zh_CN]=C++
-Language[zh_TW]=C++
-Type=Test
-Files=Header,Implementation
-
-[Header]
-Name=Header
-Name[bs]=Zaglavlje
-Name[ca]=Capçalera
-Name[ca@valencia]=Capçalera
-Name[da]=Header
-Name[de]=Header
-Name[el]=Header
-Name[en_GB]=Header
-Name[es]=Cabecera
-Name[et]=Päis
-Name[fi]=Otsikkotiedosto
-Name[fr]=En-tête
-Name[gl]=Cabeceira
-Name[hu]=Fejléc
-Name[it]=Intestazione
-Name[kk]=Айдар
-Name[mr]=हेडर
-Name[nb]=Hode
-Name[nl]=Kop
-Name[pl]=Nagłówek
-Name[pt]=Inclusão
-Name[pt_BR]=Cabeçalho
-Name[ru]=Заголовок
-Name[sk]=Hlavička
-Name[sl]=Glava
-Name[sv]=Deklaration
-Name[tr]=Başlık
-Name[ug]=بەت قېشى
-Name[uk]=Заголовок
-Name[x-test]=xxHeaderxx
-Name[zh_CN]=头文件
-Name[zh_TW]=標頭
-File=class.h
-OutputFile={{ name }}.h
-
-[Implementation]
-Name=Implementation
-Name[bs]=Implementacija
-Name[ca]=Implementació
-Name[ca@valencia]=Implementació
-Name[cs]=Implementace
-Name[da]=Implementering
-Name[de]=Implementation
-Name[el]=Υλοποίηση
-Name[en_GB]=Implementation
-Name[es]=Implementación
-Name[et]=Teostus
-Name[fi]=Toteutus
-Name[fr]=Implémentation
-Name[gl]=Implementación
-Name[hu]=Megvalósítás
-Name[it]=Implementazione
-Name[kk]=Іске асыруы
-Name[nb]=Implementering
-Name[nds]=Ümsetten
-Name[nl]=Implementatie
-Name[pl]=Implementacja
-Name[pt]=Implementação
-Name[pt_BR]=Implementação
-Name[ru]=Реализация
-Name[sk]=Implementácia
-Name[sl]=Izvedba
-Name[sv]=Implementering
-Name[tr]=Gerçekleme
-Name[ug]=ئەمەلگە ئاشۇرۇش
-Name[uk]=Реалізація
-Name[x-test]=xxImplementationxx
-Name[zh_CN]=实现
-Name[zh_TW]=實作
-File=class.cpp
-OutputFile={{ name }}.cpp
-