diff --git a/tests/kgpgchangedisable.cpp b/tests/kgpgchangedisable.cpp
index 27bddbab..cebabb46 100644
--- a/tests/kgpgchangedisable.cpp
+++ b/tests/kgpgchangedisable.cpp
@@ -1,48 +1,48 @@
 #include "kgpgchangedisable.h"
 #include "../transactions/kgpgchangedisable.h"
 #include "../kgpginterface.h"
 #include "common.h"
 
 #include <QSignalSpy>
-#include <QtTest/QtTest>
+#include <QtTest>
 
 void KGpgChangeDisableTest::init()
 {
 	QVERIFY(resetGpgConf());
 	addGpgKey(QLatin1String("keys/kgpgtest_BA7695F3C550DF14_pub.asc"));
 }
 
 void KGpgChangeDisableTest::testDisableKey()
 {
 	const QString keyID = QLatin1String("FBAF08DD7D9D0921C15DDA9FBA7695F3C550DF14");
 	KGpgChangeDisable *transaction = new KGpgChangeDisable(this, keyID, true);
 	QSignalSpy spy(transaction, &KGpgChangeDisable::done);
 	QObject::connect(transaction, &KGpgChangeDisable::done, [](int result) {
 		QCOMPARE(result, static_cast<int>(KGpgTransaction::TS_OK));
 	});
 	transaction->start();
 	QVERIFY(spy.wait());
 	KgpgCore::KgpgKeyList keyList = KgpgInterface::readPublicKeys(QStringList(keyID));
 	QVERIFY(!keyList.isEmpty());
 	QVERIFY(!keyList.first().valid());
 }
 
 void KGpgChangeDisableTest::testEnableKey()
 {
 	const QString keyID = QLatin1String("FBAF08DD7D9D0921C15DDA9FBA7695F3C550DF14");
 	KGpgChangeDisable *transaction = new KGpgChangeDisable(this, keyID, true);
 	QSignalSpy spy(transaction, &KGpgChangeDisable::done);
 	transaction->start();
 	QVERIFY(spy.wait());
 	QObject::connect(transaction, &KGpgChangeDisable::done, [](int result) {
 		QCOMPARE(result, static_cast<int>(KGpgTransaction::TS_OK));
 	});
 	transaction->setDisable(false);
 	transaction->start();
 	QVERIFY(spy.wait());
 	KgpgCore::KgpgKeyList keyList = KgpgInterface::readPublicKeys(QStringList(keyID));
 	QVERIFY(!keyList.isEmpty());
 	QVERIFY(keyList.first().valid());
 }
 
 QTEST_MAIN(KGpgChangeDisableTest)
diff --git a/tests/kgpgchangetrust.cpp b/tests/kgpgchangetrust.cpp
index 21d74473..a7afd9b0 100644
--- a/tests/kgpgchangetrust.cpp
+++ b/tests/kgpgchangetrust.cpp
@@ -1,40 +1,40 @@
 #include "kgpgchangetrust.h"
 #include "../transactions/kgpgchangetrust.h"
 #include "../kgpginterface.h"
 #include "common.h"
 
 #include <QString>
 #include <QSignalSpy>
-#include <QtTest/QtTest>
+#include <QtTest>
 
 void KGpgChangeTrustTest::init()
 {
 	QVERIFY(resetGpgConf());
 }
 
 void KGpgChangeTrustTest::testChangeTrust()
 {
 	QFETCH(gpgme_validity_t, target_trust);
 	QLatin1String keyID("BA7695F3C550DF14");
 	addGpgKey(QLatin1String("keys/kgpgtest_BA7695F3C550DF14.asc"));
 	KGpgChangeTrust *transaction = new KGpgChangeTrust(this, keyID, target_trust);
 	QSignalSpy spy(transaction, &KGpgChangeTrust::done);
 	QObject::connect(transaction, &KGpgChangeTrust::done,
 			 [](int result) { QCOMPARE(result, static_cast<int>(KGpgTransaction::TS_OK)); });
 	transaction->start();
 	QVERIFY(spy.wait());
 	KgpgCore::KgpgKeyList keyList = KgpgInterface::readPublicKeys(QStringList(keyID));
 	QVERIFY(!keyList.isEmpty());
 	QCOMPARE(keyList.first().ownerTrust(), target_trust);
 }
 
 void KGpgChangeTrustTest::testChangeTrust_data()
 {
 	QTest::addColumn<gpgme_validity_t>("target_trust");
 	QTest::newRow("ultimate") << GPGME_VALIDITY_ULTIMATE;
 	QTest::newRow("full") << GPGME_VALIDITY_FULL;
 	QTest::newRow("marginal") << GPGME_VALIDITY_MARGINAL;
 	QTest::newRow("never") << GPGME_VALIDITY_NEVER;
 }
 
 QTEST_MAIN(KGpgChangeTrustTest)
diff --git a/tests/kgpgimport.cpp b/tests/kgpgimport.cpp
index 419f5ed7..6c7da567 100644
--- a/tests/kgpgimport.cpp
+++ b/tests/kgpgimport.cpp
@@ -1,137 +1,137 @@
 #include "kgpgimport.h"
 #include "../transactions/kgpgimport.h"
 #include "common.h"
 
 #include <QList>
 #include <QString>
 #include <QStringList>
 #include <QSignalSpy>
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <QTextStream>
 #include <QUrl>
 
 void KGpgImportTest::init()
 {
 	QVERIFY(resetGpgConf());
 }
 
 void KGpgImportTest::testImportTextKey()
 {
 	QString key = readFile(QLatin1String("keys/kgpgtest_BA7695F3C550DF14_pub.asc"));
 	KGpgImport *transaction = new KGpgImport(this, key);
 	QSignalSpy spy(transaction, &KGpgImport::done);
 	QObject::connect(transaction, &KGpgImport::done, [transaction, key](int result) {
 		QCOMPARE(transaction->getImportedKeys().size(), 1);
 		QString keyID = QLatin1String("BA7695F3C550DF14");
 		QVERIFY(transaction->getImportedKeys().first().startsWith(keyID));
 		QCOMPARE(result, static_cast<int>(KGpgTransaction::TS_OK));
 	});
 	transaction->start();
 	QVERIFY(spy.wait());
 }
 
 void KGpgImportTest::testImportKeyFromFile()
 {
 	QList<QUrl> list;
 	list.append(QUrl::fromLocalFile(QLatin1String("keys/kgpgtest_BA7695F3C550DF14_pub.asc")));
 
 	KGpgImport *transaction = new KGpgImport(this, list);
 	QSignalSpy spy(transaction, &KGpgImport::done);
 	QObject::connect(transaction, &KGpgImport::done, [transaction](int result) {
 		QCOMPARE(transaction->getImportedKeys().size(), 1);
 		QString keyID = QLatin1String("BA7695F3C550DF14");
 		QVERIFY(transaction->getImportedKeys().first().startsWith(keyID));
 		QCOMPARE(result, static_cast<int>(KGpgTransaction::TS_OK));
 	});
 	transaction->start();
 	QVERIFY(spy.wait());
 }
 
 void KGpgImportTest::testImportSameKeyTwice()
 {
 	QList<QUrl> list;
 	list.append(QUrl::fromLocalFile(QLatin1String("keys/kgpgtest_BA7695F3C550DF14_pub.asc")));
 	KGpgImport *transaction = new KGpgImport(this, list);
 	QSignalSpy spy(transaction, &KGpgImport::done);
 	transaction->start();
 	QVERIFY(spy.wait());
 	QObject::connect(transaction, &KGpgImport::done, [transaction](int result) {
 		QCOMPARE(transaction->getImportedKeys().size(), 1);
 		QString keyID = QLatin1String("BA7695F3C550DF14");
 		QString duplicateMsg = QLatin1String("IMPORT_OK 0 FBAF08DD7D9D0921C15DDA9FBA7695F3C550DF14");
 		qDebug() << "MESSAGES: " << transaction->getMessages();
 		QVERIFY(transaction->getImportedKeys().first().startsWith(keyID));
 		QVERIFY(transaction->getMessages().join(QLatin1Char(' ')).contains(duplicateMsg));
 		QEXPECT_FAIL("", "Test is broken. Possible bug!", Continue);
 		QCOMPARE(result, static_cast<int>(KGpgTransaction::TS_OK));
 	});
 	transaction->start();
 	QVERIFY(spy.wait());
 }
 
 void KGpgImportTest::testImportIdsAll()
 {
 	QList<QUrl> list;
 	list.append(QUrl::fromLocalFile(QLatin1String("keys/kgpgtest_BA7695F3C550DF14_pub.asc")));
 	KGpgImport *transaction = new KGpgImport(this, list);
 	QSignalSpy spy(transaction, &KGpgImport::done);
 	QObject::connect(transaction, &KGpgImport::done, [transaction](int result) {
 		QCOMPARE(transaction->getImportedIds(-1).size(), 1);
 		QString fingerprint = QLatin1String("FBAF08DD7D9D0921C15DDA9FBA7695F3C550DF14");
 		QVERIFY(transaction->getImportedIds(-1).first().compare(fingerprint) == 0);
 		QCOMPARE(result, static_cast<int>(KGpgTransaction::TS_OK));
 	});
 	transaction->start();
 	QVERIFY(spy.wait());
 }
 
 void KGpgImportTest::testImportIdsUnchanged()
 {
 	addGpgKey(QLatin1String("keys/kgpgtest_BA7695F3C550DF14_pub.asc"));
 	QList<QUrl> list;
 	list.append(QUrl::fromLocalFile(QLatin1String("keys/kgpgtest_BA7695F3C550DF14_pub.asc")));
 	KGpgImport *transaction = new KGpgImport(this, list);
 	QSignalSpy spy(transaction, &KGpgImport::done);
 	QObject::connect(transaction, &KGpgImport::done, [transaction](int result) {
 		QCOMPARE(transaction->getImportedIds(0).size(), 1);
 		QString fingerprint = QLatin1String("FBAF08DD7D9D0921C15DDA9FBA7695F3C550DF14");
 		QVERIFY(transaction->getImportedIds(0).first().compare(fingerprint) == 0);
 		QCOMPARE(result, static_cast<int>(KGpgTransaction::TS_OK));
 	});
 	transaction->start();
 	QVERIFY(spy.wait());
 }
 
 void KGpgImportTest::testLogMessage()
 {
 	QList<QUrl> list;
 	list.append(QUrl::fromLocalFile(QLatin1String("keys/kgpgtest_BA7695F3C550DF14_pub.asc")));
 	KGpgImport *transaction = new KGpgImport(this, list);
 	QSignalSpy spy(transaction, &KGpgImport::done);
 	QObject::connect(transaction, &KGpgImport::done, [transaction](int result) {
 		QString msg = QLatin1String("IMPORT_OK 1 FBAF08DD7D9D0921C15DDA9FBA7695F3C550DF14");
 		QVERIFY(transaction->getMessages().join(QLatin1Char(' ')).contains(msg));
 		QCOMPARE(result, static_cast<int>(KGpgTransaction::TS_OK));
 	});
 	transaction->start();
 	QVERIFY(spy.wait());
 }
 
 void KGpgImportTest::testImportSecretKey()
 {
 	QList<QUrl> list;
 	list.append(QUrl::fromLocalFile(QLatin1String("keys/kgpgtest_BA7695F3C550DF14.asc")));
 	KGpgImport *transaction = new KGpgImport(this, list);
 	addPasswordArguments(transaction,
 			     readFile(QLatin1String("keys/kgpgtest_BA7695F3C550DF14.pass")));
 	QSignalSpy spy(transaction, &KGpgImport::done);
 	QObject::connect(transaction, &KGpgImport::done, [transaction]() {
 		QVERIFY(transaction->getImportedKeys().size() == 1);
 		QString keyID = QLatin1String("BA7695F3C550DF14");
 		QVERIFY(transaction->getImportedKeys().first().startsWith(keyID));
 	});
 	transaction->start();
 	QVERIFY(spy.wait());
 }
 
 QTEST_MAIN(KGpgImportTest)
diff --git a/tests/kgpginterface.h b/tests/kgpginterface.h
index 11f67574..57b6d34b 100644
--- a/tests/kgpginterface.h
+++ b/tests/kgpginterface.h
@@ -1,16 +1,16 @@
 #ifndef KGPG_INTERFACE_TEST_H
 #define KGPG_INTERFACE_TEST_H
-#include <QtTest/QtTest>
+#include <QtTest>
 
 class KGpgInterfaceTest: public QObject
 {
 	Q_OBJECT
 private slots:
 	void init();
 	void testReadPublicKeys();
 	void testReadSecretKeys();
 	void testReadEmptyKeyring();
 };
 
 
 #endif
diff --git a/tests/kgpgverify.cpp b/tests/kgpgverify.cpp
index edb69b55..37c86dca 100644
--- a/tests/kgpgverify.cpp
+++ b/tests/kgpgverify.cpp
@@ -1,80 +1,80 @@
 #include "kgpgverify.h"
 #include "../transactions/kgpgverify.h"
 #include "common.h"
 
 #include <QList>
 #include <QString>
 #include <QSignalSpy>
-#include <QtTest/QtTest>
+#include <QtTest>
 #include <QUrl>
 
 void KGpgVerifyTest::init()
 {
 	QVERIFY(resetGpgConf());
 }
 
 void KGpgVerifyTest::testVerifySignedText()
 {
 	addGpgKey(QLatin1String("keys/kgpgtest_BA7695F3C550DF14.asc"));
 	QString text = readFile(QLatin1String("keys/signed_text"));
 	KGpgVerify *transaction = new KGpgVerify(this, text);
 	QSignalSpy spy(transaction, &KGpgVerify::done);
 	QObject::connect(transaction, &KGpgVerify::done,
 			 [](int result) { QCOMPARE(result, static_cast<int>(KGpgTransaction::TS_OK)); });
 	transaction->start();
 	QVERIFY(spy.wait());
 }
 
 void KGpgVerifyTest::testVerifySignedFile()
 {
 	addGpgKey(QLatin1String("keys/kgpgtest_BA7695F3C550DF14.asc"));
 	QList<QUrl> list;
 	list.append(QUrl::fromLocalFile(QLatin1String("keys/signed_text")));
 	KGpgVerify *transaction = new KGpgVerify(this, list);
 	QSignalSpy spy(transaction, &KGpgVerify::done);
 	QObject::connect(transaction, &KGpgVerify::done,
 			 [](int result) { QCOMPARE(result, static_cast<int>(KGpgTransaction::TS_OK)); });
 	transaction->start();
 	QVERIFY(spy.wait());
 }
 
 void KGpgVerifyTest::testVerifyReturnMissingKey()
 {
 	QList<QUrl> list;
 	list.append(QUrl::fromLocalFile(QLatin1String("keys/signed_text")));
 	KGpgVerify *transaction = new KGpgVerify(this, list);
 	QSignalSpy spy(transaction, &KGpgVerify::done);
 	QObject::connect(transaction, &KGpgVerify::done,
 			 [](int result) { QCOMPARE(result, static_cast<int>(KGpgVerify::TS_MISSING_KEY)); });
 	transaction->start();
 	QVERIFY(spy.wait());
 }
 
 void KGpgVerifyTest::testVerifyMissingId()
 {
 	QList<QUrl> list;
 	list.append(QUrl::fromLocalFile(QLatin1String("keys/signed_text")));
 	KGpgVerify *transaction = new KGpgVerify(this, list);
 	QSignalSpy spy(transaction, &KGpgVerify::done);
 	QObject::connect(transaction, &KGpgVerify::done, [transaction]() {
 		QString keyID = QLatin1String("7882C615210F1022");
 		QVERIFY(transaction->missingId().compare(keyID) == 0);
 	});
 	transaction->start();
 	QVERIFY(spy.wait());
 }
 
 void KGpgVerifyTest::testVerifyReturnBadSignature()
 {
 	QList<QUrl> list;
 	addGpgKey(QLatin1String("keys/kgpgtest_BA7695F3C550DF14.asc"));
 	list.append(QUrl::fromLocalFile(QLatin1String("keys/signed_bad_sig")));
 	KGpgVerify *transaction = new KGpgVerify(this, list);
 	QSignalSpy spy(transaction, &KGpgVerify::done);
 	QObject::connect(transaction, &KGpgVerify::done,
 			 [](int result) { QCOMPARE(result, static_cast<int>(KGpgVerify::TS_BAD_SIGNATURE)); });
 	transaction->start();
 	QVERIFY(spy.wait());
 }
 
 QTEST_MAIN(KGpgVerifyTest)