5 files changed, 7 insertions, 5 deletions
diff --git a/autotests/testolmaccount.cpp b/autotests/testolmaccount.cpp
index eb44791a..1c296db9 100644
--- a/autotests/testolmaccount.cpp
+++ b/autotests/testolmaccount.cpp
@@ -6,6 +6,7 @@
 #include "crypto/qolmaccount.h"
 #include "connection.h"
 #include "events/encryptedfile.h"
+#include "networkaccessmanager.h"
 
 using namespace Quotient;
 
@@ -164,8 +165,8 @@ void TestOlmAccount::encryptedFile()
 }
 
 #define CREATE_CONNECTION(VAR, USERNAME, SECRET, DEVICE_NAME) \
+    NetworkAccessManager::instance()->ignoreSslErrors(true); \
     auto VAR = std::make_shared<Connection>(); \
-    VAR->ignoreSslErrors(true); \
     (VAR) ->resolveServer("@alice:localhost:" + QString::number(443)); \
     connect( (VAR) .get(), &Connection::loginFlowsChanged, this, [this, VAR ] () { \
         (VAR) ->loginWithPassword( (USERNAME) , SECRET , DEVICE_NAME , ""); \
diff --git a/autotests/testolmaccount.h b/autotests/testolmaccount.h
index 8901f095..bab9eed2 100644
--- a/autotests/testolmaccount.h
+++ b/autotests/testolmaccount.h
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include <QTest>
+#include <QtTest/QtTest>
 #include <QString>
 
 namespace Quotient {
diff --git a/autotests/testolmsession.cpp b/autotests/testolmsession.cpp
index 0803cc6d..dba78277 100644
--- a/autotests/testolmsession.cpp
+++ b/autotests/testolmsession.cpp
@@ -26,7 +26,8 @@ std::pair<std::unique_ptr<QOlmSession>, std::unique_ptr<QOlmSession>> createSess
     const auto preKey = outbound->encrypt(""); // Payload does not matter for PreKey
 
     if (preKey.type() != QOlmMessage::PreKey) {
-        QFAIL("Wrong first message type received, can't create session");
+        // We can't call QFail here because it's an helper function returning a value
+        throw "Wrong first message type received, can't create session";
     }
     auto inbound = std::get<std::unique_ptr<QOlmSession>>(accountB.createInboundSession(preKey));
     return std::make_pair<std::unique_ptr<QOlmSession>, std::unique_ptr<QOlmSession>>(std::move(inbound), std::move(outbound));
diff --git a/autotests/testolmsession.h b/autotests/testolmsession.h
index bd670c9b..9a5798fa 100644
--- a/autotests/testolmsession.h
+++ b/autotests/testolmsession.h
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include <QTest>
+#include <QtTest/QtTest>
 
 class TestOlmSession : public QObject
 {
diff --git a/autotests/testolmutility.cpp b/autotests/testolmutility.cpp
index 1d9978d3..2eec7e00 100644
--- a/autotests/testolmutility.cpp
+++ b/autotests/testolmutility.cpp
@@ -118,7 +118,7 @@ void TestOlmUtility::validUploadKeysRequest()
         }
     };
 
-    DeviceKeys deviceKeys = alice->getDeviceKeys();
+    DeviceKeys deviceKeys = alice->deviceKeys();
     QCOMPARE(QJsonDocument(toJson(deviceKeys)).toJson(QJsonDocument::Compact),
             QJsonDocument(body).toJson(QJsonDocument::Compact));