diff --git a/src/qt/test/optiontests.cpp b/src/qt/test/optiontests.cpp
index b76e9ef499f..5f9f2cb4491 100644
--- a/src/qt/test/optiontests.cpp
+++ b/src/qt/test/optiontests.cpp
@@ -50,6 +50,17 @@ void OptionTests::migrateSettings()
 
     settings.sync();
 
+    QVERIFY(settings.contains("nDatabaseCache"));
+    QVERIFY(settings.contains("nThreadsScriptVerif"));
+    QVERIFY(settings.contains("fUseUPnP"));
+    QVERIFY(settings.contains("fListen"));
+    QVERIFY(settings.contains("bPrune"));
+    QVERIFY(settings.contains("nPruneSize"));
+    QVERIFY(settings.contains("fUseProxy"));
+    QVERIFY(settings.contains("addrProxy"));
+    QVERIFY(settings.contains("fUseSeparateProxyTor"));
+    QVERIFY(settings.contains("addrSeparateProxyTor"));
+
     OptionsModel options{m_node};
     bilingual_str error;
     QVERIFY(options.Init(error));
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp
index e45fc1ced84..b764d4e7bac 100644
--- a/src/qt/test/test_main.cpp
+++ b/src/qt/test/test_main.cpp
@@ -9,6 +9,7 @@
 #include <interfaces/init.h>
 #include <interfaces/node.h>
 #include <qt/bitcoin.h>
+#include <qt/guiconstants.h>
 #include <qt/test/apptests.h>
 #include <qt/test/optiontests.h>
 #include <qt/test/rpcnestedtests.h>
@@ -24,6 +25,7 @@
 #include <QApplication>
 #include <QDebug>
 #include <QObject>
+#include <QSettings>
 #include <QTest>
 
 #include <functional>
@@ -84,7 +86,8 @@ int main(int argc, char* argv[])
     #endif
 
     BitcoinApplication app;
-    app.setApplicationName("Bitcoin-Qt-test");
+    app.setOrganizationName(QAPP_ORG_NAME);
+    app.setApplicationName(QAPP_APP_NAME_DEFAULT "-test");
     app.createNode(*init);
 
     int num_test_failures{0};