diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -13,5 +13,6 @@
     KF5::KIOFileWidgets
     KF5::BalooWidgets
     KF5::FileMetaData 
-    Qt5::Test Qt5::Widgets
+    Qt5::Test 
+    Qt5::Widgets
 )
diff --git a/autotests/filemetadatawidgettest.h b/autotests/filemetadatawidgettest.h
--- a/autotests/filemetadatawidgettest.h
+++ b/autotests/filemetadatawidgettest.h
@@ -25,13 +25,10 @@
 #include "config.h"
 #include <QObject>
 
-#include <kfileitem.h>
+#include <KFileItem>
 #include <filemetadatawidget.h>
 
-//#include <KFileItem>
-// Q_DECLARE_METATYPE(KFileItemList)
-    
-class filemetadatawidgettest : public QObject
+class FileMetadataWidgetTest : public QObject
 {
     Q_OBJECT
 private Q_SLOTS:
@@ -41,8 +38,8 @@
     void init();
     void cleanup();
 
-    void ShouldSignalOnceFile();
-    void ShouldSignalOnceFiles();
+    void shouldSignalOnceFile();
+    void shouldSignalOnceFiles();
 private:
      Baloo::FileMetaDataWidget*  m_widget;
 };
diff --git a/autotests/filemetadatawidgettest.cpp b/autotests/filemetadatawidgettest.cpp
--- a/autotests/filemetadatawidgettest.cpp
+++ b/autotests/filemetadatawidgettest.cpp
@@ -28,48 +28,45 @@
 
 
 // other options: QTEST_GUILESS_MAIN, QTEST_APPLESS_MAIN
-QTEST_MAIN(filemetadatawidgettest)
+QTEST_MAIN(FileMetadataWidgetTest)
 // Q_DECLARE_METATYPE(KFileItem)
 Q_DECLARE_METATYPE(KFileItemList)
 
-void filemetadatawidgettest::initTestCase()
+void FileMetadataWidgetTest::initTestCase()
 {
     // Called before the first testfunction is executed
     qRegisterMetaType<KFileItemList>("KFileItemList");
 }
 
-void filemetadatawidgettest::cleanupTestCase()
+void FileMetadataWidgetTest::cleanupTestCase()
 {
     // Called after the last testfunction was executed
 }
 
-void filemetadatawidgettest::init()
+void FileMetadataWidgetTest::init()
 {
     // Called before each testfunction is executed
     m_widget = new Baloo::FileMetaDataWidget;
 }
 
-void filemetadatawidgettest::cleanup()
+void FileMetadataWidgetTest::cleanup()
 {
     // Called after every testfunction
     delete m_widget;
 }
 
-void filemetadatawidgettest::ShouldSignalOnceFile()
+void FileMetadataWidgetTest::shouldSignalOnceFile()
 {
     QSignalSpy spy(m_widget, &Baloo::FileMetaDataWidget::metaDataRequestFinished);
     m_widget->setItems(KFileItemList() 
         << QUrl::fromLocalFile(TESTS_SAMPLE_FILES_PATH + QDir::separator() + QStringLiteral("testtagged.m4a")));
     QVERIFY(spy.wait());
     QCOMPARE(spy.count(), 1);
     QCOMPARE(m_widget->items().count(), 1);
     
-    // To be safe: wait for a 2nd signal
-    QEXPECT_FAIL("", "Wait for consecutive signals timed out", Continue);
-    QVERIFY(spy.wait(1000));
 }
 
-void filemetadatawidgettest::ShouldSignalOnceFiles()
+void FileMetadataWidgetTest::shouldSignalOnceFiles()
 {
     QSignalSpy spy(m_widget, &Baloo::FileMetaDataWidget::metaDataRequestFinished);
     m_widget->setItems(KFileItemList() 
@@ -81,9 +78,5 @@
     QCOMPARE(spy.count(), 1);
     QCOMPARE(m_widget->items().count(), 3);
     
-    // To be safe: wait for a 2nd signal
-    QEXPECT_FAIL("", "Wait for consecutive signals timed out", Continue);
-    QVERIFY(spy.wait(1000));
-    
 }
 #include "filemetadatawidgettest.moc"