From e3640d1bddb7c2e820d770b2f2f5557cc354b7e9 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Mon, 5 Dec 2011 18:51:14 +1000
Subject: [PATCH] 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>
---
 src/3rdparty/harfbuzz/tests/shaping/main.cpp               | 3 ---
 .../animation/qanimationgroup/tst_qanimationgroup.cpp      | 3 ---
 .../tst_qparallelanimationgroup.cpp                        | 3 ---
 .../animation/qpauseanimation/tst_qpauseanimation.cpp      | 3 ---
 .../qpropertyanimation/tst_qpropertyanimation.cpp          | 3 ---
 .../tst_qsequentialanimationgroup.cpp                      | 3 ---
 tests/auto/corelib/codecs/utf8/tst_utf8.cpp                | 3 ---
 tests/auto/corelib/concurrent/qfuture/tst_qfuture.cpp      | 3 ---
 tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp    | 3 ---
 tests/auto/corelib/io/qbuffer/tst_qbuffer.cpp              | 3 ---
 tests/auto/corelib/io/qdatastream/tst_qdatastream.cpp      | 3 ---
 tests/auto/corelib/io/qdir/tst_qdir.cpp                    | 3 ---
 tests/auto/corelib/io/qdiriterator/tst_qdiriterator.cpp    | 3 ---
 tests/auto/corelib/io/qfile/tst_qfile.cpp                  | 3 ---
 tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp          | 3 ---
 .../corelib/io/qfilesystementry/tst_qfilesystementry.cpp   | 3 ---
 .../io/qfilesystemwatcher/tst_qfilesystemwatcher.cpp       | 3 ---
 tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp          | 3 ---
 tests/auto/corelib/io/qsettings/tst_qsettings.cpp          | 2 --
 .../auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp  | 3 ---
 tests/auto/corelib/io/qtemporarydir/tst_qtemporarydir.cpp  | 3 ---
 .../auto/corelib/io/qtemporaryfile/tst_qtemporaryfile.cpp  | 3 ---
 tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp      | 3 ---
 tests/auto/corelib/io/qurl/tst_qurl.cpp                    | 3 ---
 .../kernel/qabstractitemmodel/tst_qabstractitemmodel.cpp   | 3 ---
 tests/auto/corelib/kernel/qeventloop/tst_qeventloop.cpp    | 3 ---
 tests/auto/corelib/kernel/qitemmodel/tst_qitemmodel.cpp    | 3 ---
 tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp  | 3 ---
 tests/auto/corelib/kernel/qobject/tst_qobject.cpp          | 3 ---
 .../corelib/kernel/qsignalmapper/tst_qsignalmapper.cpp     | 3 ---
 tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp            | 3 ---
 tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp  | 3 ---
 tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp        | 3 ---
 .../kernel/qwineventnotifier/tst_qwineventnotifier.cpp     | 3 ---
 tests/auto/corelib/plugin/qlibrary/tst_qlibrary.cpp        | 3 ---
 .../corelib/plugin/qpluginloader/tst_qpluginloader.cpp     | 3 ---
 tests/auto/corelib/plugin/quuid/tst_quuid.cpp              | 7 -------
 tests/auto/corelib/statemachine/qstate/tst_qstate.cpp      | 3 ---
 .../statemachine/qstatemachine/tst_qstatemachine.cpp       | 3 ---
 tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp    | 3 ---
 .../corelib/thread/qatomicpointer/tst_qatomicpointer.cpp   | 3 ---
 tests/auto/corelib/thread/qmutex/tst_qmutex.cpp            | 3 ---
 .../auto/corelib/thread/qmutexlocker/tst_qmutexlocker.cpp  | 3 ---
 tests/auto/corelib/thread/qreadlocker/tst_qreadlocker.cpp  | 3 ---
 .../corelib/thread/qreadwritelock/tst_qreadwritelock.cpp   | 3 ---
 tests/auto/corelib/thread/qsemaphore/tst_qsemaphore.cpp    | 3 ---
 tests/auto/corelib/thread/qthread/tst_qthread.cpp          | 3 ---
 tests/auto/corelib/thread/qthreadonce/tst_qthreadonce.cpp  | 3 ---
 .../corelib/thread/qthreadstorage/tst_qthreadstorage.cpp   | 3 ---
 .../corelib/thread/qwaitcondition/tst_qwaitcondition.cpp   | 3 ---
 .../auto/corelib/thread/qwritelocker/tst_qwritelocker.cpp  | 3 ---
 tests/auto/corelib/tools/qalgorithms/tst_qalgorithms.cpp   | 2 --
 tests/auto/corelib/tools/qbitarray/tst_qbitarray.cpp       | 4 ----
 tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp     | 3 ---
 tests/auto/corelib/tools/qcache/tst_qcache.cpp             | 3 ---
 tests/auto/corelib/tools/qchar/tst_qchar.cpp               | 3 ---
 tests/auto/corelib/tools/qdate/tst_qdate.cpp               | 3 ---
 tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp       | 3 ---
 tests/auto/corelib/tools/qeasingcurve/tst_qeasingcurve.cpp | 3 ---
 tests/auto/corelib/tools/qfreelist/tst_qfreelist.cpp       | 3 ---
 tests/auto/corelib/tools/qhash/tst_qhash.cpp               | 3 ---
 tests/auto/corelib/tools/qline/tst_qline.cpp               | 3 ---
 tests/auto/corelib/tools/qlist/tst_qlist.cpp               | 3 ---
 tests/auto/corelib/tools/qlocale/tst_qlocale.cpp           | 3 ---
 tests/auto/corelib/tools/qmap/tst_qmap.cpp                 | 3 ---
 tests/auto/corelib/tools/qmargins/tst_qmargins.cpp         | 3 ---
 tests/auto/corelib/tools/qpoint/tst_qpoint.cpp             | 3 ---
 tests/auto/corelib/tools/qrect/tst_qrect.cpp               | 3 ---
 tests/auto/corelib/tools/qregexp/tst_qregexp.cpp           | 3 ---
 tests/auto/corelib/tools/qset/tst_qset.cpp                 | 3 ---
 tests/auto/corelib/tools/qsize/tst_qsize.cpp               | 3 ---
 tests/auto/corelib/tools/qsizef/tst_qsizef.cpp             | 3 ---
 tests/auto/corelib/tools/qstring/tst_qstring.cpp           | 3 ---
 .../qstringbuilder/qstringbuilder1/tst_qstringbuilder1.cpp | 3 ---
 .../qstringbuilder/qstringbuilder2/tst_qstringbuilder2.cpp | 3 ---
 .../qstringbuilder/qstringbuilder3/tst_qstringbuilder3.cpp | 3 ---
 .../qstringbuilder/qstringbuilder4/tst_qstringbuilder4.cpp | 3 ---
 tests/auto/corelib/tools/qstringlist/tst_qstringlist.cpp   | 3 ---
 tests/auto/corelib/tools/qstringref/tst_qstringref.cpp     | 3 ---
 .../tools/qtextboundaryfinder/tst_qtextboundaryfinder.cpp  | 3 ---
 tests/auto/corelib/tools/qtime/tst_qtime.cpp               | 3 ---
 tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp       | 3 ---
 .../corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp  | 3 ---
 tests/auto/corelib/tools/qvector/tst_qvector.cpp           | 3 ---
 tests/auto/corelib/xml/qxmlstream/tst_qxmlstream.cpp       | 3 ---
 tests/auto/gui/image/qicon/tst_qicon.cpp                   | 3 ---
 tests/auto/gui/image/qimage/tst_qimage.cpp                 | 4 ----
 .../auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp | 3 ---
 tests/auto/gui/image/qimagereader/tst_qimagereader.cpp     | 2 --
 tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp     | 2 --
 tests/auto/gui/image/qmovie/tst_qmovie.cpp                 | 2 --
 tests/auto/gui/image/qpicture/tst_qpicture.cpp             | 3 ---
 tests/auto/gui/image/qpixmap/tst_qpixmap.cpp               | 3 ---
 tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp     | 4 ----
 tests/auto/gui/image/qpixmapfilter/tst_qpixmapfilter.cpp   | 3 ---
 tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp        | 3 ---
 tests/auto/gui/kernel/qdrag/tst_qdrag.cpp                  | 3 ---
 tests/auto/gui/kernel/qevent/tst_qevent.cpp                | 3 ---
 tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp    | 3 ---
 tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp      | 3 ---
 .../gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp | 4 ----
 tests/auto/gui/kernel/qpalette/tst_qpalette.cpp            | 3 ---
 tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp          | 3 ---
 tests/auto/gui/painting/qbrush/tst_qbrush.cpp              | 3 ---
 tests/auto/gui/painting/qcolor/tst_qcolor.cpp              | 3 ---
 tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp  | 3 ---
 tests/auto/gui/painting/qpainter/tst_qpainter.cpp          | 3 ---
 tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp  | 3 ---
 .../qpainterpathstroker/tst_qpainterpathstroker.cpp        | 3 ---
 tests/auto/gui/painting/qpen/tst_qpen.cpp                  | 3 ---
 tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp          | 5 -----
 tests/auto/gui/painting/qprinter/tst_qprinter.cpp          | 3 ---
 tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp  | 3 ---
 tests/auto/gui/painting/qregion/tst_qregion.cpp            | 4 ----
 tests/auto/gui/painting/qtransform/tst_qtransform.cpp      | 3 ---
 tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp          | 3 ---
 .../tst_qabstracttextdocumentlayout.cpp                    | 3 ---
 tests/auto/gui/text/qcssparser/tst_qcssparser.cpp          | 3 ---
 tests/auto/gui/text/qfont/tst_qfont.cpp                    | 3 ---
 tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp    | 3 ---
 tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp      | 5 -----
 .../gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp | 3 ---
 tests/auto/gui/text/qtextblock/tst_qtextblock.cpp          | 2 --
 tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp        | 2 --
 tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp    | 3 ---
 .../qtextdocumentfragment/tst_qtextdocumentfragment.cpp    | 3 ---
 .../text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp   | 3 ---
 tests/auto/gui/text/qtextformat/tst_qtextformat.cpp        | 3 ---
 tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp        | 3 ---
 tests/auto/gui/text/qtextlist/tst_qtextlist.cpp            | 3 ---
 tests/auto/gui/text/qtextobject/tst_qtextobject.cpp        | 3 ---
 .../auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp  | 2 --
 .../gui/text/qtextscriptengine/tst_qtextscriptengine.cpp   | 7 -------
 tests/auto/gui/text/qtexttable/tst_qtexttable.cpp          | 2 --
 .../gui/util/qdesktopservices/tst_qdesktopservices.cpp     | 3 ---
 tests/auto/network/access/qftp/tst_qftp.cpp                | 3 ---
 tests/auto/network/access/qhttp/tst_qhttp.cpp              | 3 ---
 .../auto/network/kernel/qhostaddress/tst_qhostaddress.cpp  | 3 ---
 tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp      | 3 ---
 .../qnetworkaddressentry/tst_qnetworkaddressentry.cpp      | 1 -
 .../kernel/qnetworkinterface/tst_qnetworkinterface.cpp     | 2 --
 .../network/kernel/qnetworkproxy/tst_qnetworkproxy.cpp     | 3 ---
 .../platformsocketengine/tst_platformsocketengine.cpp      | 2 --
 .../network/socket/qabstractsocket/tst_qabstractsocket.cpp | 3 ---
 .../auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp  | 3 ---
 tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp    | 3 ---
 tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp    | 3 ---
 tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp    | 2 --
 tests/auto/opengl/qgl/tst_qgl.cpp                          | 3 ---
 tests/auto/other/collections/tst_collections.cpp           | 2 --
 tests/auto/other/gestures/tst_gestures.cpp                 | 3 ---
 tests/auto/other/languagechange/tst_languagechange.cpp     | 4 ----
 tests/auto/other/qaccessibility/tst_qaccessibility.cpp     | 2 --
 tests/auto/other/qcomplextext/tst_qcomplextext.cpp         | 4 ----
 tests/auto/other/qdirectpainter/tst_qdirectpainter.cpp     | 3 ---
 tests/auto/other/qfocusevent/tst_qfocusevent.cpp           | 3 ---
 tests/auto/other/qmultiscreen/tst_qmultiscreen.cpp         | 3 ---
 .../other/qobjectperformance/tst_qobjectperformance.cpp    | 3 ---
 tests/auto/sql/kernel/qsql/tst_qsql.cpp                    | 2 --
 tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp    | 2 --
 tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp        | 5 -----
 tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp          | 4 ----
 tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp          | 4 ----
 tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp          | 2 --
 tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp        | 6 ------
 .../auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp  | 3 ---
 .../tst_qsqlrelationaltablemodel.cpp                       | 4 ----
 .../auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp  | 3 ---
 .../qabstractprintdialog/tst_qabstractprintdialog.cpp      | 3 ---
 .../auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp | 3 ---
 tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp         | 3 ---
 tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp | 3 ---
 .../auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp | 3 ---
 .../dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp      | 3 ---
 tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp | 3 ---
 .../auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp | 3 ---
 tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp | 3 ---
 .../dialogs/qprogressdialog/tst_qprogressdialog.cpp        | 4 ----
 tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp       | 3 ---
 tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp         | 3 ---
 .../effects/qgraphicseffect/tst_qgraphicseffect.cpp        | 3 ---
 .../qgraphicseffectsource/tst_qgraphicseffectsource.cpp    | 3 ---
 .../graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp       | 3 ---
 .../qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp  | 3 ---
 .../graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp   | 3 ---
 .../graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp     | 3 ---
 .../qgraphicssceneindex/tst_qgraphicssceneindex.cpp        | 3 ---
 .../graphicsview/qgraphicsview/tst_qgraphicsview.cpp       | 3 ---
 .../itemviews/qabstractitemview/tst_qabstractitemview.cpp  | 3 ---
 .../auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp | 3 ---
 tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp   | 3 ---
 .../auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp | 3 ---
 .../qidentityproxymodel/tst_qidentityproxymodel.cpp        | 3 ---
 .../widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp  | 3 ---
 .../qitemselectionmodel/tst_qitemselectionmodel.cpp        | 3 ---
 tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp   | 3 ---
 tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp   | 3 ---
 .../auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp | 3 ---
 .../qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp    | 3 ---
 .../widgets/itemviews/qstandarditem/tst_qstandarditem.cpp  | 3 ---
 .../qstandarditemmodel/tst_qstandarditemmodel.cpp          | 3 ---
 .../itemviews/qstringlistmodel/tst_qstringlistmodel.cpp    | 3 ---
 tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp | 3 ---
 .../widgets/itemviews/qtablewidget/tst_qtablewidget.cpp    | 3 ---
 tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp   | 3 ---
 .../auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp | 3 ---
 .../tst_qtreewidgetitemiterator.cpp                        | 3 ---
 tests/auto/widgets/kernel/qaction/tst_qaction.cpp          | 3 ---
 .../auto/widgets/kernel/qapplication/tst_qapplication.cpp  | 3 ---
 tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp    | 3 ---
 .../widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp   | 2 --
 tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp  | 3 ---
 tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp  | 4 ----
 tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp          | 3 ---
 .../widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp   | 3 ---
 tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp        | 3 ---
 tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp          | 3 ---
 .../widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp     | 3 ---
 tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp      | 3 ---
 tests/auto/widgets/styles/qstyle/tst_qstyle.cpp            | 3 ---
 .../styles/qstylesheetstyle/tst_qstylesheetstyle.cpp       | 3 ---
 tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp      | 3 ---
 .../widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp   | 3 ---
 tests/auto/widgets/util/qundostack/tst_qundostack.cpp      | 3 ---
 .../widgets/qabstractbutton/tst_qabstractbutton.cpp        | 6 ------
 .../qabstractscrollarea/tst_qabstractscrollarea.cpp        | 3 ---
 .../widgets/qabstractspinbox/tst_qabstractspinbox.cpp      | 4 ----
 .../auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp | 3 ---
 .../widgets/qcalendarwidget/tst_qcalendarwidget.cpp        | 4 ----
 tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp     | 3 ---
 tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp     | 3 ---
 .../widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp  | 3 ---
 .../widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp    | 4 ----
 .../widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp      | 3 ---
 tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp | 2 --
 .../widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp  | 4 ----
 tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp | 4 ----
 tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp     | 3 ---
 tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp           | 3 ---
 tests/auto/widgets/widgets/qlcdnumber/tst_qlcdnumber.cpp   | 4 ----
 tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp     | 3 ---
 tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp | 2 --
 tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp       | 3 ---
 .../widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp    | 3 ---
 tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp             | 3 ---
 tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp       | 3 ---
 .../widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp  | 3 ---
 .../auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp | 3 ---
 tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp | 3 ---
 .../widgets/qregexpvalidator/tst_qregexpvalidator.cpp      | 3 ---
 tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp | 3 ---
 tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp     | 3 ---
 tests/auto/widgets/widgets/qslider/tst_qslider.cpp         | 3 ---
 tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp       | 3 ---
 tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp     | 3 ---
 .../widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp  | 3 ---
 tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp   | 3 ---
 tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp   | 3 ---
 .../auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp | 3 ---
 tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp     | 3 ---
 tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp       | 2 --
 tests/auto/widgets/widgets/qtoolbox/tst_qtoolbox.cpp       | 4 ----
 tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp | 3 ---
 tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp   | 3 ---
 tests/auto/xml/dom/qdom/tst_qdom.cpp                       | 3 ---
 tests/auto/xml/sax/qxml/tst_qxml.cpp                       | 4 ----
 tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp | 3 ---
 .../auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp | 3 ---
 .../benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp  | 2 --
 tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp      | 2 --
 .../corelib/thread/qthreadstorage/tst_qthreadstorage.cpp   | 2 --
 .../gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp   | 2 --
 .../gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp | 2 --
 .../gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp   | 2 --
 .../graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp   | 1 -
 .../benchmarks/gui/image/qimagereader/tst_qimagereader.cpp | 2 --
 .../benchmarks/gui/image/qpixmapcache/tst_qpixmapcache.cpp | 1 -
 .../benchmarks/gui/itemviews/qtableview/tst_qtableview.cpp | 2 --
 .../benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp  | 2 --
 tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp      | 2 --
 .../gui/painting/qtracebench/tst_qtracebench.cpp           | 2 --
 .../benchmarks/gui/painting/qtransform/tst_qtransform.cpp  | 2 --
 .../network/socket/qtcpserver/tst_qtcpserver.cpp           | 3 ---
 tests/benchmarks/network/ssl/qsslsocket/tst_qsslsocket.cpp | 3 ---
 284 files changed, 853 deletions(-)

diff --git a/src/3rdparty/harfbuzz/tests/shaping/main.cpp b/src/3rdparty/harfbuzz/tests/shaping/main.cpp
index 4d839c04d4d..29ff7b3e1b3 100644
--- a/src/3rdparty/harfbuzz/tests/shaping/main.cpp
+++ b/src/3rdparty/harfbuzz/tests/shaping/main.cpp
@@ -153,9 +153,6 @@ const HB_FontClass hb_fontClass = {
 };
 
 
-//TESTED_CLASS=
-//TESTED_FILES= gui/text/qscriptengine.cpp
-
 class tst_QScriptEngine : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp b/tests/auto/corelib/animation/qanimationgroup/tst_qanimationgroup.cpp
index 736b4d20ff5..4c111a88d4f 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 95524830e8d..e091666c2ad 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 b01cfccccec..ffd4ce47e15 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 1ac4063f671..51b7359980d 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 362cd305c6c..c7a996444fa 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 3031089ac4d..f6726c32814 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 c318a7391b8..1dc35ceeb17 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 cb0ee290177..f440e4eaa5c 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 296fa446b00..e2d422ad547 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 00cb43effea..3d3f5b4a97d 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 e6592a1174a..5b48f9da003 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 e331d09b64d..8a7f1747b44 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 07f6b44a4d5..90cd1aedb95 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 81b4c1bb129..c3979fce152 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 27d30be5b0f..e8a7e945c3f 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 58198f85fab..b9840bdb759 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 c3d4e54c37b..a67289f2a1d 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 13886273258..2c96339737d 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 be0c85e3809..66fb8bbbf99 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 e1ead8c9c09..434b15b125d 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 fb459e98d87..46c0e19c9e1 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 86a5ac1e0a0..a1b37244175 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 c47d340edc2..d86f96fba3c 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 c7043297174..2340c862072 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 076ecc31fc0..aab405fa97f 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 a28f04594b8..a4b1044cab1 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 e68f7e5ed1b..32d0ccfaac5 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 b20b98da541..8f938a79feb 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 ae82d341e5b..58a545ca750 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 c66e5ff80b0..bfaeff7f262 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 f47c02f93d3..941d3a9be46 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 a3d841d04d3..e540474b3ef 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 be223ed3949..38df9d77c8a 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 c1f090afc59..5156070a32d 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 4b1ed7199d4..c143977a481 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 fc0f9234273..90a391039f8 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 59170cf703e..af587632b3a 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 6018162e073..bdb261eefc9 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 46068496881..1d79206b3ac 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 6be25f3dd3c..9c73eb3d618 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 d70dea5e57b..67d6998bb16 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 4d2a6b33ab8..a6646215a08 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 e5bd5e5ae16..7da7282ae49 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 c26120d203b..4acbf411c1e 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 c7ff4fa02b9..d3537a459ad 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 42a64ef4279..a8e04db2a08 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 87991d83090..21c716448b5 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 e0fa30be19f..c343d1d8d48 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 6e2553fb068..4ffde9fcb8e 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 19a59932fac..6fb34bec869 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 d0f983fb6c6..4702c6e7de5 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 4d2b49937e5..2babc178a59 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 f3c33f184f3..6d85b5a1f0d 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 cc00fe3fa5b..dfc59eed9a1 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 652ad5e7c28..b7acbe63c5e 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 3aa7d03d819..936f82861f0 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 26169888718..8e385dfbdb4 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 612994aa80a..3044b4180d1 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 139d76e64a2..0c1bb655b4d 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 18fd087d591..6d828312141 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 1d318304a9b..94fd2798420 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 d08cb7290b9..24fa94ac6f6 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 1cd695ae467..8d4c15b5f9f 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 2c04faa1324..f24311adef0 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 b7affac7af7..e8cb23b9b6d 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 1c6117d2998..1e32c3afeae 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 16963272891..c1375c38f6e 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 21bf9d15391..d66e6b35dad 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 98f48d0bc75..f03d769e136 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 03a6f1d62d4..5b6e4f85b1e 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 936df753668..d2879612bea 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 cb9a3fa70ac..80cbabeaf6e 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 134da1d8778..9a71955d62e 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 b74cea069d1..49796726471 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 0320ed293df..2c6466ffe26 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 70137807893..7f709d15905 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 e8a6335cee6..b74e88753e4 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 23cd3fb8898..0b3d1bbea1a 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 4cc1dc01560..a7abf6f5893 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 cde953efb84..33513df9ac3 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 36af16fba9f..0bc1352681a 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 a005d5df7af..0bdc49a15af 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 77e70bd1fd7..acf3756258c 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 1040a3ef874..12ebbb72a68 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";
diff --git a/tests/auto/gui/image/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp
index 5fac4739e2d..39a68943df9 100644
--- a/tests/auto/gui/image/qicon/tst_qicon.cpp
+++ b/tests/auto/gui/image/qicon/tst_qicon.cpp
@@ -47,9 +47,6 @@
 
 Q_DECLARE_METATYPE(QSize)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QIcon : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp
index e2da34dd6e0..be34cf51cf1 100644
--- a/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
@@ -51,10 +51,6 @@
 #include <qpainter.h>
 #include <private/qdrawhelper_p.h>
 
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 Q_DECLARE_METATYPE(QImage::Format)
 Q_DECLARE_METATYPE(Qt::GlobalColor)
 
diff --git a/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp b/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp
index dd132302f8c..1b2e4fab0e6 100644
--- a/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp
+++ b/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp
@@ -47,9 +47,6 @@
 #include <qimageiohandler.h>
 #include <qfile.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QImageIOHandler : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
index 85ff3b2aeb1..d0bbc57632e 100644
--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
@@ -66,8 +66,6 @@ Q_DECLARE_METATYPE(QIntList)
 Q_DECLARE_METATYPE(QIODevice *)
 Q_DECLARE_METATYPE(QImage::Format)
 
-//TESTED_FILES=
-
 class tst_QImageReader : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
index e21e6719388..8a1f79e91a1 100644
--- a/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
+++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
@@ -61,8 +61,6 @@ Q_DECLARE_METATYPE(QImageWriter::ImageWriterError)
 Q_DECLARE_METATYPE(QIODevice *)
 Q_DECLARE_METATYPE(QImage::Format)
 
-//TESTED_FILES=
-
 class tst_QImageWriter : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/image/qmovie/tst_qmovie.cpp b/tests/auto/gui/image/qmovie/tst_qmovie.cpp
index 15c7f856b1f..b2d0360e333 100644
--- a/tests/auto/gui/image/qmovie/tst_qmovie.cpp
+++ b/tests/auto/gui/image/qmovie/tst_qmovie.cpp
@@ -47,8 +47,6 @@
 #include <QLabel>
 #include <QMovie>
 
-//TESTED_FILES=
-
 class tst_QMovie : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/image/qpicture/tst_qpicture.cpp b/tests/auto/gui/image/qpicture/tst_qpicture.cpp
index 8661a2b2d09..ea7e7c3e49e 100644
--- a/tests/auto/gui/image/qpicture/tst_qpicture.cpp
+++ b/tests/auto/gui/image/qpicture/tst_qpicture.cpp
@@ -49,9 +49,6 @@
 #include <qapplication.h>
 #include <limits.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QPicture : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
index 285db9778fc..f3866240923 100644
--- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
@@ -65,9 +65,6 @@
 #include <qscreen_qws.h>
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 Q_DECLARE_METATYPE(QImage::Format)
 
 class tst_QPixmap : public QObject
diff --git a/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp b/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp
index 25a43404c43..cd3c357d794 100644
--- a/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp
+++ b/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp
@@ -47,10 +47,6 @@
 #include <qpixmapcache.h>
 #include "private/qpixmapcache_p.h"
 
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QPixmapCache : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/image/qpixmapfilter/tst_qpixmapfilter.cpp b/tests/auto/gui/image/qpixmapfilter/tst_qpixmapfilter.cpp
index 5634285ad48..c89e09ea97b 100644
--- a/tests/auto/gui/image/qpixmapfilter/tst_qpixmapfilter.cpp
+++ b/tests/auto/gui/image/qpixmapfilter/tst_qpixmapfilter.cpp
@@ -45,9 +45,6 @@
 #include <private/qpixmapfilter_p.h>
 #include <qpainter.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QPixmapFilter : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
index 9458a97c6ff..29fabefc722 100644
--- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
@@ -48,9 +48,6 @@
 #include <Carbon/Carbon.h>
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QClipboard : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/kernel/qdrag/tst_qdrag.cpp b/tests/auto/gui/kernel/qdrag/tst_qdrag.cpp
index 4d18cefb2c2..8723c6614bf 100644
--- a/tests/auto/gui/kernel/qdrag/tst_qdrag.cpp
+++ b/tests/auto/gui/kernel/qdrag/tst_qdrag.cpp
@@ -46,9 +46,6 @@
 #include <qdebug.h>
 #include <qdrag.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QDrag : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/gui/kernel/qevent/tst_qevent.cpp b/tests/auto/gui/kernel/qevent/tst_qevent.cpp
index ae39380883a..7e39c11e2c8 100644
--- a/tests/auto/gui/kernel/qevent/tst_qevent.cpp
+++ b/tests/auto/gui/kernel/qevent/tst_qevent.cpp
@@ -45,9 +45,6 @@
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qcoreevent.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QEvent : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
index 44380d2cd1c..6fbd77c54f3 100644
--- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
@@ -47,9 +47,6 @@
 #include <QTranslator>
 #include <QLibraryInfo>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 #ifdef Q_WS_MAC
 #include <Carbon/Carbon.h>
 struct MacSpecialKey {
diff --git a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
index 5998aa0c088..370338d24a4 100644
--- a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
+++ b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
@@ -50,9 +50,6 @@
 #include <qevent.h>
 #include <qwidget.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=gui/widgets/qmenubar.h gui/widgets/qmenubar.cpp
-
 class MouseEventWidget : public QWidget
 {
 public:
diff --git a/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp b/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp
index 7006feeeb89..4dc8b583661 100644
--- a/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp
+++ b/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp
@@ -51,10 +51,6 @@
 
 #include <qdialog.h>
 
-
-//TESTED_CLASS=
-//TESTED_FILES=gui/widgets/qmenubar.h gui/widgets/qmenubar.cpp
-
 class TstWidget;
 class TstDialog;
 QT_FORWARD_DECLARE_CLASS(QPushButton)
diff --git a/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
index b63b8bf7b06..053e6d0a7ee 100644
--- a/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
+++ b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
@@ -45,9 +45,6 @@
 #include "qpalette.h"
 #include <qapplication.h>
 
-//TESTED_CLASS=QPalette
-//TESTED_FILES=qpalette.h qpalette.cpp
-
 class tst_QPalette : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp b/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp
index 674fa930ed3..d3a087eefc0 100644
--- a/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp
+++ b/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp
@@ -57,9 +57,6 @@ class QMainWindow;
 class QTextEdit;
 QT_END_NAMESPACE
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QShortcut : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/painting/qbrush/tst_qbrush.cpp b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
index 9ee679e0f75..e559556e58b 100644
--- a/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
+++ b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
@@ -48,9 +48,6 @@
 
 #include <qdebug.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QBrush : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
index 1090b5ddcf3..49b1bfe661f 100644
--- a/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
+++ b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
@@ -47,9 +47,6 @@
 #include <qcolor.h>
 #include <qdebug.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QColor : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp b/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp
index ba9cc62a3d1..f2e60218189 100644
--- a/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp
+++ b/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp
@@ -47,9 +47,6 @@
 #include <qpaintengine.h>
 #include <qpixmap.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QPaintEngine : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index bd4d16fcbb1..c868e9fa39f 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -77,9 +77,6 @@ Q_DECLARE_METATYPE(QSize)
 Q_DECLARE_METATYPE(QPoint)
 Q_DECLARE_METATYPE(QPainterPath)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QPainter : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
index 08c08649d61..c54ffb358ed 100644
--- a/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
+++ b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
@@ -49,9 +49,6 @@
 #define _USE_MATH_DEFINES
 #include <math.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QPainterPath : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp b/tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp
index 288263e5d7f..b5d6c231bd0 100644
--- a/tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp
+++ b/tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp
@@ -48,9 +48,6 @@
 #define _USE_MATH_DEFINES
 #include <math.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QPainterPathStroker : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/painting/qpen/tst_qpen.cpp b/tests/auto/gui/painting/qpen/tst_qpen.cpp
index 64d725bc504..eeb5aae96db 100644
--- a/tests/auto/gui/painting/qpen/tst_qpen.cpp
+++ b/tests/auto/gui/painting/qpen/tst_qpen.cpp
@@ -47,9 +47,6 @@
 
 #include <qdebug.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QPen : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp
index f47073a0486..8d0bed61286 100644
--- a/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp
+++ b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp
@@ -49,11 +49,6 @@
 #include <qpainter.h>
 #include <qdialog.h>
 
-
-
-//TESTED_CLASS=
-//TESTED_FILES=gui/painting/qpolygon.h gui/painting/qpolygon.cpp
-
 class tst_QPolygon : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/painting/qprinter/tst_qprinter.cpp b/tests/auto/gui/painting/qprinter/tst_qprinter.cpp
index 914628e740a..88c2a3ee9b5 100644
--- a/tests/auto/gui/painting/qprinter/tst_qprinter.cpp
+++ b/tests/auto/gui/painting/qprinter/tst_qprinter.cpp
@@ -60,9 +60,6 @@ Q_DECLARE_METATYPE(QRect)
 
 QT_FORWARD_DECLARE_CLASS(QPrinter)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QPrinter : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp
index f9734df10d1..04d148cdc45 100644
--- a/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp
+++ b/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp
@@ -54,9 +54,6 @@
 
 Q_DECLARE_METATYPE(QRect)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QPrinterInfo : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/painting/qregion/tst_qregion.cpp b/tests/auto/gui/painting/qregion/tst_qregion.cpp
index 58d2034e414..299710f56ae 100644
--- a/tests/auto/gui/painting/qregion/tst_qregion.cpp
+++ b/tests/auto/gui/painting/qregion/tst_qregion.cpp
@@ -50,10 +50,6 @@
 #include <private/qt_x11_p.h>
 #endif
 
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QRegion : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
index b3b90ba1b5e..6d0b88dcd72 100644
--- a/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
+++ b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
@@ -48,9 +48,6 @@
 
 Q_DECLARE_METATYPE(QRect)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QTransform : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
index 32084df61fd..7a5c96ab6be 100644
--- a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
+++ b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
@@ -47,9 +47,6 @@
 
 Q_DECLARE_METATYPE(QRect)
 
-//TESTED_CLASS=
-//TESTED_FILES=gui/painting/qmatrix.h gui/painting/qmatrix.cpp
-
 class tst_QWMatrix : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp b/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
index 90f212e832d..b296a56b380 100644
--- a/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
+++ b/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
@@ -48,9 +48,6 @@
 #include <qimage.h>
 #include <qtextobject.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QAbstractTextDocumentLayout : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
index 1166c014fa5..29dcfcd542e 100644
--- a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
+++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
@@ -46,9 +46,6 @@
 #include <QtGui/QFontInfo>
 #include <QtGui/QFontMetrics>
 
-//TESTED_CLASS=QCss
-//TESTED_FILES=gui/text/qcssparser.cpp gui/text/qcssparser_p.h
-
 #include "private/qcssparser_p.h"
 
 class tst_QCssParser : public QObject
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp
index 0c932e38a54..406bdf950e8 100644
--- a/tests/auto/gui/text/qfont/tst_qfont.cpp
+++ b/tests/auto/gui/text/qfont/tst_qfont.cpp
@@ -51,9 +51,6 @@
 #include <qwidget.h>
 #include <qlist.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QFont : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
index 6886a687dfe..bf84b910241 100644
--- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
@@ -45,9 +45,6 @@
 #include <qfontinfo.h>
 #include <qfontmetrics.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QFontDatabase : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
index 20ff8b7d8f7..a4bc8458b33 100644
--- a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
+++ b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
@@ -47,11 +47,6 @@
 #include <qstringlist.h>
 #include <qlist.h>
 
-
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QFontMetrics : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
index 24ade2dc915..bbc60df9d43 100644
--- a/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
+++ b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
@@ -47,9 +47,6 @@
 #include <QAbstractTextDocumentLayout>
 #include <QSyntaxHighlighter>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-//
 class QTestDocumentLayout : public QAbstractTextDocumentLayout
 {
     Q_OBJECT
diff --git a/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp b/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp
index efa53682058..190262f4ef0 100644
--- a/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp
+++ b/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp
@@ -50,8 +50,6 @@
 #include <qtextobject.h>
 #include <qtextcursor.h>
 
-//TESTED_FILES=
-
 QT_FORWARD_DECLARE_CLASS(QTextDocument)
 
 class tst_QTextBlock : public QObject
diff --git a/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp b/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
index 2b0ba422e0e..9667df73bb6 100644
--- a/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
+++ b/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
@@ -52,8 +52,6 @@
 #include <qtextcursor.h>
 #include <qdebug.h>
 
-//TESTED_FILES=gui/text/qtextcursor.cpp gui/text/qtextcursor_p.h
-
 QT_FORWARD_DECLARE_CLASS(QTextDocument)
 
 class tst_QTextCursor : public QObject
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index ea8878e9f15..a9295ffbdb8 100644
--- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
@@ -65,9 +65,6 @@
 
 QT_FORWARD_DECLARE_CLASS(QTextDocument)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QTextDocument : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index 51e659d5eb9..7b4c1f98043 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
@@ -55,9 +55,6 @@
 
 QT_FORWARD_DECLARE_CLASS(QTextDocument)
 
-//TESTED_CLASS=
-//TESTED_FILES=gui/text/qtextdocumentfragment.h gui/text/qtextdocumentfragment.cpp gui/text/qtexthtmlparser.cpp gui/text/qtexthtmlparser_p.h
-
 class tst_QTextDocumentFragment : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
index f5c72cd4d05..ae31936e63e 100644
--- a/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
+++ b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
@@ -50,9 +50,6 @@
 #include <qtextedit.h>
 #include <qscrollbar.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=gui/text/qtextdocumentlayout_p.h gui/text/qtextdocumentlayout.cpp
-
 class tst_QTextDocumentLayout : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
index b235b112b67..1d69bc2c1d6 100644
--- a/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
+++ b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
@@ -52,9 +52,6 @@
 #include <qtextlayout.h>
 #include <qabstracttextdocumentlayout.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QTextFormat : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index 42aa3000985..253211bbe99 100644
--- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
@@ -57,9 +57,6 @@
 
 #define TESTFONT_SIZE 12
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QTextLayout : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp b/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
index 164dd6fc680..8b4317f52ba 100644
--- a/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
+++ b/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
@@ -49,9 +49,6 @@
 #include <qtextcursor.h>
 #include "../qtextdocument/common.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QTextList : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/text/qtextobject/tst_qtextobject.cpp b/tests/auto/gui/text/qtextobject/tst_qtextobject.cpp
index 0d1773e3fac..15e50a5a54c 100644
--- a/tests/auto/gui/text/qtextobject/tst_qtextobject.cpp
+++ b/tests/auto/gui/text/qtextobject/tst_qtextobject.cpp
@@ -49,9 +49,6 @@
 #include <qtextedit.h>
 #include <qtextcursor.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QTextObject : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
index ddaf84134d0..2f4ca7282a5 100644
--- a/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
+++ b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
@@ -54,8 +54,6 @@
 #include <qtextcursor.h>
 #include "../qtextdocument/common.h"
 
-//TESTED_FILES=gui/text/qtextdocument_p.cpp gui/text/qtextdocument_p.h
-
 class tst_QTextPieceTable : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
index 55ad8668748..487ef96405a 100644
--- a/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
+++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
@@ -69,13 +69,6 @@
 #include <qfontdatabase.h>
 #include <qfontinfo.h>
 
-
-
-
-
-//TESTED_CLASS=
-//TESTED_FILES= gui/text/qscriptengine.cpp
-
 class tst_QTextScriptEngine : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
index 83343811d8b..fcafa51c903 100644
--- a/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
+++ b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
@@ -51,8 +51,6 @@
 #include <qtextdocument.h>
 #include <qtextedit.h>
 
-//TESTED_FILES=
-
 typedef QList<int> IntList;
 Q_DECLARE_METATYPE(IntList)
 
diff --git a/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp b/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp
index 64af6c9613c..d354e18fe43 100644
--- a/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp
+++ b/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp
@@ -45,9 +45,6 @@
 #include <qdebug.h>
 #include <qdesktopservices.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_qdesktopservices : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/network/access/qftp/tst_qftp.cpp b/tests/auto/network/access/qftp/tst_qftp.cpp
index 6caa98b7027..2e484d5bb5c 100644
--- a/tests/auto/network/access/qftp/tst_qftp.cpp
+++ b/tests/auto/network/access/qftp/tst_qftp.cpp
@@ -57,9 +57,6 @@
 
 #include "../../../network-settings.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 #ifndef QT_NO_BEARERMANAGEMENT
 Q_DECLARE_METATYPE(QNetworkConfiguration)
 #endif
diff --git a/tests/auto/network/access/qhttp/tst_qhttp.cpp b/tests/auto/network/access/qhttp/tst_qhttp.cpp
index 7ef061413d2..f6514bade15 100644
--- a/tests/auto/network/access/qhttp/tst_qhttp.cpp
+++ b/tests/auto/network/access/qhttp/tst_qhttp.cpp
@@ -59,9 +59,6 @@
 
 #include "../../../network-settings.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 Q_DECLARE_METATYPE(QHttpResponseHeader)
 
 class tst_QHttp : public QObject
diff --git a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
index a4b871a1276..8af3a376652 100644
--- a/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
+++ b/tests/auto/network/kernel/qhostaddress/tst_qhostaddress.cpp
@@ -49,9 +49,6 @@
 #include <qbytearray.h>
 #include <qdatastream.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QHostAddress : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
index 217a46a81dd..9226b3475a5 100644
--- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
@@ -96,9 +96,6 @@
 
 #include "../../../network-settings.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 const char * const lupinellaIp = "10.3.4.6";
 
 
diff --git a/tests/auto/network/kernel/qnetworkaddressentry/tst_qnetworkaddressentry.cpp b/tests/auto/network/kernel/qnetworkaddressentry/tst_qnetworkaddressentry.cpp
index 42b9af8dd37..d210cdfdfb8 100644
--- a/tests/auto/network/kernel/qnetworkaddressentry/tst_qnetworkaddressentry.cpp
+++ b/tests/auto/network/kernel/qnetworkaddressentry/tst_qnetworkaddressentry.cpp
@@ -44,7 +44,6 @@
 #include <qcoreapplication.h>
 #include <qnetworkinterface.h>
 
-// TESTED_FILES=qnetworkinterface.cpp qnetworkinterface.h
 Q_DECLARE_METATYPE(QHostAddress)
 
 class tst_QNetworkAddressEntry: public QObject
diff --git a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
index 06dd62e18a1..f8a9def46ac 100644
--- a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
+++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp
@@ -49,8 +49,6 @@
 #include <QNetworkSession>
 #include "../../../network-settings.h"
 
-//TESTED_FILES=qnetworkinterface.cpp qnetworkinterface.h qnetworkinterface_unix.cpp qnetworkinterface_win.cpp
-
 class tst_QNetworkInterface : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/network/kernel/qnetworkproxy/tst_qnetworkproxy.cpp b/tests/auto/network/kernel/qnetworkproxy/tst_qnetworkproxy.cpp
index 884ed0573f9..a96e771c0d7 100644
--- a/tests/auto/network/kernel/qnetworkproxy/tst_qnetworkproxy.cpp
+++ b/tests/auto/network/kernel/qnetworkproxy/tst_qnetworkproxy.cpp
@@ -46,9 +46,6 @@
 #include <qdebug.h>
 #include <qnetworkproxy.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QNetworkProxy : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
index bf3e2f2442a..5cd57b587e5 100644
--- a/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
+++ b/tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
@@ -66,8 +66,6 @@
 
 #include "../../../network-settings.h"
 
-//TESTED_FILES=network/qnativesocketengine.cpp network/qnativesocketengine_p.h network/qnativesocketengine_unix.cpp
-
 class tst_PlatformSocketEngine : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/network/socket/qabstractsocket/tst_qabstractsocket.cpp b/tests/auto/network/socket/qabstractsocket/tst_qabstractsocket.cpp
index 309215d5ea1..5b115f81bcd 100644
--- a/tests/auto/network/socket/qabstractsocket/tst_qabstractsocket.cpp
+++ b/tests/auto/network/socket/qabstractsocket/tst_qabstractsocket.cpp
@@ -46,9 +46,6 @@
 #include <qdebug.h>
 #include <qabstractsocket.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QAbstractSocket : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 12d03078477..b4449df86c2 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -46,9 +46,6 @@
 #include <QtNetwork/qlocalsocket.h>
 #include <QtNetwork/qlocalserver.h>
 
-//TESTED_CLASS=QLocalServer, QLocalSocket
-//TESTED_FILES=network/socket/qlocalserver.cpp network/socket/qlocalsocket.cpp
-
 Q_DECLARE_METATYPE(QLocalSocket::LocalSocketError)
 Q_DECLARE_METATYPE(QLocalSocket::LocalSocketState)
 
diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
index 769544e17e3..c1897779e1b 100644
--- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -74,9 +74,6 @@ Q_DECLARE_METATYPE(QList<QNetworkProxy>)
 #include <QNetworkConfigurationManager>
 #include "../../../network-settings.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QTcpServer : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index 00a9ed2d404..cb5b3df9da5 100644
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -99,9 +99,6 @@ Q_DECLARE_METATYPE(QAbstractSocket::SocketState)
 Q_DECLARE_METATYPE(QNetworkProxy)
 Q_DECLARE_METATYPE(QList<QNetworkProxy>)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 QT_FORWARD_DECLARE_CLASS(QTcpSocket)
 QT_FORWARD_DECLARE_CLASS(SocketPair)
 
diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
index 786714af13b..a0928b42eb8 100644
--- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
+++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp
@@ -64,8 +64,6 @@
 Q_DECLARE_METATYPE(QHostAddress)
 Q_DECLARE_METATYPE(QNetworkInterface)
 Q_DECLARE_METATYPE(QSharedPointer<QNetworkSession>)
-//TESTED_CLASS=
-//TESTED_FILES=
 
 QT_FORWARD_DECLARE_CLASS(QUdpSocket)
 
diff --git a/tests/auto/opengl/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp
index 9f11746d750..492c250b6b1 100644
--- a/tests/auto/opengl/qgl/tst_qgl.cpp
+++ b/tests/auto/opengl/qgl/tst_qgl.cpp
@@ -61,9 +61,6 @@
 #include <QtGui/private/qimagepixmapcleanuphooks_p.h>
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QGL : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/other/collections/tst_collections.cpp b/tests/auto/other/collections/tst_collections.cpp
index e815ab78965..3f96aa94d51 100644
--- a/tests/auto/other/collections/tst_collections.cpp
+++ b/tests/auto/other/collections/tst_collections.cpp
@@ -102,8 +102,6 @@ void foo()
 
 template class QList<int>;
 
-//TESTED_FILES=
-
 class tst_Collections : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/other/gestures/tst_gestures.cpp b/tests/auto/other/gestures/tst_gestures.cpp
index 63345fbe88f..098f84b3997 100644
--- a/tests/auto/other/gestures/tst_gestures.cpp
+++ b/tests/auto/other/gestures/tst_gestures.cpp
@@ -55,9 +55,6 @@
 
 #include <qdebug.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 static QPointF mapToGlobal(const QPointF &pt, QGraphicsItem *item, QGraphicsView *view)
 {
     return view->viewport()->mapToGlobal(view->mapFromScene(item->mapToScene(pt)));
diff --git a/tests/auto/other/languagechange/tst_languagechange.cpp b/tests/auto/other/languagechange/tst_languagechange.cpp
index 5373431d277..97a2683a755 100644
--- a/tests/auto/other/languagechange/tst_languagechange.cpp
+++ b/tests/auto/other/languagechange/tst_languagechange.cpp
@@ -51,10 +51,6 @@
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QDesktopWidget>
 
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_languageChange : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index 78a071b1554..625ed3b82ae 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -204,8 +204,6 @@ QRect childRect(QAccessibleInterface *iface, int index = 0)
     return rect;
 }
 
-//TESTED_FILES=
-
 class tst_QAccessibility : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/other/qcomplextext/tst_qcomplextext.cpp b/tests/auto/other/qcomplextext/tst_qcomplextext.cpp
index c72393cfe63..ce45500e742 100644
--- a/tests/auto/other/qcomplextext/tst_qcomplextext.cpp
+++ b/tests/auto/other/qcomplextext/tst_qcomplextext.cpp
@@ -50,10 +50,6 @@
 
 #include "bidireorderstring.h"
 
-
-//TESTED_CLASS=
-//TESTED_FILES=gui/widgets/qcombobox.h gui/widgets/qcombobox.cpp
-
 class tst_QComplexText : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/other/qdirectpainter/tst_qdirectpainter.cpp b/tests/auto/other/qdirectpainter/tst_qdirectpainter.cpp
index 550c2e96c04..f60f011a205 100644
--- a/tests/auto/other/qdirectpainter/tst_qdirectpainter.cpp
+++ b/tests/auto/other/qdirectpainter/tst_qdirectpainter.cpp
@@ -42,9 +42,6 @@
 
 #include <QtTest/QtTest>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 #include <qwindowsystem_qws.h>
 #include <qpainter.h>
 #include <qdesktopwidget.h>
diff --git a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
index cc58b6212c0..a0803b029c8 100644
--- a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
+++ b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
@@ -52,9 +52,6 @@
 
 QT_FORWARD_DECLARE_CLASS(QWidget)
 
-//TESTED_CLASS=
-//TESTED_FILES=gui/kernel/qevent.h gui/kernel/qevent.cpp
-
 class FocusLineEdit : public QLineEdit
 {
 public:
diff --git a/tests/auto/other/qmultiscreen/tst_qmultiscreen.cpp b/tests/auto/other/qmultiscreen/tst_qmultiscreen.cpp
index 9d74d59f852..9f7411f3ab5 100644
--- a/tests/auto/other/qmultiscreen/tst_qmultiscreen.cpp
+++ b/tests/auto/other/qmultiscreen/tst_qmultiscreen.cpp
@@ -42,9 +42,6 @@
 
 #include <QtTest/QtTest>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 #include <qdesktopwidget.h>
 #include <qscreen_qws.h>
 #include <qscreendriverfactory_qws.h>
diff --git a/tests/auto/other/qobjectperformance/tst_qobjectperformance.cpp b/tests/auto/other/qobjectperformance/tst_qobjectperformance.cpp
index 26145a0df4c..4403a3f57b7 100644
--- a/tests/auto/other/qobjectperformance/tst_qobjectperformance.cpp
+++ b/tests/auto/other/qobjectperformance/tst_qobjectperformance.cpp
@@ -46,9 +46,6 @@
 
 #include <qobject.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=corelib/kernel/qobject.h corelib/kernel/qobject.cpp
-
 class tst_QObjectPerformance : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/sql/kernel/qsql/tst_qsql.cpp b/tests/auto/sql/kernel/qsql/tst_qsql.cpp
index e9c11e5966e..e663289f6c7 100644
--- a/tests/auto/sql/kernel/qsql/tst_qsql.cpp
+++ b/tests/auto/sql/kernel/qsql/tst_qsql.cpp
@@ -54,8 +54,6 @@
 
 #include "../qsqldatabase/tst_databases.h"
 
-//TESTED_FILES=
-
 class tst_QSql : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
index dab9933223c..a124e6c5f5f 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
@@ -54,8 +54,6 @@
 
 #include "tst_databases.h"
 
-//TESTED_FILES=
-
 QT_FORWARD_DECLARE_CLASS(QSqlDatabase)
 struct FieldDef;
 
diff --git a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
index 7d622dbd566..11622e4b2a8 100644
--- a/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
+++ b/tests/auto/sql/kernel/qsqldriver/tst_qsqldriver.cpp
@@ -45,11 +45,6 @@
 
 #include "../qsqldatabase/tst_databases.h"
 
-
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QSqlDriver : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
index d02b373c736..8eb6ae77b72 100644
--- a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
+++ b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
@@ -46,10 +46,6 @@
 #include <qdebug.h>
 #include <qsqlerror.h>
 
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QSqlError : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp b/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp
index 6eb2c0a767e..c121dfa3a98 100644
--- a/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp
+++ b/tests/auto/sql/kernel/qsqlfield/tst_qsqlfield.cpp
@@ -46,10 +46,6 @@
 #include <qvariant.h>
 #include <qsqlfield.h>
 
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QSqlField : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
index cb3bb81d392..c970020a018 100644
--- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
+++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp
@@ -46,8 +46,6 @@
 
 const QString qtest(qTableName( "qtest", __FILE__ ));
 
-//TESTED_FILES=
-
 class tst_QSqlQuery : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp b/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp
index c84e39fb2a1..60b3069e1fb 100644
--- a/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp
+++ b/tests/auto/sql/kernel/qsqlrecord/tst_qsqlrecord.cpp
@@ -46,14 +46,8 @@
 #include "qsqlfield.h"
 #include "qstringlist.h"
 
-
-
-
 #include <qsqlrecord.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 #define NUM_FIELDS 4
 
 class tst_QSqlRecord : public QObject
diff --git a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
index 0eebe760494..71cb59f9710 100644
--- a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
+++ b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
@@ -56,9 +56,6 @@
 
 #include "../../kernel/qsqldatabase/tst_databases.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 Q_DECLARE_METATYPE(Qt::Orientation)
 
 class tst_QSqlQueryModel : public QObject
diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
index 19f08586f1d..c18de4acced 100644
--- a/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
+++ b/tests/auto/sql/models/qsqlrelationaltablemodel/tst_qsqlrelationaltablemodel.cpp
@@ -51,10 +51,6 @@ const QString reltest1(qTableName("reltest1", __FILE__)),
         reltest4(qTableName("reltest4", __FILE__)),
         reltest5(qTableName("reltest5", __FILE__));
 
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QSqlRelationalTableModel : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
index a75a6d459ab..13f6f67a0f3 100644
--- a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
+++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
@@ -48,9 +48,6 @@ const QString test(qTableName("test", __FILE__)),
                    test2(qTableName("test2", __FILE__)),
                    test3(qTableName("test3", __FILE__));
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 Q_DECLARE_METATYPE(QModelIndex)
 
 class tst_QSqlTableModel : public QObject
diff --git a/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp
index a0020acbf60..5e60b6a8882 100644
--- a/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp
+++ b/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp
@@ -47,9 +47,6 @@
 #include <qabstractprintdialog.h>
 #include <qprinter.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QAbstractPrintDialog : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp
index 3ae1e63a8ed..1b1b7137ebc 100644
--- a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp
+++ b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp
@@ -44,9 +44,6 @@
 #include <QtGui/QtGui>
 #include <QtWidgets/QColorDialog>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 QT_FORWARD_DECLARE_CLASS(QtTestEventThread)
 
 class tst_QColorDialog : public QObject
diff --git a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
index 4ac9a6bf5a9..0ebe27f0537 100644
--- a/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
+++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
@@ -55,9 +55,6 @@ Q_DECLARE_METATYPE(QSize)
 
 QT_FORWARD_DECLARE_CLASS(QDialog)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QDialog : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index 5d644465760..41f47987099 100644
--- a/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -68,9 +68,6 @@
 #include <QFileDialog>
 #include <QFileSystemModel>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 #if defined(Q_OS_UNIX)
 #ifdef QT_BUILD_INTERNAL
 QT_BEGIN_NAMESPACE
diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
index 85b81660a7e..bac6b82d372 100644
--- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
@@ -68,9 +68,6 @@
 #include "../../../network-settings.h"
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 #if defined QT_BUILD_INTERNAL
 QT_BEGIN_NAMESPACE
 Q_GUI_EXPORT bool qt_test_isFetchedRoot();
diff --git a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
index 87e3987a587..5e02dec28b7 100644
--- a/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -52,9 +52,6 @@
 #include <QStyle>
 #include <QtGlobal>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 #define WAITTIME 1000
 
 // Will try to wait for the condition while allowing event processing
diff --git a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
index 3f12b7501c6..855cc140953 100644
--- a/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
+++ b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
@@ -51,9 +51,6 @@
 #include "qfontdialog.h"
 #include <private/qfontdialog_p.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 QT_FORWARD_DECLARE_CLASS(QtTestEventThread)
 
 class tst_QFontDialog : public QObject
diff --git a/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp
index 5c74ab217b2..91b55cdc204 100644
--- a/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp
+++ b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp
@@ -49,9 +49,6 @@
 #include <QDialogButtonBox>
 #include <qinputdialog.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QInputDialog : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
index f195017dc45..20cbdfbed4d 100644
--- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
@@ -55,9 +55,6 @@
 #include <QCleanlooksStyle>
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 #define CONVENIENCE_FUNC_SYMS(func) \
     { \
         int x1 = QMessageBox::func(0, "Foo", "Bar"); \
diff --git a/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp b/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp
index 5fbd5d747a6..bccf9ac153a 100644
--- a/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp
+++ b/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp
@@ -47,10 +47,6 @@
 #include <qprogressdialog.h>
 #include <qlabel.h>
 
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QProgressDialog : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
index 2d5ab6f78cf..bb4c671d432 100644
--- a/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
+++ b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
@@ -44,9 +44,6 @@
 #include <QtWidgets/private/qsidebar_p.h>
 #include <QtWidgets/private/qfilesystemmodel_p.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QSidebar : public QObject {
   Q_OBJECT
 
diff --git a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index d865461e497..1b109223b62 100644
--- a/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
@@ -54,9 +54,6 @@
 #include <QPlastiqueStyle>
 #include <QTreeWidget>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 static QImage grabWidget(QWidget *window)
 {
     return QPixmap::grabWidget(window).toImage();
diff --git a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp
index 0bc85bffdc3..a5214832c98 100644
--- a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp
+++ b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp
@@ -52,9 +52,6 @@
 #include <private/qgraphicseffect_p.h>
 #include "../../../platformquirks.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QGraphicsEffect : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp b/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
index 4f39f991c69..a69440da50b 100644
--- a/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
@@ -48,9 +48,6 @@
 
 #include <private/qgraphicseffect_p.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class CustomItem : public QGraphicsRectItem
 {
 public:
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 7880a55f4f4..8a2fdc97f33 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -67,9 +67,6 @@
 #include <QGraphicsLinearLayout>
 #include <float.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QList<QRectF>)
 Q_DECLARE_METATYPE(QPainterPath)
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp
index f7cf3932537..6785ca5620b 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp
@@ -46,9 +46,6 @@
 #include <QtCore/qtimeline.h>
 #include <QtGui/qmatrix.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QGraphicsItemAnimation : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
index 3eac04e4e56..a4f375ec25d 100644
--- a/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
@@ -45,9 +45,6 @@
 #include <QtWidgets>
 #include <math.h>
 
-//TESTED_CLASS=QGraphicsLayout
-//TESTED_FILES=
-
 class tst_QGraphicsLayout : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 496628597d2..dc1e1cb8044 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -61,9 +61,6 @@
 #define Q_CHECK_PAINTEVENTS
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QList<QRectF>)
 Q_DECLARE_METATYPE(QMatrix)
diff --git a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
index ac26999e169..56d2508840c 100644
--- a/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
@@ -46,9 +46,6 @@
 #include <private/qgraphicssceneindex_p.h>
 #include <private/qgraphicsscenelinearindex_p.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QGraphicsSceneIndex : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index a5dc0c69f0c..bf8ece42e25 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -73,9 +73,6 @@
 #include <private/qgraphicsview_p.h>
 #include "../../../platformquirks.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QList<QRectF>)
 Q_DECLARE_METATYPE(QMatrix)
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
index 4d530a353b4..4e1b61e32d5 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
@@ -59,9 +59,6 @@
 #include <qboxlayout.h>
 #include <qlineedit.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 // Will try to wait for the condition while allowing event processing
 // for a maximum of 5 seconds.
 #define TRY_COMPARE(expr, expected) \
diff --git a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
index e7a1a7092f8..4b1a5a1a21c 100644
--- a/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
@@ -53,9 +53,6 @@
 #include <qscrollbar.h>
 #include <private/qcolumnview_p.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 #define ANIMATION_DELAY 300
 
 class tst_QColumnView : public QObject {
diff --git a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
index 65900a4bed6..acbe652c898 100644
--- a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
+++ b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
@@ -46,9 +46,6 @@
 #include <qdir.h>
 #include <qdebug.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QDirModel : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
index dd087b0e95c..cc3fd85da6d 100644
--- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
@@ -60,9 +60,6 @@ Q_DECLARE_METATYPE(IntList)
 typedef QList<bool> BoolList;
 Q_DECLARE_METATYPE(BoolList)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 // Will try to wait for the condition while allowing event processing
 // for a maximum of 2 seconds.
 #define WAIT_FOR_CONDITION(expr, expected) \
diff --git a/tests/auto/widgets/itemviews/qidentityproxymodel/tst_qidentityproxymodel.cpp b/tests/auto/widgets/itemviews/qidentityproxymodel/tst_qidentityproxymodel.cpp
index 6d73cbe2e10..86ff00f9d4d 100644
--- a/tests/auto/widgets/itemviews/qidentityproxymodel/tst_qidentityproxymodel.cpp
+++ b/tests/auto/widgets/itemviews/qidentityproxymodel/tst_qidentityproxymodel.cpp
@@ -48,9 +48,6 @@
 #include "dynamictreemodel.h"
 #include "qidentityproxymodel.h"
 
-//TESTED CLASS=
-//TESTED_FILES=
-
 Q_DECLARE_METATYPE(QModelIndex)
 
 class tst_QIdentityProxyModel : public QObject
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
index df053975af2..a2c85c2f483 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
@@ -65,9 +65,6 @@
 
 Q_DECLARE_METATYPE(QAbstractItemDelegate::EndEditHint)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 #if defined (Q_OS_WIN) && !defined(Q_OS_WINCE)
 #include <windows.h>
 #define Q_CHECK_PAINTEVENTS \
diff --git a/tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp
index 6f805a04d22..2097cb31ee2 100644
--- a/tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp
+++ b/tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp
@@ -45,9 +45,6 @@
 #include <QtGui/QtGui>
 #include <QtWidgets/QtWidgets>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QItemSelectionModel : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
index df77687ed8f..55a406cc74f 100644
--- a/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
+++ b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
@@ -79,9 +79,6 @@ bool qt_wince_is_mobile() {
 #endif
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=gui/itemviews/qtreeview.h gui/itemviews/qtreeview.cpp
-
 /*!
     See viewstotest.cpp for instructions on how to have your view tested with these tests.
 
diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index cb582be3c28..86ec6c1a099 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -60,9 +60,6 @@
 #  include <QtGui/QPlatformNativeInterface>
 #endif // Q_OS_WIN
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 #if defined(Q_OS_WIN) || defined(Q_OS_WINCE)
 static inline HWND getHWNDForWidget(const QWidget *widget)
 {
diff --git a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
index 9ede38f553e..ea3f6ae1437 100644
--- a/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
@@ -49,9 +49,6 @@
 #include <qlistwidget.h>
 #include <private/qlistwidget_p.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QListWidget : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
index 46194ce3f79..fb5fe579a6f 100644
--- a/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
@@ -50,9 +50,6 @@
 
 #include <qdebug.h>
 
-//TESTED CLASS=
-//TESTED_FILES=
-
 typedef QList<int> IntList;
 typedef QPair<int, int> IntPair;
 typedef QList<IntPair> IntPairList;
diff --git a/tests/auto/widgets/itemviews/qstandarditem/tst_qstandarditem.cpp b/tests/auto/widgets/itemviews/qstandarditem/tst_qstandarditem.cpp
index 206d469884e..00c8a868d93 100644
--- a/tests/auto/widgets/itemviews/qstandarditem/tst_qstandarditem.cpp
+++ b/tests/auto/widgets/itemviews/qstandarditem/tst_qstandarditem.cpp
@@ -44,9 +44,6 @@
 
 #include <qstandarditemmodel.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=gui/itemviews/qstandarditemmodel.h gui/itemviews/qstandarditemmodel.cpp
-
 class tst_QStandardItem : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/itemviews/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/widgets/itemviews/qstandarditemmodel/tst_qstandarditemmodel.cpp
index 84a33107aad..6b0636ce775 100644
--- a/tests/auto/widgets/itemviews/qstandarditemmodel/tst_qstandarditemmodel.cpp
+++ b/tests/auto/widgets/itemviews/qstandarditemmodel/tst_qstandarditemmodel.cpp
@@ -46,9 +46,6 @@
 #include <QTreeView>
 #include <private/qtreeview_p.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QStandardItemModel : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp b/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp
index 32c26b50780..c8afe5dd75b 100644
--- a/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp
+++ b/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp
@@ -50,9 +50,6 @@
 #include "qmodellistener.h"
 #include <qstringlistmodel.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 void QModelListener::rowsAboutToBeRemovedOrInserted(const QModelIndex & parent, int start, int end )
 {
     int i;
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index 47e6d861b79..84aa8c7180e 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -46,9 +46,6 @@
 #include <QtTest/QtTest>
 #include "private/qapplication_p.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 // Will try to wait for the condition while allowing event processing
 // for a maximum of 2 seconds.
 #define WAIT_FOR_CONDITION(expr, expected) \
diff --git a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
index 6c32caadbbf..1e5d63c2611 100644
--- a/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
@@ -48,9 +48,6 @@
 
 #include <qtablewidget.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class QObjectTableItem : public QObject, public QTableWidgetItem
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index 6604d922a49..fad4d3deea0 100644
--- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
@@ -44,9 +44,6 @@
 #include <QtGui/QtGui>
 #include <QtWidgets/QtWidgets>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 Q_DECLARE_METATYPE(QModelIndex)
 #ifndef QT_NO_DRAGANDDROP
 Q_DECLARE_METATYPE(QAbstractItemView::DragDropMode)
diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
index ca358d39c48..03619f0c979 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
@@ -51,9 +51,6 @@
 #include <QScrollBar>
 #include <QStyledItemDelegate>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class CustomTreeWidget : public QTreeWidget
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
index 92a1b7cce3d..94f4446b5b5 100644
--- a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
@@ -48,9 +48,6 @@
 #include <qeventloop.h>
 #include <qdebug.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QTreeWidgetItemIterator : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
index 560713a064d..846cba7ad6a 100644
--- a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
+++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
@@ -47,9 +47,6 @@
 #include <qaction.h>
 #include <qmenu.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QAction : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index a2470ceba8a..8cf85dd8ead 100644
--- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
@@ -55,9 +55,6 @@
 #include <windows.h>
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QApplication : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
index 4e5b357de50..088469d7702 100644
--- a/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
+++ b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
@@ -44,9 +44,6 @@
 #include <QtGui>
 #include <QtWidgets>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QBoxLayout : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp b/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp
index e7e3abeb256..c66e0c1c614 100644
--- a/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp
+++ b/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp
@@ -44,8 +44,6 @@
 #include <QtWidgets/QDesktopWidget>
 #include <QDebug>
 
-//TESTED_CLASS=
-
 class tst_QDesktopWidget : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
index 4425205eb9d..a4d2cccc8ee 100644
--- a/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
@@ -56,9 +56,6 @@
 
 #include <qformlayout.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QFormLayout : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
index 9aed5438a2d..c7411af7166 100644
--- a/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
+++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
@@ -56,10 +56,6 @@
 
 #include "../../../platformquirks.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=gui/kernel/qlayout.cpp gui/kernel/qlayout.h
-
-
 class tst_QGridLayout : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
index b25c632a6ec..6cfb2f2f2a3 100644
--- a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
+++ b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
@@ -60,9 +60,6 @@
 # include <QtGui/QMacStyle>
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QLayout : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
index 66a8fe24a85..2529ccf426a 100644
--- a/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
+++ b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
@@ -47,9 +47,6 @@
 #include <qwidget.h>
 #include <QPushButton>
 
-//TESTED_CLASS=
-//TESTED_FILES=gui/kernel/qlayout.cpp gui/kernel/qlayout.h
-
 class tst_QStackedLayout : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
index 3ff31ead625..d2126d40431 100644
--- a/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
+++ b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
@@ -43,9 +43,6 @@
 #include <QtTest/QtTest>
 #include <qtooltip.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QToolTip : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index fe02d1a6813..28daf0ac02a 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -156,9 +156,6 @@ bool macHasAccessToWindowsServer()
 #undef Bool
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QWidget : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp
index 5f51f6d3165..9b161ec5b89 100644
--- a/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp
+++ b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp
@@ -51,9 +51,6 @@
 #include <qmainwindow.h>
 #include <qmenubar.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QWidgetAction : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
index a262712abc3..30e380ea1c2 100644
--- a/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
+++ b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
@@ -47,9 +47,6 @@
 
 const int N = 1;
 
-//TESTED_CLASS=
-//TESTED_FILES=gui/styles/qmacstyle_mac.h gui/styles/qmacstyle_mac.cpp
-
 enum Size { Normal, Small, Mini };
 
 Q_DECLARE_METATYPE(Size);
diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
index 77c1d71129b..5dede997ae8 100644
--- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
+++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
@@ -104,9 +104,6 @@ static bool qt_wince_is_smartphone() {
 
 #include <qwidget.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=gui/styles/qstyle.h gui/styles/qstyle.cpp gui/styles/qplastiquestyle.cpp gui/styles/qwindowsstyle.cpp gui/styles/qwindowsxpstyle.cpp gui/styles/qwindowsvistastyle.cpp gui/styles/qmotifstyle.cpp
-
 class tst_QStyle : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
index 9ecf4d86763..a1a27f538a3 100644
--- a/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -48,9 +48,6 @@
 #include <private/qstylesheetstyle_p.h>
 #include "../../../platformquirks.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QStyleSheetStyle : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
index ccf3c449b3d..9d751311498 100644
--- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
+++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
@@ -49,9 +49,6 @@
 
 #include "../../../../shared/filesystem.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class CsvCompleter : public QCompleter
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
index a226e4521bc..2d1cace9293 100644
--- a/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
+++ b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
@@ -47,9 +47,6 @@
 #include <qsystemtrayicon.h>
 #include <qmenu.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QSystemTrayIcon: public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp
index b1fa420a605..0d65c123267 100644
--- a/tests/auto/widgets/util/qundostack/tst_qundostack.cpp
+++ b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp
@@ -44,9 +44,6 @@
 #include <QAction>
 #include <QUndoStack>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 /******************************************************************************
 ** Commands
 */
diff --git a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
index 526cfff1ee0..5d4c346adb0 100644
--- a/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
+++ b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
@@ -50,14 +50,8 @@
 #include <qkeysequence.h>
 #include <qevent.h>
 #include <qgridlayout.h>
-
-
-
 #include <qabstractbutton.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QAbstractButton : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp
index 5c9a33cdc6e..542c3f58b34 100644
--- a/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp
+++ b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp
@@ -51,9 +51,6 @@
 #include <qwidget.h>
 #include <qdialog.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QAbstractScrollArea : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp b/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp
index 4e936638f7b..93415b35cde 100644
--- a/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp
+++ b/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp
@@ -48,10 +48,6 @@
 #include <qlineedit.h>
 #include <qspinbox.h>
 
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QAbstractSpinBox : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
index c48efcd5ebb..87163305b9d 100644
--- a/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
+++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
@@ -73,9 +73,6 @@ protected:
 
 #include <qbuttongroup.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QButtonGroup : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp
index e4c1df2c6b0..2098c95907d 100644
--- a/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp
+++ b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp
@@ -50,10 +50,6 @@
 #include <qdatetime.h>
 #include <qtextformat.h>
 
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QCalendarWidget : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp b/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp
index 33f5af4d0b1..404f3f30b9a 100644
--- a/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp
+++ b/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp
@@ -49,9 +49,6 @@
 #include <qdatetime.h>
 #include <qcheckbox.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QCheckBox : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index 8f6d5bc0e08..807c99ff4e2 100644
--- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
@@ -81,9 +81,6 @@
 #include <qwindowsstyle.h>
 #endif
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QComboBox : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
index 6a51bf4bba3..7d550bcf9c4 100644
--- a/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
+++ b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
@@ -55,9 +55,6 @@
 
 Q_DECLARE_METATYPE(QCommandLinkButton*)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QCommandLinkButton : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
index c83634a6a79..eb561b1dff8 100644
--- a/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
@@ -120,10 +120,6 @@ bool qt_wince_is_mobile() {
 }
 #endif
 
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class EditorDateEdit : public QDateTimeEdit
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
index 449cc5e44d1..b470edc38ac 100644
--- a/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
@@ -47,9 +47,6 @@
 #include <qdialogbuttonbox.h>
 #include <limits.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QDialogButtonBox::ButtonRole)
 Q_DECLARE_METATYPE(QDialogButtonBox::StandardButton)
diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
index cd0b95160d3..41616dcfc1e 100644
--- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
+++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
@@ -61,8 +61,6 @@ void setFeature(QDockWidget *dockwidget, QDockWidget::DockWidgetFeature feature,
     dockwidget->setFeatures(on ? features | feature : features & ~feature);
 }
 
-//TESTED_FILES=
-
 class tst_QDockWidget : public QObject
 {
      Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
index cec6048e61e..8e3a9db824d 100644
--- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
+++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
@@ -53,10 +53,6 @@
 #include <qlineedit.h>
 #include <qdebug.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=gui/widgets/qspinbox.h gui/widgets/qspinbox.cpp gui/widgets/qabstractspinbox.cpp gui/widgets/qabstractspinbox_p.h gui/widgets/qabstractspinbox.h
-
-
 class DoubleSpinBox : public QDoubleSpinBox
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp b/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp
index 1658cf3fe5b..b17529845ab 100644
--- a/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp
+++ b/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp
@@ -46,10 +46,6 @@
 #include <qdebug.h>
 #include <qfocusframe.h>
 
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QFocusFrame : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp b/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
index 21360d8899d..a8dadf77e01 100644
--- a/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
+++ b/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
@@ -49,9 +49,6 @@
 
 #include "qgroupbox.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QGroupBox : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
index 15123850339..18da7fdf5f4 100644
--- a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
+++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
@@ -53,9 +53,6 @@
 #include <qmessagebox.h>
 #include <private/qlabel_p.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class Widget : public QWidget
 {
 public:
diff --git a/tests/auto/widgets/widgets/qlcdnumber/tst_qlcdnumber.cpp b/tests/auto/widgets/widgets/qlcdnumber/tst_qlcdnumber.cpp
index 0976f3f619b..1341ab3d22d 100644
--- a/tests/auto/widgets/widgets/qlcdnumber/tst_qlcdnumber.cpp
+++ b/tests/auto/widgets/widgets/qlcdnumber/tst_qlcdnumber.cpp
@@ -46,10 +46,6 @@
 #include <qdebug.h>
 #include <qlcdnumber.h>
 
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QLCDNumber : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index 0a742747727..1e39e03e807 100644
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -64,9 +64,6 @@
 #include <qspinbox.h>
 #include <qdebug.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 #include "qcommonstyle.h"
 #include "qstyleoption.h"
 
diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
index 1fbd0f0da72..1ff21e923ab 100644
--- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
@@ -57,8 +57,6 @@
 #include <private/qdockarealayout_p.h>
 #include "../../../platformquirks.h"
 
-//TESTED_FILES=
-
 static uchar restoreData41[] = { 0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0x0, 0x0, 0xfd, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x64, 0x0, 0x0, 0x1, 0x19, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x30, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x34, 0x1, 0x0, 0x0, 0x0, 0x49, 0x0, 0x0, 0x0, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x38, 0x1, 0x0, 0x0, 0x0, 0x8d, 0x0, 0x0, 0x0, 0x43, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x32, 0x1, 0x0, 0x0, 0x0, 0xd4, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x64, 0x0, 0x0, 0x1, 0x19, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x35, 0x1, 0x0, 0x0, 0x0, 0x49, 0x0, 0x0, 0x0, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x39, 0x1, 0x0, 0x0, 0x0, 0x8d, 0x0, 0x0, 0x0, 0x43, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x33, 0x1, 0x0, 0x0, 0x0, 0xd4, 0x0, 0x0, 0x0, 0x45, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x1, 0x89, 0x0, 0x0, 0x0, 0xe, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x32, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x36, 0x1, 0x0, 0x0, 0x0, 0x63, 0x0, 0x0, 0x0, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x30, 0x1, 0x0, 0x0, 0x0, 0xc8, 0x0, 0x0, 0x0, 0x5e, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x34, 0x1, 0x0, 0x0, 0x1, 0x2a, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x1, 0x89, 0x0, 0x0, 0x0, 0xe, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x33, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x37, 0x1, 0x0, 0x0, 0x0, 0x63, 0x0, 0x0, 0x0, 0x61, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x31, 0x1, 0x0, 0x0, 0x0, 0xc8, 0x0, 0x0, 0x0, 0x5e, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x35, 0x1, 0x0, 0x0, 0x1, 0x2a, 0x0, 0x0, 0x0, 0x5f, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0xc1, 0x0, 0x0, 0x1, 0x19}; 
 static uchar restoreData42[] = { 0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0xfc, 0x0, 0x0, 0x0, 0x0, 0xfd, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x24, 0x0, 0x0, 0x2, 0x2b, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x30, 0x1, 0x0, 0x0, 0x0, 0x2a, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x34, 0x1, 0x0, 0x0, 0x0, 0xb6, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x38, 0x1, 0x0, 0x0, 0x1, 0x42, 0x0, 0x0, 0x0, 0x87, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x32, 0x1, 0x0, 0x0, 0x1, 0xcd, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x98, 0x0, 0x0, 0x2, 0x2b, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x1, 0x0, 0x0, 0x0, 0x2a, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x35, 0x1, 0x0, 0x0, 0x0, 0xb6, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x39, 0x1, 0x0, 0x0, 0x1, 0x42, 0x0, 0x0, 0x0, 0x87, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x33, 0x1, 0x0, 0x0, 0x1, 0xcd, 0x0, 0x0, 0x0, 0x88, 0x0, 0x0, 0x0, 0x21, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x4, 0x4e, 0x0, 0x0, 0x0, 0x26, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x32, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x12, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x36, 0x1, 0x0, 0x0, 0x1, 0x16, 0x0, 0x0, 0x1, 0xe, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x30, 0x1, 0x0, 0x0, 0x2, 0x28, 0x0, 0x0, 0x1, 0x14, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x34, 0x1, 0x0, 0x0, 0x3, 0x40, 0x0, 0x0, 0x1, 0xe, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x4, 0x4e, 0x0, 0x0, 0x0, 0x26, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x33, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1, 0x12, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x37, 0x1, 0x0, 0x0, 0x1, 0x16, 0x0, 0x0, 0x1, 0xe, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x31, 0x1, 0x0, 0x0, 0x2, 0x28, 0x0, 0x0, 0x1, 0x14, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x35, 0x1, 0x0, 0x0, 0x3, 0x40, 0x0, 0x0, 0x1, 0xe, 0x0, 0x0, 0x0, 0xa, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x3, 0x8a, 0x0, 0x0, 0x2, 0x2b, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x8, 0x0, 0x0, 0x0, 0x8};
 static uchar restoreData43[] = { 0x0, 0x0, 0x0, 0xff, 0x0, 0x0, 0x0, 0x0, 0xfd, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x50, 0x0, 0x0, 0x0, 0xa0, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x30, 0x1, 0x0, 0x0, 0x0, 0x2a, 0x0, 0x0, 0x0, 0x25, 0x0, 0x0, 0x0, 0x16, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x34, 0x1, 0x0, 0x0, 0x0, 0x53, 0x0, 0x0, 0x0, 0x25, 0x0, 0x0, 0x0, 0x16, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x38, 0x1, 0x0, 0x0, 0x0, 0x7c, 0x0, 0x0, 0x0, 0x25, 0x0, 0x0, 0x0, 0x16, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x32, 0x1, 0x0, 0x0, 0x0, 0xa5, 0x0, 0x0, 0x0, 0x25, 0x0, 0x0, 0x0, 0x16, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x1, 0x0, 0x0, 0x0, 0x98, 0x0, 0x0, 0x0, 0xa0, 0xfc, 0x2, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x1, 0x0, 0x0, 0x0, 0x2a, 0x0, 0x0, 0x0, 0x25, 0x0, 0x0, 0x0, 0x16, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x35, 0x1, 0x0, 0x0, 0x0, 0x53, 0x0, 0x0, 0x0, 0x25, 0x0, 0x0, 0x0, 0x16, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x39, 0x1, 0x0, 0x0, 0x0, 0x7c, 0x0, 0x0, 0x0, 0x25, 0x0, 0x0, 0x0, 0x16, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x33, 0x1, 0x0, 0x0, 0x0, 0xa5, 0x0, 0x0, 0x0, 0x25, 0x0, 0x0, 0x0, 0x16, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x1, 0xa8, 0x0, 0x0, 0x0, 0x26, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x32, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x68, 0x0, 0x0, 0x0, 0x50, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x36, 0x1, 0x0, 0x0, 0x0, 0x6c, 0x0, 0x0, 0x0, 0x66, 0x0, 0x0, 0x0, 0x50, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x30, 0x1, 0x0, 0x0, 0x0, 0xd6, 0x0, 0x0, 0x0, 0x68, 0x0, 0x0, 0x0, 0x50, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x34, 0x1, 0x0, 0x0, 0x1, 0x42, 0x0, 0x0, 0x0, 0x66, 0x0, 0x0, 0x0, 0x50, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x1, 0xa8, 0x0, 0x0, 0x0, 0x26, 0xfc, 0x1, 0x0, 0x0, 0x0, 0x4, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x33, 0x1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x68, 0x0, 0x0, 0x0, 0x50, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xc, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x37, 0x1, 0x0, 0x0, 0x0, 0x6c, 0x0, 0x0, 0x0, 0x66, 0x0, 0x0, 0x0, 0x50, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x31, 0x1, 0x0, 0x0, 0x0, 0xd6, 0x0, 0x0, 0x0, 0x68, 0x0, 0x0, 0x0, 0x50, 0x0, 0xff, 0xff, 0xff, 0xfb, 0x0, 0x0, 0x0, 0xe, 0x0, 0x64, 0x0, 0x6f, 0x0, 0x63, 0x0, 0x6b, 0x0, 0x20, 0x0, 0x31, 0x0, 0x35, 0x1, 0x0, 0x0, 0x1, 0x42, 0x0, 0x0, 0x0, 0x66, 0x0, 0x0, 0x0, 0x50, 0x0, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0xb8, 0x0, 0x0, 0x0, 0xa0, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0x8, 0x0, 0x0, 0x0, 0x8, 0xfc, 0x0, 0x0, 0x0, 0x0};
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index 59fbdafbafc..da587c0393e 100644
--- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
@@ -73,9 +73,6 @@ Q_DECLARE_METATYPE(QMdiSubWindow *)
 Q_DECLARE_METATYPE(QList<int>)
 Q_DECLARE_METATYPE(QTabWidget::TabPosition)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 static bool tabBetweenSubWindowsIn(QMdiArea *mdiArea, int tabCount = -1, bool reverse = false)
 {
     if (!mdiArea) {
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
index a9311911e6d..9cc764b716f 100644
--- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -160,9 +160,6 @@ Q_DECLARE_METATYPE(Qt::WindowStates);
 Q_DECLARE_METATYPE(Qt::WindowType);
 Q_DECLARE_METATYPE(Qt::WindowFlags);
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QMdiSubWindow : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index 9b4f055684d..0714910faf0 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -59,9 +59,6 @@
 Q_DECLARE_METATYPE(Qt::Key);
 Q_DECLARE_METATYPE(Qt::KeyboardModifiers);
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QMenu : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
index 17da9c746fd..ad7071f651c 100644
--- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
@@ -60,9 +60,6 @@ QT_FORWARD_DECLARE_CLASS(QMainWindow)
 
 #include <qmenubar.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class QtTestSlot : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
index 2fcee700f8c..96364446be5 100644
--- a/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
+++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
@@ -72,9 +72,6 @@ Q_DECLARE_METATYPE(QList<bool>);
 
 QT_FORWARD_DECLARE_CLASS(QPlainTextEdit)
 
-//TESTED_CLASS=
-//TESTED_FILES=gui/widgets/qtextedit.h gui/widgets/qtextedit.cpp
-
 class tst_QPlainTextEdit : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp
index c05fdc4442d..0844c2f5e21 100644
--- a/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp
+++ b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp
@@ -48,9 +48,6 @@
 #include <qtimer.h>
 #include <QStyleFactory>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QProgressBar : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
index ed33881d6d1..3a0a3208317 100644
--- a/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
+++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
@@ -56,9 +56,6 @@
 
 Q_DECLARE_METATYPE(QPushButton*)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QPushButton : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qregexpvalidator/tst_qregexpvalidator.cpp b/tests/auto/widgets/widgets/qregexpvalidator/tst_qregexpvalidator.cpp
index 23cd5b1ef1b..2e245ab0c79 100644
--- a/tests/auto/widgets/widgets/qregexpvalidator/tst_qregexpvalidator.cpp
+++ b/tests/auto/widgets/widgets/qregexpvalidator/tst_qregexpvalidator.cpp
@@ -46,9 +46,6 @@
 
 #include <qvalidator.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=corelib/tools/qregexp.h corelib/tools/qregexp.cpp
-
 class tst_QRegExpValidator : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp
index 8dcfb079d23..ba4dc855ced 100644
--- a/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp
+++ b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp
@@ -47,9 +47,6 @@
 #include <qscrollarea.h>
 #include <qlayout.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QScrollArea : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp b/tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp
index cc0710a65a4..9b7d0a7f0bd 100644
--- a/tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp
+++ b/tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp
@@ -62,9 +62,6 @@ static inline Qt::Corner sizeGripCorner(QWidget *parent, QSizeGrip *sizeGrip)
 
 }
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 Q_DECLARE_METATYPE(Qt::WindowType);
 
 class tst_QSizeGrip : public QObject
diff --git a/tests/auto/widgets/widgets/qslider/tst_qslider.cpp b/tests/auto/widgets/widgets/qslider/tst_qslider.cpp
index 50ee9e6a63d..43942e96d8c 100644
--- a/tests/auto/widgets/widgets/qslider/tst_qslider.cpp
+++ b/tests/auto/widgets/widgets/qslider/tst_qslider.cpp
@@ -46,9 +46,6 @@
 #include <qdebug.h>
 #include <qslider.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QSlider : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
index 608dcd67053..620263bcb6f 100644
--- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
+++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
@@ -68,9 +68,6 @@
 #include <QStackedWidget>
 #include <QDebug>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class SpinBox : public QSpinBox
 {
 public:
diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
index 836286e8aec..7aa760bc22f 100644
--- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
+++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
@@ -56,9 +56,6 @@
 #include <qlabel.h>
 #include <qdebug.h> // for file error messages
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 QT_FORWARD_DECLARE_CLASS(QSplitter)
 QT_FORWARD_DECLARE_CLASS(QWidget)
 class tst_QSplitter : public QObject
diff --git a/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp b/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp
index a4e71eca515..e5651ceebf6 100644
--- a/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp
+++ b/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp
@@ -48,9 +48,6 @@
 #include <qpushbutton.h>
 #include <QHBoxLayout>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QStackedWidget : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
index a4a232951ac..56d7e7bedf7 100644
--- a/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
+++ b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
@@ -48,9 +48,6 @@
 #include <QMainWindow>
 #include <QSizeGrip>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QStatusBar: public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
index deaece337dd..de5080cdc2d 100644
--- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
+++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
@@ -47,9 +47,6 @@
 #include <qlabel.h>
 #include <QtWidgets/qboxlayout.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
 #  include <qt_windows.h>
 #define Q_CHECK_PAINTEVENTS \
diff --git a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
index 264d098367f..ff3faeb1d3e 100644
--- a/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
+++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
@@ -49,9 +49,6 @@
 #include <qtextbrowser.h>
 #include <qtextobject.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class TestBrowser : public QTextBrowser
 {
 public:
diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
index 0a76c9a9455..9c90255da13 100644
--- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
@@ -89,9 +89,6 @@ bool nativeClipboardWorking()
 
 QT_FORWARD_DECLARE_CLASS(QTextEdit)
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QTextEdit : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
index eb043aced81..a796554d6bb 100644
--- a/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
+++ b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
@@ -57,8 +57,6 @@
 #include <qmenu.h>
 #include <private/qtoolbarextension_p.h>
 
-//TESTED_FILES=
-
 QT_FORWARD_DECLARE_CLASS(QAction)
 
 class tst_QToolBar : public QObject
diff --git a/tests/auto/widgets/widgets/qtoolbox/tst_qtoolbox.cpp b/tests/auto/widgets/widgets/qtoolbox/tst_qtoolbox.cpp
index 2288eee5f47..ca3fb346323 100644
--- a/tests/auto/widgets/widgets/qtoolbox/tst_qtoolbox.cpp
+++ b/tests/auto/widgets/widgets/qtoolbox/tst_qtoolbox.cpp
@@ -44,10 +44,6 @@
 
 #include <qtoolbox.h>
 
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 QT_FORWARD_DECLARE_CLASS(QToolBox)
 
 class tst_QToolBoxPrivate;
diff --git a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
index 0e21ea6611a..333b98b3be8 100644
--- a/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
+++ b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
@@ -50,9 +50,6 @@
 #include <qwindowsstyle.h>
 #include <qstyleoption.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QToolButton : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp b/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp
index d93043c12be..28ffb4280f6 100644
--- a/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp
+++ b/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp
@@ -46,9 +46,6 @@
 #include <qmenubar.h>
 #include <qworkspace.h>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QWorkspace : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/xml/dom/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp
index ab14a804205..734d7b473b3 100644
--- a/tests/auto/xml/dom/qdom/tst_qdom.cpp
+++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp
@@ -52,9 +52,6 @@
 #include <QtXml>
 #include <QVariant>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 QT_FORWARD_DECLARE_CLASS(QDomDocument)
 QT_FORWARD_DECLARE_CLASS(QDomNode)
 
diff --git a/tests/auto/xml/sax/qxml/tst_qxml.cpp b/tests/auto/xml/sax/qxml/tst_qxml.cpp
index 5fd8793f19b..8a5e7505638 100644
--- a/tests/auto/xml/sax/qxml/tst_qxml.cpp
+++ b/tests/auto/xml/sax/qxml/tst_qxml.cpp
@@ -46,10 +46,6 @@
 #include <qdebug.h>
 #include <qxml.h>
 
-
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QXml : public QObject
 {
 Q_OBJECT
diff --git a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp
index 9d31b347726..ba6d2922f36 100644
--- a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp
+++ b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp
@@ -51,9 +51,6 @@
 #include <QXmlInputSource>
 #include <QXmlSimpleReader>
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QXmlInputSource : public QObject
 {
     Q_OBJECT
diff --git a/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp b/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
index 6c667629047..5447e6f0eb1 100644
--- a/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
+++ b/tests/auto/xml/sax/qxmlsimplereader/tst_qxmlsimplereader.cpp
@@ -54,9 +54,6 @@
 static const char *const inputString = "<!DOCTYPE inferno [<!ELEMENT inferno (circle+)><!ELEMENT circle (#PCDATA)>]><inferno><circle /><circle /></inferno>";
 static const char *const refString = "setDocumentLocator(locator={columnNumber=1, lineNumber=1})\nstartDocument()\nstartDTD(name=\"inferno\", publicId=\"\", systemId=\"\")\nendDTD()\nstartElement(namespaceURI=\"\", localName=\"inferno\", qName=\"inferno\", atts=[])\nstartElement(namespaceURI=\"\", localName=\"circle\", qName=\"circle\", atts=[])\nendElement(namespaceURI=\"\", localName=\"circle\", qName=\"circle\")\nstartElement(namespaceURI=\"\", localName=\"circle\", qName=\"circle\", atts=[])\nendElement(namespaceURI=\"\", localName=\"circle\", qName=\"circle\")\nendElement(namespaceURI=\"\", localName=\"inferno\", qName=\"inferno\")\nendDocument()\n";
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 #define TEST_PORT 1088
 
 class XmlServer : public QThread
diff --git a/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp b/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp
index f58365b9dfe..36c88ea251f 100644
--- a/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp
+++ b/tests/benchmarks/corelib/kernel/qmetatype/tst_qmetatype.cpp
@@ -42,8 +42,6 @@
 #include <qtest.h>
 #include <QtCore/qmetatype.h>
 
-//TESTED_FILES=
-
 class tst_QMetaType : public QObject
 {
     Q_OBJECT
diff --git a/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp b/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp
index 2cb6221cee7..6f6085b7c77 100644
--- a/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp
+++ b/tests/benchmarks/corelib/thread/qmutex/tst_qmutex.cpp
@@ -105,8 +105,6 @@ void NativeMutexUnlock(NativeMutexType *mutex)
 }
 #endif
 
-//TESTED_FILES=
-
 class tst_QMutex : public QObject
 {
     Q_OBJECT
diff --git a/tests/benchmarks/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp b/tests/benchmarks/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
index 0a16ee6af6d..7ded3a350d1 100644
--- a/tests/benchmarks/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
+++ b/tests/benchmarks/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp
@@ -42,8 +42,6 @@
 #include <qtest.h>
 #include <QtCore>
 
-//TESTED_FILES=
-
 QThreadStorage<int *> dummy[8];
 
 QThreadStorage<QString *> tls1;
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index cda89d3e156..df2d39288f0 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -44,8 +44,6 @@
 #include <QGraphicsScene>
 #include <QGraphicsView>
 
-//TESTED_FILES=
-
 class tst_QGraphicsItem : public QObject
 {
     Q_OBJECT
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 6ffe476ecb0..fd0e89e17f0 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -44,8 +44,6 @@
 #include <QGraphicsScene>
 #include <QGraphicsView>
 
-//TESTED_FILES=
-
 class tst_QGraphicsScene : public QObject
 {
     Q_OBJECT
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index 5aa73456ef6..04d48f19e04 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -54,8 +54,6 @@
 #include "valgrind/callgrind.h"
 #endif
 
-//TESTED_FILES=
-
 static inline void processEvents()
 {
     QPixmapCache::clear();
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/benchmarks/gui/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index a042074854e..756ded7d758 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -44,7 +44,6 @@
 #include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QGraphicsWidget>
-//TESTED_FILES=
 
 class tst_QGraphicsWidget : public QObject
 {
diff --git a/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp b/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp
index f66c90ea465..1f904a355f4 100644
--- a/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp
@@ -63,8 +63,6 @@ Q_DECLARE_METATYPE(QStringMap)
 Q_DECLARE_METATYPE(QIntList)
 Q_DECLARE_METATYPE(QIODevice *)
 
-//TESTED_FILES=
-
 class tst_QImageReader : public QObject
 {
     Q_OBJECT
diff --git a/tests/benchmarks/gui/image/qpixmapcache/tst_qpixmapcache.cpp b/tests/benchmarks/gui/image/qpixmapcache/tst_qpixmapcache.cpp
index d08a20dc004..f2189b1cbde 100644
--- a/tests/benchmarks/gui/image/qpixmapcache/tst_qpixmapcache.cpp
+++ b/tests/benchmarks/gui/image/qpixmapcache/tst_qpixmapcache.cpp
@@ -41,7 +41,6 @@
 
 #include <qtest.h>
 #include <QPixmapCache>
-//TESTED_FILES=
 
 class tst_QPixmapCache : public QObject
 {
diff --git a/tests/benchmarks/gui/itemviews/qtableview/tst_qtableview.cpp b/tests/benchmarks/gui/itemviews/qtableview/tst_qtableview.cpp
index e7cb2da252a..8bd09e60402 100644
--- a/tests/benchmarks/gui/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/benchmarks/gui/itemviews/qtableview/tst_qtableview.cpp
@@ -45,8 +45,6 @@
 #include <QImage>
 #include <QPainter>
 
-//TESTED_FILES=
-
 class QtTestTableModel: public QAbstractTableModel
 {
     Q_OBJECT
diff --git a/tests/benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp b/tests/benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp
index e50bde5d64d..7bce2a17766 100644
--- a/tests/benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp
+++ b/tests/benchmarks/gui/math3d/qquaternion/tst_qquaternion.cpp
@@ -42,8 +42,6 @@
 #include <qtest.h>
 #include <QQuaternion>
 
-//TESTED_FILES=
-
 class tst_QQuaternion : public QObject
 {
     Q_OBJECT
diff --git a/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp b/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp
index 25cbb076cf0..dc3f1f900e8 100644
--- a/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp
+++ b/tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp
@@ -46,8 +46,6 @@
 
 #include "benchmarktests.h"
 
-//TESTED_FILES=
-
 class BenchWidget : public QWidget
 {
 public:
diff --git a/tests/benchmarks/gui/painting/qtracebench/tst_qtracebench.cpp b/tests/benchmarks/gui/painting/qtracebench/tst_qtracebench.cpp
index 1961465ae72..0bb586d85de 100644
--- a/tests/benchmarks/gui/painting/qtracebench/tst_qtracebench.cpp
+++ b/tests/benchmarks/gui/painting/qtracebench/tst_qtracebench.cpp
@@ -46,8 +46,6 @@
 #include <private/qpaintengineex_p.h>
 #include <private/qpaintbuffer_p.h>
 
-//TESTED_FILES=
-
 class ReplayWidget : public QWidget
 {
     Q_OBJECT
diff --git a/tests/benchmarks/gui/painting/qtransform/tst_qtransform.cpp b/tests/benchmarks/gui/painting/qtransform/tst_qtransform.cpp
index 7c37ebe0b82..a11af5a3dd2 100644
--- a/tests/benchmarks/gui/painting/qtransform/tst_qtransform.cpp
+++ b/tests/benchmarks/gui/painting/qtransform/tst_qtransform.cpp
@@ -42,8 +42,6 @@
 #include <qtest.h>
 #include <QTransform>
 
-//TESTED_FILES=
-
 class tst_QTransform : public QObject
 {
     Q_OBJECT
diff --git a/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
index 7f6ded8111e..c5d47f1a568 100644
--- a/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/benchmarks/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -56,9 +56,6 @@ Q_DECLARE_METATYPE(QList<QNetworkProxy>)
 
 #include "../../../../auto/network-settings.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QTcpServer : public QObject
 {
     Q_OBJECT
diff --git a/tests/benchmarks/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/benchmarks/network/ssl/qsslsocket/tst_qsslsocket.cpp
index 9f0a694b9a5..d3684837b75 100644
--- a/tests/benchmarks/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/benchmarks/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -48,9 +48,6 @@
 
 #include "../../../../auto/network-settings.h"
 
-//TESTED_CLASS=
-//TESTED_FILES=
-
 class tst_QSslSocket : public QObject
 {
     Q_OBJECT