Remove TESTED_CLASS/TESTED_FILES comments from tests.

These comments were mostly empty or inaccurate.  Appropriate naming of
tests and appropriate placement of tests within the directory tree
provide more reliable indicators of what is being tested.

Change-Id: Ib6bf373d9e79917e4ab1417ee5c1264a2c2d7027
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

84 files changed, 0 insertions, 255 deletions

diff --git a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp
index 736b4d20ff..4c111a88d4 100644
--- a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp
+++ b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp
@@ -45,9 +45,6 @@
 #include <QtCore/qsequentialanimationgroup.h>
 #include <QtCore/qparallelanimationgroup.h>
 
-//TESTED_CLASS=QAnimationGroup
-//TESTED_FILES=
-
 Q_DECLARE_METATYPE(QAbstractAnimation::State)
 
 class tst_QAnimationGroup : public QObject
diff --git a/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
index 95524830e8..e091666c2a 100644
--- a/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
+++ b/tests/auto/corelib/animation/qparallelanimationgroup/tst_qparallelanimationgroup.cpp
@@ -43,9 +43,6 @@
 
 #include <QtCore/qparallelanimationgroup.h>
 
-//TESTED_CLASS=QParallelAnimationGroup
-//TESTED_FILES=
-
 Q_DECLARE_METATYPE(QAbstractAnimation::State)
 
 class tst_QParallelAnimationGroup : public QObject
diff --git a/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp b/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp
index b01cfcccce..ffd4ce47e1 100644
--- a/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp
+++ b/tests/auto/corelib/animation/qpauseanimation/tst_qpauseanimation.cpp
@@ -47,9 +47,6 @@
 
 #include <private/qabstractanimation_p.h>
 
-//TESTED_CLASS=QPauseAnimation
-//TESTED_FILES=
-
 #ifdef Q_OS_WIN
 static const char winTimerError[] = "On windows, consistent timing is not working properly due to bad timer resolution";
 #endif
diff --git a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
index 1ac4063f67..51b7359980 100644
--- a/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
+++ b/tests/auto/corelib/animation/qpropertyanimation/tst_qpropertyanimation.cpp
@@ -44,9 +44,6 @@
 #include <QtCore/qvariantanimation.h>
 #include <QtWidgets/qwidget.h>
 
-//TESTED_CLASS=QPropertyAnimation
-//TESTED_FILES=
-
 class UncontrolledAnimation : public QPropertyAnimation
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
index 362cd305c6..c7a996444f 100644
--- a/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
+++ b/tests/auto/corelib/animation/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp
@@ -43,9 +43,6 @@
 #include <QtCore/qanimationgroup.h>
 #include <QtCore/qsequentialanimationgroup.h>
 
-//TESTED_CLASS=QSequentialAnimationGroup
-//TESTED_FILES=
-
 Q_DECLARE_METATYPE(QAbstractAnimation::State)
 Q_DECLARE_METATYPE(QAbstractAnimation*)
 
diff --git a/tests/auto/corelib/codecs/utf8/tst_utf8.cpp b/tests/auto/corelib/codecs/utf8/tst_utf8.cpp
index 3031089ac4..f6726c3281 100644
--- a/tests/auto/corelib/codecs/utf8/tst_utf8.cpp
+++ b/tests/auto/corelib/codecs/utf8/tst_utf8.cpp
@@ -43,9 +43,6 @@
 #include <qtextcodec.h>
 #include <qsharedpointer.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 static const char utf8bom[] = "\xEF\xBB\xBF";
 
 class tst_Utf8 : public QObject
diff --git a/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp b/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp
index c318a7391b..1dc35ceeb1 100644
--- a/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp
+++ b/tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp
@@ -57,9 +57,6 @@ using namespace QtConcurrent;
 #  undef interface
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QFuture: public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp b/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp
index cb0ee29017..f440e4eaa5 100644
--- a/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp
+++ b/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp
@@ -44,9 +44,6 @@
 
 #include <qglobal.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=corelib/global/qglobal.h corelib/global/qglobal.cpp
-
 class tst_QGetPutEnv : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/corelib/io/qbuffer/tst_qbuffer.cpp b/tests/auto/corelib/io/qbuffer/tst_qbuffer.cpp
index 296fa446b0..e2d422ad54 100644
--- a/tests/auto/corelib/io/qbuffer/tst_qbuffer.cpp
+++ b/tests/auto/corelib/io/qbuffer/tst_qbuffer.cpp
@@ -44,9 +44,6 @@
 #include <QBuffer>
 #include <QByteArray>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QBuffer : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
index 00cb43effe..3d3f5b4a97 100644
--- a/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
+++ b/tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp
@@ -45,9 +45,6 @@
 Q_DECLARE_METATYPE(QBitArray)
 Q_DECLARE_METATYPE(qint64)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QDataStream : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/corelib/io/qdir/tst_qdir.cpp b/tests/auto/corelib/io/qdir/tst_qdir.cpp
index e6592a1174..5b48f9da00 100644
--- a/tests/auto/corelib/io/qdir/tst_qdir.cpp
+++ b/tests/auto/corelib/io/qdir/tst_qdir.cpp
@@ -67,9 +67,6 @@
 #define Q_NO_SYMLINKS
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QDir : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
index e331d09b64..8a7f1747b4 100644
--- a/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
+++ b/tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp
@@ -59,9 +59,6 @@
 Q_DECLARE_METATYPE(QDirIterator::IteratorFlags)
 Q_DECLARE_METATYPE(QDir::Filters)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QDirIterator : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/io/qfile/tst_qfile.cpp b/tests/auto/corelib/io/qfile/tst_qfile.cpp
index 07f6b44a4d..90cd1aedb9 100644
--- a/tests/auto/corelib/io/qfile/tst_qfile.cpp
+++ b/tests/auto/corelib/io/qfile/tst_qfile.cpp
@@ -96,9 +96,6 @@
 
 Q_DECLARE_METATYPE(QFile::FileError)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QFile : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
index 81b4c1bb12..c3979fce15 100644
--- a/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
+++ b/tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
@@ -73,9 +73,6 @@ QT_BEGIN_NAMESPACE
 extern Q_AUTOTEST_EXPORT bool qIsLikelyToBeNfs(int /* handle */);
 QT_END_NAMESPACE
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QFileInfo : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp b/tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp
index 27d30be5b0..e8a7e945c3 100644
--- a/tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp
+++ b/tests/auto/corelib/io/qfilesystementry/tst_qfilesystementry.cpp
@@ -43,9 +43,6 @@
 
 #include <QtCore/private/qfilesystementry_p.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QFileSystemEntry : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
index 58198f85fa..b9840bdb75 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
+++ b/tests/auto/corelib/io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp
@@ -52,9 +52,6 @@
 # endif
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QFileSystemWatcher : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
index c3d4e54c37..a67289f2a1 100644
--- a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
+++ b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
@@ -45,9 +45,6 @@
 
 #include "../../../network-settings.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QIODevice : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 1388627325..2c96339737 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -66,8 +66,6 @@
 #define QSETTINGS_P_H_VERSION 1
 #endif
 
-//TESTED_FILES=
-
 QT_FORWARD_DECLARE_CLASS(QSettings)
 QT_FORWARD_DECLARE_CLASS(QSettings)
 
diff --git a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
index be0c85e380..66fb8bbbf9 100644
--- a/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
+++ b/tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp
@@ -53,9 +53,6 @@
 #define Q_XDG_PLATFORM
 #endif
 
-//TESTED_CLASS=QStandardPaths
-//TESTED_FILES=qstandardpaths.cpp
-
 class tst_qstandardpaths : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
index e1ead8c9c0..434b15b125 100644
--- a/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
+++ b/tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp
@@ -51,9 +51,6 @@
 # include <windows.h>
 #endif
 
-//TESTED_CLASS=QTemporaryDir
-//TESTED_FILES=qtemporarydir.cpp
-
 class tst_QTemporaryDir : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
index fb459e98d8..46c0e19c9e 100644
--- a/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
+++ b/tests/auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp
@@ -58,9 +58,6 @@
 # include <unistd.h>            // close(2)
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QTemporaryFile : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
index 86a5ac1e0a..a1b3724417 100644
--- a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
+++ b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
@@ -67,9 +67,6 @@ template<> struct QMetaTypeId<QIODevice::OpenModeFlag>
 { enum { Defined = 1 }; static inline int qt_metatype_id() { return QMetaType::Int; } };
 QT_END_NAMESPACE
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QTextStream : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp
index c47d340edc..d86f96fba3 100644
--- a/tests/auto/corelib/io/qurl/tst_qurl.cpp
+++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp
@@ -72,9 +72,6 @@ struct ushortarray {
 Q_DECLARE_METATYPE(ushortarray)
 Q_DECLARE_METATYPE(QUrl::FormattingOptions)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QUrl : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/kernel/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/kernel/qabstractitemmodel/tst_qabstractitemmodel.cpp
index c704329717..2340c86207 100644
--- a/tests/auto/corelib/kernel/qabstractitemmodel/tst_qabstractitemmodel.cpp
+++ b/tests/auto/corelib/kernel/qabstractitemmodel/tst_qabstractitemmodel.cpp
@@ -45,9 +45,6 @@
 #include <QtWidgets/QSortFilterProxyModel>
 #include <QtWidgets/QStringListModel>
 
-//TESTED_CLASS=QAbstractListModel QAbstractTableModel
-//TESTED_FILES=
-
 #include "dynamictreemodel.h"
 
 Q_DECLARE_METATYPE(QModelIndex)
diff --git a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
index 076ecc31fc..aab405fa97 100644
--- a/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
+++ b/tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp
@@ -52,9 +52,6 @@
 #include <QTcpServer>
 #include <QTcpSocket>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class EventLoopExiter : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/kernel/qitemmodel/tst_qitemmodel.cpp b/tests/auto/corelib/kernel/qitemmodel/tst_qitemmodel.cpp
index a28f04594b..a4b1044cab 100644
--- a/tests/auto/corelib/kernel/qitemmodel/tst_qitemmodel.cpp
+++ b/tests/auto/corelib/kernel/qitemmodel/tst_qitemmodel.cpp
@@ -47,9 +47,6 @@
 
 Q_DECLARE_METATYPE(QModelIndex)
 
-//TESTED_CLASS=
-//TESTED_FILES=gui/itemviews/qstandarditemmodel.h gui/itemviews/qstandarditemmodel.cpp
-
 /*!
     See modelstotest.cpp for instructions on how to have your model tested with these tests.
 
diff --git a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
index e68f7e5ed1..32d0ccfaac 100644
--- a/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
+++ b/tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
@@ -45,9 +45,6 @@
 #include <qmetaobject.h>
 #include <qlabel.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 struct MyStruct
 {
     int i;
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index b20b98da54..8f938a79fe 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -61,9 +61,6 @@
 
 #include <math.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QObject : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp b/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp
index ae82d341e5..58a545ca75 100644
--- a/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp
+++ b/tests/auto/corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp
@@ -44,9 +44,6 @@
 #include <qsignalmapper.h>
 #include <qspinbox.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QSignalMapper : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
index c66e5ff80b..bfaeff7f26 100644
--- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
+++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
@@ -48,9 +48,6 @@
 #include <unistd.h>
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QTimer : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
index f47c02f93d..941d3a9be4 100644
--- a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
+++ b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
@@ -44,9 +44,6 @@
 #include <qtranslator.h>
 #include <qfile.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QTranslator : public QWidget
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index a3d841d04d..e540474b3e 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -82,9 +82,6 @@ Q_DECLARE_METATYPE(QFont)
 Q_DECLARE_METATYPE(QColor)
 Q_DECLARE_METATYPE(QKeySequence)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QVariant : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp b/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
index be223ed394..38df9d77c8 100644
--- a/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
+++ b/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
@@ -43,9 +43,6 @@
 #include <qwineventnotifier.h>
 #include <qtimer.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QWinEventNotifier : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
index c1f090afc5..5156070a32 100644
--- a/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
+++ b/tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp
@@ -107,9 +107,6 @@ static QString sys_qualifiedLibraryName(const QString &fileName)
     return currDir + "/" + PREFIX + fileName + SUFFIX;
 }
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 QT_FORWARD_DECLARE_CLASS(QLibrary)
 class tst_QLibrary : public QObject
 {
diff --git a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
index 4b1ed7199d..c143977a48 100644
--- a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
+++ b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
@@ -98,9 +98,6 @@ static QString sys_qualifiedLibraryName(const QString &fileName)
     return QFINDTESTDATA(QString("bin/%1%2%3").arg(PREFIX).arg(fileName).arg(SUFFIX));
 }
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 QT_FORWARD_DECLARE_CLASS(QPluginLoader)
 class tst_QPluginLoader : public QObject
 {
diff --git a/tests/auto/corelib/plugin/quuid/tst_quuid.cpp b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
index fc0f923427..90a391039f 100644
--- a/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
+++ b/tests/auto/corelib/plugin/quuid/tst_quuid.cpp
@@ -45,13 +45,6 @@
 #include <qcoreapplication.h>
 #include <quuid.h>
 
-
-
-#include <quuid.h>
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QUuid : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp b/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
index 59170cf703..af587632b3 100644
--- a/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
+++ b/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
@@ -45,9 +45,6 @@
 #include "qstatemachine.h"
 #include "qsignaltransition.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QState : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
index 6018162e07..bdb261eefc 100644
--- a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
@@ -54,9 +54,6 @@
 #include "private/qstate_p.h"
 #include "private/qstatemachine_p.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 static int globalTick;
 
 // Run exec for a maximum of TIMEOUT msecs
diff --git a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
index 4606849688..1d79206b3a 100644
--- a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
+++ b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
@@ -46,9 +46,6 @@
 
 #include <limits.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QAtomicInt : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp
index 6be25f3dd3..9c73eb3d61 100644
--- a/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp
+++ b/tests/auto/corelib/thread/qatomicpointer/tst_qatomicpointer.cpp
@@ -44,9 +44,6 @@
 #include <qatomic.h>
 #include <limits.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QAtomicPointer : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
index d70dea5e57..67d6998bb1 100644
--- a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
+++ b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
@@ -48,9 +48,6 @@
 #include <qthread.h>
 #include <qwaitcondition.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QMutex : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp b/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp
index 4d2a6b33ab..a6646215a0 100644
--- a/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp
+++ b/tests/auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp
@@ -46,9 +46,6 @@
 #include <QSemaphore>
 #include <QThread>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QMutexLockerThread : public QThread
 {
 public:
diff --git a/tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp b/tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp
index e5bd5e5ae1..7da7282ae4 100644
--- a/tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp
+++ b/tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp
@@ -46,9 +46,6 @@
 #include <QSemaphore>
 #include <QThread>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QReadLockerThread : public QThread
 {
 public:
diff --git a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
index c26120d203..4acbf411c1 100644
--- a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
+++ b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
@@ -64,9 +64,6 @@
 
 #include <stdio.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QReadWriteLock : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp b/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp
index c7ff4fa02b..d3537a459a 100644
--- a/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp
+++ b/tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp
@@ -45,9 +45,6 @@
 #include <qthread.h>
 #include <qsemaphore.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QSemaphore : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
index 42a64ef427..a8e04db2a0 100644
--- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp
+++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
@@ -60,9 +60,6 @@
 #include <windows.h>
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QThread : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp b/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp
index 87991d8309..21c716448b 100644
--- a/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp
+++ b/tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp
@@ -48,9 +48,6 @@
 #include <qwaitcondition.h>
 #include "qthreadonce.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=corelib/thread/qthreadonce.h corelib/thread/qthreadonce.cpp
-
 class tst_QThreadOnce : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
index e0fa30be19..c343d1d8d4 100644
--- a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
+++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
@@ -57,9 +57,6 @@
 #include <windows.h>
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QThreadStorage : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp b/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp
index 6e2553fb06..4ffde9fcb8 100644
--- a/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp
+++ b/tests/auto/corelib/thread/qwaitcondition/tst_qwaitcondition.cpp
@@ -48,9 +48,6 @@
 
 #define COND_WAIT_TIME 1
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QWaitCondition : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp b/tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp
index 19a59932fa..6fb34bec86 100644
--- a/tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp
+++ b/tests/auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp
@@ -46,9 +46,6 @@
 #include <QSemaphore>
 #include <QThread>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QWriteLockerThread : public QThread
 {
 public:
diff --git a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
index d0f983fb6c..4702c6e7de 100644
--- a/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
+++ b/tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp
@@ -54,8 +54,6 @@
 
 using namespace std;
 
-//TESTED_FILES=
-
 class tst_QAlgorithms : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp b/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
index 4d2b49937e..2babc178a5 100644
--- a/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
+++ b/tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp
@@ -64,10 +64,6 @@ static QBitArray QStringToQBitArray(const QString &str)
     return ba;
 }
 
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QBitArray : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
index f3c33f184f..6d85b5a1f0 100644
--- a/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
+++ b/tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
@@ -49,9 +49,6 @@
 #include <qcoreapplication.h>
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QByteArray : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qcache/tst_qcache.cpp b/tests/auto/corelib/tools/qcache/tst_qcache.cpp
index cc00fe3fa5..dfc59eed9a 100644
--- a/tests/auto/corelib/tools/qcache/tst_qcache.cpp
+++ b/tests/auto/corelib/tools/qcache/tst_qcache.cpp
@@ -43,9 +43,6 @@
 
 #include <qcache.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QCache : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qchar/tst_qchar.cpp b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
index 652ad5e7c2..b7acbe63c5 100644
--- a/tests/auto/corelib/tools/qchar/tst_qchar.cpp
+++ b/tests/auto/corelib/tools/qchar/tst_qchar.cpp
@@ -48,9 +48,6 @@
 #include <qcoreapplication.h>
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QChar : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qdate/tst_qdate.cpp b/tests/auto/corelib/tools/qdate/tst_qdate.cpp
index 3aa7d03d81..936f82861f 100644
--- a/tests/auto/corelib/tools/qdate/tst_qdate.cpp
+++ b/tests/auto/corelib/tools/qdate/tst_qdate.cpp
@@ -43,9 +43,6 @@
 #include <qdatetime.h>
 #include <qlocale.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=corelib/tools/qdatetime.h corelib/tools/qdatetime.cpp
-
 class tst_QDate : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
index 2616988871..8e385dfbdb 100644
--- a/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
+++ b/tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
@@ -51,9 +51,6 @@
 # include <windows.h>
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QDateTime : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
index 612994aa80..3044b4180d 100644
--- a/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
+++ b/tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp
@@ -43,9 +43,6 @@
 
 #include <qeasingcurve.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QEasingCurve : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qfreelist/tst_qfreelist.cpp b/tests/auto/corelib/tools/qfreelist/tst_qfreelist.cpp
index 139d76e64a..0c1bb655b4 100644
--- a/tests/auto/corelib/tools/qfreelist/tst_qfreelist.cpp
+++ b/tests/auto/corelib/tools/qfreelist/tst_qfreelist.cpp
@@ -47,9 +47,6 @@
 #include <private/qfreelist_p.h>
 #include <QtTest/QtTest>
 
-//TESTED_CLASS=QFreeList
-//TESTED_FILES=corelib/tools/qfreelist_p.h
-
 class tst_QFreeList : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qhash/tst_qhash.cpp b/tests/auto/corelib/tools/qhash/tst_qhash.cpp
index 18fd087d59..6d82831214 100644
--- a/tests/auto/corelib/tools/qhash/tst_qhash.cpp
+++ b/tests/auto/corelib/tools/qhash/tst_qhash.cpp
@@ -44,9 +44,6 @@
 #include <qhash.h>
 #include <qmap.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QHash : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qline/tst_qline.cpp b/tests/auto/corelib/tools/qline/tst_qline.cpp
index 1d318304a9..94fd279842 100644
--- a/tests/auto/corelib/tools/qline/tst_qline.cpp
+++ b/tests/auto/corelib/tools/qline/tst_qline.cpp
@@ -47,9 +47,6 @@
 #define M_2PI 6.28318530717958647692528676655900576
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QLine : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qlist/tst_qlist.cpp b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
index d08cb7290b..24fa94ac6f 100644
--- a/tests/auto/corelib/tools/qlist/tst_qlist.cpp
+++ b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
@@ -43,9 +43,6 @@
 #include <QtTest/QtTest>
 #include <QList>
 
-//TESTED_CLASS=QList
-//TESTED_FILES=corelib/tools/qlist.h corelib/tools/qlist.cpp
-
 /*!
   \class tst_QVector
   \internal
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index 1cd695ae46..8d4c15b5f9 100644
--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
@@ -76,9 +76,6 @@ Q_DECLARE_METATYPE(qlonglong)
 Q_DECLARE_METATYPE(QDate)
 Q_DECLARE_METATYPE(QLocale::FormatType)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QLocale : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qmap/tst_qmap.cpp b/tests/auto/corelib/tools/qmap/tst_qmap.cpp
index 2c04faa132..f24311adef 100644
--- a/tests/auto/corelib/tools/qmap/tst_qmap.cpp
+++ b/tests/auto/corelib/tools/qmap/tst_qmap.cpp
@@ -46,9 +46,6 @@
 
 #include <qmap.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QMap : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp b/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
index b7affac7af..e8cb23b9b6 100644
--- a/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
+++ b/tests/auto/corelib/tools/qmargins/tst_qmargins.cpp
@@ -44,9 +44,6 @@
 
 Q_DECLARE_METATYPE(QMargins)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QMargins : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp b/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp
index 1c6117d299..1e32c3afea 100644
--- a/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp
+++ b/tests/auto/corelib/tools/qpoint/tst_qpoint.cpp
@@ -45,9 +45,6 @@
 #include <qdebug.h>
 #include <qpoint.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QPoint : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qrect/tst_qrect.cpp b/tests/auto/corelib/tools/qrect/tst_qrect.cpp
index 1696327289..c1375c38f6 100644
--- a/tests/auto/corelib/tools/qrect/tst_qrect.cpp
+++ b/tests/auto/corelib/tools/qrect/tst_qrect.cpp
@@ -49,9 +49,6 @@ Q_DECLARE_METATYPE(QPointF)
 Q_DECLARE_METATYPE(QRect)
 Q_DECLARE_METATYPE(QPoint)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QRect : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp b/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
index 21bf9d1539..d66e6b35da 100644
--- a/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
+++ b/tests/auto/corelib/tools/qregexp/tst_qregexp.cpp
@@ -44,9 +44,6 @@
 
 const int N = 1;
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QRegExp : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qset/tst_qset.cpp b/tests/auto/corelib/tools/qset/tst_qset.cpp
index 98f48d0bc7..f03d769e13 100644
--- a/tests/auto/corelib/tools/qset/tst_qset.cpp
+++ b/tests/auto/corelib/tools/qset/tst_qset.cpp
@@ -45,9 +45,6 @@
 #include <qset.h>
 #include <qdebug.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 int toNumber(const QString &str)
 {
     int res = 0;
diff --git a/tests/auto/corelib/tools/qsize/tst_qsize.cpp b/tests/auto/corelib/tools/qsize/tst_qsize.cpp
index 03a6f1d62d..5b6e4f85b1 100644
--- a/tests/auto/corelib/tools/qsize/tst_qsize.cpp
+++ b/tests/auto/corelib/tools/qsize/tst_qsize.cpp
@@ -44,9 +44,6 @@
 
 Q_DECLARE_METATYPE(QSize)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QSize : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp b/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
index 936df75366..d2879612be 100644
--- a/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
+++ b/tests/auto/corelib/tools/qsizef/tst_qsizef.cpp
@@ -44,9 +44,6 @@
 
 Q_DECLARE_METATYPE(QSizeF)
 
-//TESTED_CLASS=
-//TESTED_FILES=corelib/tools/qsize.h corelib/tools/qsize.cpp
-
 class tst_QSizeF : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
index cb9a3fa70a..80cbabeaf6 100644
--- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp
+++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp
@@ -53,9 +53,6 @@
 
 Q_DECLARE_METATYPE(qlonglong)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 #define CREATE_REF(string)                                              \
     const QString padded = QString::fromLatin1(" %1 ").arg(string);     \
     QStringRef ref = padded.midRef(1, padded.size() - 2);
diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/tst_qstringbuilder1.cpp b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/tst_qstringbuilder1.cpp
index 134da1d877..9a71955d62 100644
--- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/tst_qstringbuilder1.cpp
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder1/tst_qstringbuilder1.cpp
@@ -51,9 +51,6 @@
 
 #include <QtTest/QtTest>
 
-//TESTED_CLASS=QStringBuilder
-//TESTED_FILES=qstringbuilder.cpp
-
 #define LITERAL "some literal"
 
 void runScenario(); // Defined in stringbuilder.cpp #included below.
diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp
index b74cea069d..4979672647 100644
--- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp
@@ -52,9 +52,6 @@
 
 #include <QtTest/QtTest>
 
-//TESTED_CLASS=QStringBuilder
-//TESTED_FILES=qstringbuilder.cpp
-
 #define LITERAL "some literal"
 
 void runScenario(); // Defined in stringbuilder.cpp #included below.
diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp
index 0320ed293d..2c6466ffe2 100644
--- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp
@@ -51,9 +51,6 @@
 
 #include <QtTest/QtTest>
 
-//TESTED_CLASS=QStringBuilder
-//TESTED_FILES=qstringbuilder.cpp
-
 #define LITERAL "some literal"
 
 void runScenario(); // Defined in stringbuilder.cpp #included below.
diff --git a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp
index 7013780789..7f709d1590 100644
--- a/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp
+++ b/tests/auto/corelib/tools/qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp
@@ -52,9 +52,6 @@
 
 #include <QtTest/QtTest>
 
-//TESTED_CLASS=QStringBuilder
-//TESTED_FILES=qstringbuilder.cpp
-
 #define LITERAL "some literal"
 
 void runScenario(); // Defined in stringbuilder.cpp #included below.
diff --git a/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp b/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp
index e8a6335cee..b74e88753e 100644
--- a/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp
+++ b/tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp
@@ -43,9 +43,6 @@
 #include <qregexp.h>
 #include <qstringlist.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QStringList : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
index 23cd3fb889..0b3d1bbea1 100644
--- a/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
+++ b/tests/auto/corelib/tools/qstringref/tst_qstringref.cpp
@@ -48,9 +48,6 @@
 
 Q_DECLARE_METATYPE(qlonglong)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QStringRef : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp b/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
index 4cc1dc0156..a7abf6f589 100644
--- a/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
+++ b/tests/auto/corelib/tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp
@@ -45,9 +45,6 @@
 #include <qfile.h>
 #include <qdebug.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=gui/text/qtextlayout.h corelib/tools/qtextboundaryfinder.cpp
-
 class tst_QTextBoundaryFinder : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qtime/tst_qtime.cpp b/tests/auto/corelib/tools/qtime/tst_qtime.cpp
index cde953efb8..33513df9ac 100644
--- a/tests/auto/corelib/tools/qtime/tst_qtime.cpp
+++ b/tests/auto/corelib/tools/qtime/tst_qtime.cpp
@@ -42,9 +42,6 @@
 #include <QtTest/QtTest>
 #include "qdatetime.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=corelib/thread/qthreadstorage.h corelib/thread/qthreadstorage.cpp
-
 class tst_QTime : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp b/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
index 36af16fba9..0bc1352681 100644
--- a/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
+++ b/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
@@ -43,9 +43,6 @@
 
 #include <qtimeline.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QTimeLine : public QObject
 {
   Q_OBJECT
diff --git a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
index a005d5df7a..0bdc49a15a 100644
--- a/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
+++ b/tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
@@ -45,9 +45,6 @@
 
 const int N = 1;
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QVarLengthArray : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/tools/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
index 77e70bd1fd..acf3756258 100644
--- a/tests/auto/corelib/tools/qvector/tst_qvector.cpp
+++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
@@ -42,9 +42,6 @@
 #include <QtTest/QtTest>
 #include <qvector.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=corelib/tools/qregexp.h corelib/tools/qregexp.cpp
-
 class tst_QVector : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/corelib/xml/qxmlstream/tst_qxmlstream.cpp b/tests/auto/corelib/xml/qxmlstream/tst_qxmlstream.cpp
index 1040a3ef87..12ebbb72a6 100644
--- a/tests/auto/corelib/xml/qxmlstream/tst_qxmlstream.cpp
+++ b/tests/auto/corelib/xml/qxmlstream/tst_qxmlstream.cpp
@@ -52,9 +52,6 @@
 
 #include "qc14n.h"
 
-//TESTED_CLASS=QXmlStreamReader QXmlStreamWriter
-//TESTED_FILES=corelib/xml/stream/qxmlutils.cpp corelib/xml/stream/qxmlstream.cpp corelib/xml/stream/qxmlstream_p.h
-
 Q_DECLARE_METATYPE(QXmlStreamReader::ReadElementTextBehaviour)
 
 static const char *const catalogFile = "XML-Test-Suite/xmlconf/finalCatalog.xml";