diff --git a/plugins/autotest/testtreemodel.cpp b/plugins/autotest/testtreemodel.cpp
index 2f7366b3793..49e28c3ba35 100644
--- a/plugins/autotest/testtreemodel.cpp
+++ b/plugins/autotest/testtreemodel.cpp
@@ -631,14 +631,10 @@ void TestTreeModel::processChildren(QModelIndex &parentIndex, const TestTreeItem
 
         // handle data tags - just remove old and add them
         if (modifiedChild->childCount() || toBeModifiedChild->childCount()) {
-            beginRemoveRows(child, 0, toBeModifiedChild->childCount());
             toBeModifiedChild->removeChildren();
-            endRemoveRows();
             const int count = modifiedChild->childCount();
-            beginInsertRows(child, 0, count);
             for (int childRow = 0; childRow < count; ++childRow)
                 toBeModifiedChild->appendChild(new TestTreeItem(*modifiedChild->childItem(childRow)));
-            endInsertRows();
         }
 
         if (checkStates.contains(toBeModifiedChild->name())) {
diff --git a/plugins/autotest/testvisitor.cpp b/plugins/autotest/testvisitor.cpp
index 3fe84cb0776..7102476a7d1 100644
--- a/plugins/autotest/testvisitor.cpp
+++ b/plugins/autotest/testvisitor.cpp
@@ -177,15 +177,14 @@ bool TestDataFunctionVisitor::visit(CPlusPlus::FunctionDefinitionAST *ast)
 {
     if (ast->declarator) {
         CPlusPlus::DeclaratorIdAST *id = ast->declarator->core_declarator->asDeclaratorId();
-        if (!id)
+        if (!id || !ast->symbol || ast->symbol->argumentCount() != 0)
             return false;
 
-        const QString prettyName = m_overview.prettyName(id->name->name);
+        CPlusPlus::LookupContext lc;
+        const QString prettyName = m_overview.prettyName(lc.fullyQualifiedName(ast->symbol));
         // do not handle functions that aren't real test data functions
-        if (!prettyName.endsWith(QLatin1String("_data")) || !ast->symbol
-                || ast->symbol->argumentCount() != 0) {
+        if (!prettyName.endsWith(QLatin1String("_data")))
             return false;
-        }
 
         m_currentFunction = prettyName.left(prettyName.size() - 5);
         m_currentTags.clear();