diff --git a/autotests/samplefiles/no-meta/test.flac b/autotests/samplefiles/no-meta/test.flac
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/autotests/samplefiles/no-meta/test.m4a b/autotests/samplefiles/no-meta/test.m4a
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/autotests/samplefiles/no-meta/test.mp3 b/autotests/samplefiles/no-meta/test.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/autotests/samplefiles/no-meta/test.mpc b/autotests/samplefiles/no-meta/test.mpc
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/autotests/samplefiles/no-meta/test.ogg b/autotests/samplefiles/no-meta/test.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/autotests/samplefiles/no-meta/test.opus b/autotests/samplefiles/no-meta/test.opus
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

literal 0
Hc$@<O00001

diff --git a/autotests/taglibextractortest.h b/autotests/taglibextractortest.h
--- a/autotests/taglibextractortest.h
+++ b/autotests/taglibextractortest.h
@@ -23,6 +23,7 @@
 #define TAGLIBEXTRACTORTEST_H
 
 #include <QObject>
+#include "properties.h"
 
 class TagLibExtractorTest : public QObject
 {
@@ -32,6 +33,12 @@
 
 private Q_SLOTS:
     void test();
+    void testNoMetadata();
+    void testNoMetadata_data();
+
+private:
+    // Convenience function
+    const QStringList propertyEnumNames(const QList<KFileMetaData::Property::Property>& key) const;
 };
 
 #endif // TAGLIBEXTRACTORTEST_H
diff --git a/autotests/taglibextractortest.cpp b/autotests/taglibextractortest.cpp
--- a/autotests/taglibextractortest.cpp
+++ b/autotests/taglibextractortest.cpp
@@ -21,20 +21,33 @@
 
 #include "taglibextractortest.h"
 #include "simpleextractionresult.h"
+#include "propertyinfo.h"
+//TODO: use QTESTFINDDATA and remove this
 #include "indexerextractortestsconfig.h"
 #include "extractors/taglibextractor.h"
 
 #include <QDebug>
 #include <QTest>
 #include <QDir>
 
+Q_DECLARE_METATYPE(KFileMetaData::Property::Property)
+
 using namespace KFileMetaData;
 
 QString TagLibExtractorTest::testFilePath(const QString& fileName) const
 {
     return QLatin1String(INDEXER_TESTS_SAMPLE_FILES_PATH) + QDir::separator() + fileName;
 }
 
+const QStringList TagLibExtractorTest::propertyEnumNames(const QList<KFileMetaData::Property::Property>& keys) const
+{
+    QStringList result;
+    for (auto key : keys) {
+        result.append(PropertyInfo(key).name());
+    }
+    return result;
+}
+
 void TagLibExtractorTest::test()
 {
     QScopedPointer<ExtractorPlugin> plugin(new TagLibExtractor(this));
@@ -208,4 +221,80 @@
     QCOMPARE(resultMp4.properties().value(Property::DiscNumber).toInt(), 1);
 }
 
+void TagLibExtractorTest::testNoMetadata_data()
+{
+    const auto expectedKeys = QList<Property::Property>{
+        Property::BitRate,
+        Property::Channels,
+        Property::Duration,
+        Property::SampleRate,
+    };
+
+    QTest::addColumn<QString>("path");
+    QTest::addColumn<QString>("mimeType");
+    QTest::addColumn<QList<Property::Property>>("expectedKeys");
+    QTest::addColumn<QString>("failMessage");
+
+    QTest::addRow("mp3")
+        << QFINDTESTDATA("samplefiles/no-meta/test.mp3")
+        << QStringLiteral("audio/mp3")
+        << expectedKeys << QStringLiteral("Excess properties")
+        ;
+
+    QTest::addRow("m4a")
+        << QFINDTESTDATA("samplefiles/no-meta/test.m4a")
+        << QStringLiteral("audio/mp4")
+        << expectedKeys << QString()
+        ;
+
+    QTest::addRow("flac")
+        << QFINDTESTDATA("samplefiles/no-meta/test.flac")
+        << QStringLiteral("audio/flac")
+        << expectedKeys << QString()
+        ;
+
+    QTest::addRow("opus")
+        << QFINDTESTDATA("samplefiles/no-meta/test.opus")
+        << QStringLiteral("audio/opus")
+        << expectedKeys << QString()
+        ;
+
+    QTest::addRow("ogg")
+        << QFINDTESTDATA("samplefiles/no-meta/test.ogg")
+        << QStringLiteral("audio/ogg")
+        << expectedKeys << QString()
+        ;
+
+    QTest::addRow("mpc")
+        << QFINDTESTDATA("samplefiles/no-meta/test.mpc")
+        << QStringLiteral("audio/x-musepack")
+        << expectedKeys << QStringLiteral("Excess properties")
+        ;
+
+}
+
+void  TagLibExtractorTest::testNoMetadata()
+{
+    QFETCH(QString, path);
+    QFETCH(QString, mimeType);
+    QFETCH(QList<Property::Property>, expectedKeys);
+    QFETCH(QString, failMessage);
+
+    TagLibExtractor plugin{this};
+    SimpleExtractionResult extracted(path, mimeType);
+    plugin.extract(&extracted);
+
+    const auto resultList = extracted.properties();
+    const auto resultKeys = resultList.uniqueKeys();
+
+    if (!failMessage.isEmpty()) {
+        auto excessKeys = resultKeys.toSet() - expectedKeys.toSet();
+        const auto message = QStringLiteral("%1: %2")
+            .arg(failMessage)
+            .arg(propertyEnumNames(excessKeys.toList()).join(QLatin1String(", ")));
+        QEXPECT_FAIL("", qPrintable(message), Continue);
+    }
+    QCOMPARE(resultKeys, expectedKeys);
+}
+
 QTEST_GUILESS_MAIN(TagLibExtractorTest)