diff --git a/language/codegen/tests/data/kdevcodegentest/templates/test_options/test_options.desktop b/language/codegen/tests/data/kdevcodegentest/templates/test_options/test_options.desktop
index a1b00fddb..7fe92f88a 100644
--- a/language/codegen/tests/data/kdevcodegentest/templates/test_options/test_options.desktop
+++ b/language/codegen/tests/data/kdevcodegentest/templates/test_options/test_options.desktop
@@ -1,11 +1,11 @@
 [General]
 Name=Options Test Template
 Comment=
-Category=Foo/Bar
+Category=Testing/Bar
 Files=Template
 OptionsFile=options.kcfg
 
 [Template]
 Name=Template
 File=template.txt
 OutputFile=output.txt
diff --git a/language/codegen/tests/test_templatesmodel.cpp b/language/codegen/tests/test_templatesmodel.cpp
index 04b155ed4..a614c1e78 100644
--- a/language/codegen/tests/test_templatesmodel.cpp
+++ b/language/codegen/tests/test_templatesmodel.cpp
@@ -1,89 +1,88 @@
 /* 
  * This file is part of KDevelop
  * Copyright 2012 Miha Čančula <miha@noughmad.eu>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "test_templatesmodel.h"
 #include "codegen_tests_config.h"
 
 #include <language/codegen/templatesmodel.h>
 #include <tests/testcore.h>
 #include <tests/autotestshell.h>
 
 using namespace KDevelop;
 
 void TestTemplatesModel::initTestCase()
 {
     // avoid translated desktop entries, tests use untranslated strings
     QLocale::setDefault(QLocale::c());
     AutoTestShell::init();
     TestCore::initialize(Core::NoUi);
 
     model = new TemplatesModel(QStringLiteral("kdevcodegentest"), this);
     model->addDataPath(QStringLiteral(CODEGEN_TESTS_DATA_DIR) + "/");
     model->refresh();
 }
 
 void TestTemplatesModel::cleanupTestCase()
 {
     delete model;
     TestCore::shutdown();
 }
 
 void TestTemplatesModel::descriptionExtraction()
 {
     QCOMPARE(model->rowCount(), 1);
     QModelIndex testingCategoryIndex = model->index(0, 0);
-    QCOMPARE(model->rowCount(testingCategoryIndex), 2);
+    QCOMPARE(model->rowCount(testingCategoryIndex), 3);
 
-    for (int i = 0; i < 2; ++i)
-    {
+    for (int i = 0; i < 3; ++i) {
         QModelIndex languageCategoryIndex = model->index(i, 0, testingCategoryIndex);
         QCOMPARE(model->rowCount(languageCategoryIndex), 1);
         QModelIndex templateIndex = model->index(0, 0, languageCategoryIndex);
         QCOMPARE(model->rowCount(templateIndex), 0);
     }
 }
 
 void TestTemplatesModel::descriptionParsing()
 {
     QList<QStandardItem*> items = model->findItems(QStringLiteral("Testing YAML template"), Qt::MatchRecursive);
     QCOMPARE(items.size(), 1);
     QStandardItem* item = items.first();
 
     QCOMPARE(item->data(TemplatesModel::CommentRole).toString(), QStringLiteral("Describes a class using YAML syntax"));
     QVERIFY(item->data(TemplatesModel::IconNameRole).toString().isEmpty());
 
     QString descriptionFile = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/kdevcodegentest/template_descriptions/test_yaml.desktop";
 
     QVERIFY(QFile::exists(descriptionFile));
     QCOMPARE(item->data(TemplatesModel::DescriptionFileRole).toString(), descriptionFile);
 }
 
 void TestTemplatesModel::templateIndexes()
 {
     QModelIndexList indexes = model->templateIndexes(QStringLiteral("test_yaml.tar.bz2"));
     QCOMPARE(indexes.size(), 3);
 
     QCOMPARE(model->data(indexes[0]).toString(), QStringLiteral("Testing"));
     QCOMPARE(model->data(indexes[1]).toString(), QStringLiteral("YAML"));
     QCOMPARE(model->data(indexes[2]).toString(), QStringLiteral("Testing YAML template"));
 }
 
 
 QTEST_GUILESS_MAIN(TestTemplatesModel)