diff --git a/src/core/Config.cpp b/src/core/Config.cpp
index 58b3e1f8c..f1a78830d 100644
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -619,21 +619,6 @@ void Config::createConfigFromFile(const QString& configFileName, const QString&
                             qApp);
 }
 
-void Config::createTempFileInstance()
-{
-    if (m_instance) {
-        delete m_instance;
-    }
-    auto tmpFileName = QString("%1/%2_settings.XXXXXX").arg(QDir::tempPath(), QCoreApplication::applicationName());
-    auto tmpFile = new QTemporaryFile(tmpFileName);
-    if (!tmpFile->open()) {
-        Q_ASSERT_X(false, __func__, "Failed to create temporary config settings file");
-    }
-    tmpFile->close();
-    m_instance = new Config(tmpFileName, "", qApp);
-    tmpFile->setParent(m_instance);
-}
-
 bool Config::isPortable()
 {
 #ifdef Q_OS_WIN
diff --git a/src/core/Config.h b/src/core/Config.h
index 5911d78a1..b4f3bdc04 100644
--- a/src/core/Config.h
+++ b/src/core/Config.h
@@ -230,7 +230,6 @@ public:
 
     static Config* instance();
     static void createConfigFromFile(const QString& configFileName, const QString& localConfigFileName = {});
-    static void createTempFileInstance();
     static bool isPortable();
     static QString portableConfigDir();
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8ed6868df..25b116d8e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -154,16 +154,16 @@ endif()
 
 if(WITH_XC_AUTOTYPE)
     add_unit_test(NAME testautotype SOURCES TestAutoType.cpp
-            LIBS ${TEST_LIBRARIES})
+            LIBS testsupport ${TEST_LIBRARIES})
     set_target_properties(testautotype PROPERTIES ENABLE_EXPORTS ON)
 endif()
 
 if(WITH_XC_SSHAGENT)
     add_unit_test(NAME testopensshkey SOURCES TestOpenSSHKey.cpp
-            LIBS sshagent ${TEST_LIBRARIES})
+            LIBS sshagent testsupport ${TEST_LIBRARIES})
     if(NOT WIN32)
         add_unit_test(NAME testsshagent SOURCES TestSSHAgent.cpp
-                LIBS sshagent ${TEST_LIBRARIES})
+                LIBS sshagent testsupport ${TEST_LIBRARIES})
     endif()
 endif()
 
diff --git a/tests/TestAutoType.cpp b/tests/TestAutoType.cpp
index eea1f0532..91bd7d0a4 100644
--- a/tests/TestAutoType.cpp
+++ b/tests/TestAutoType.cpp
@@ -30,13 +30,15 @@
 #include "crypto/Crypto.h"
 #include "gui/MessageBox.h"
 #include "gui/osutils/OSUtils.h"
+#include "util/TemporaryFile.h"
 
 QTEST_GUILESS_MAIN(TestAutoType)
 
 void TestAutoType::initTestCase()
 {
     QVERIFY(Crypto::init());
-    Config::createTempFileInstance();
+    // Create temporary config file
+    Config::createConfigFromFile(TemporaryFile::createTempConfigFile(), {});
     config()->set(Config::AutoTypeDelay, 1);
     config()->set(Config::Security_AutoTypeAsk, false);
     AutoType::createTestInstance();
diff --git a/tests/TestCli.cpp b/tests/TestCli.cpp
index aec13a1e4..9b2e5ab8f 100644
--- a/tests/TestCli.cpp
+++ b/tests/TestCli.cpp
@@ -66,7 +66,9 @@ void TestCli::initTestCase()
 {
     QVERIFY(Crypto::init());
 
-    Config::createTempFileInstance();
+    // Create temporary config file
+    Config::createConfigFromFile(TemporaryFile::createTempConfigFile(), {});
+
     QLocale::setDefault(QLocale::c());
     Bootstrap::bootstrap();
 
diff --git a/tests/TestSSHAgent.cpp b/tests/TestSSHAgent.cpp
index be3ddd2e5..986def7b8 100644
--- a/tests/TestSSHAgent.cpp
+++ b/tests/TestSSHAgent.cpp
@@ -30,17 +30,19 @@ QTEST_GUILESS_MAIN(TestSSHAgent)
 void TestSSHAgent::initTestCase()
 {
     QVERIFY(Crypto::init());
-    Config::createTempFileInstance();
 
-    m_agentSocketFile.setAutoRemove(true);
-    QVERIFY(m_agentSocketFile.open());
+    // Create temporary config file
+    Config::createConfigFromFile(TemporaryFile::createTempConfigFile(), {});
 
-    m_agentSocketFileName = m_agentSocketFile.fileName();
+    // default config must not enable agent
+    SSHAgent agent;
+    QVERIFY(!agent.isEnabled());
+
+    m_agentSocketFile.reset(new TemporaryFile(this));
+
+    m_agentSocketFileName = m_agentSocketFile->fileName();
     QVERIFY(!m_agentSocketFileName.isEmpty());
 
-    // let ssh-agent re-create it as a socket
-    QVERIFY(m_agentSocketFile.remove());
-
     QStringList arguments;
     arguments << "-D" << "-a" << m_agentSocketFileName;
 
@@ -85,13 +87,18 @@ void TestSSHAgent::initTestCase()
     QVERIFY(m_key.parsePKCS1PEM(keyData));
 }
 
+void TestSSHAgent::init()
+{
+    // Reset the config state
+    SSHAgent agent;
+    agent.setEnabled(false);
+    QString empty;
+    agent.setAuthSockOverride(empty);
+}
+
 void TestSSHAgent::testConfiguration()
 {
     SSHAgent agent;
-
-    // default config must not enable agent
-    QVERIFY(!agent.isEnabled());
-
     agent.setEnabled(true);
     QVERIFY(agent.isEnabled());
 
@@ -291,6 +298,4 @@ void TestSSHAgent::cleanupTestCase()
         m_agentProcess.terminate();
         m_agentProcess.waitForFinished();
     }
-
-    m_agentSocketFile.remove();
 }
diff --git a/tests/TestSSHAgent.h b/tests/TestSSHAgent.h
index 36b9b2bff..db06fd806 100644
--- a/tests/TestSSHAgent.h
+++ b/tests/TestSSHAgent.h
@@ -19,8 +19,8 @@
 #define TESTSSHAGENT_H
 
 #include "sshagent/OpenSSHKey.h"
+#include "util/TemporaryFile.h"
 #include <QProcess>
-#include <QTemporaryFile>
 #include <QUuid>
 
 class TestSSHAgent : public QObject
@@ -29,6 +29,7 @@ class TestSSHAgent : public QObject
 
 private slots:
     void initTestCase();
+    void init();
     void testConfiguration();
     void testIdentity();
     void testRemoveOnClose();
@@ -41,7 +42,7 @@ private slots:
     void cleanupTestCase();
 
 private:
-    QTemporaryFile m_agentSocketFile;
+    QScopedPointer<TemporaryFile> m_agentSocketFile;
     QString m_agentSocketFileName;
     QProcess m_agentProcess;
     OpenSSHKey m_key;
diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp
index a8f7cf650..f711817d5 100644
--- a/tests/gui/TestGui.cpp
+++ b/tests/gui/TestGui.cpp
@@ -94,7 +94,10 @@ int main(int argc, char* argv[])
 void TestGui::initTestCase()
 {
     QVERIFY(Crypto::init());
-    Config::createTempFileInstance();
+
+    // Create temporary config file
+    Config::createConfigFromFile(TemporaryFile::createTempConfigFile(), {});
+
     QLocale::setDefault(QLocale::c());
     Application::bootstrap();
 
diff --git a/tests/gui/TestGuiBrowser.cpp b/tests/gui/TestGuiBrowser.cpp
index 51bd01f52..26fd72690 100644
--- a/tests/gui/TestGuiBrowser.cpp
+++ b/tests/gui/TestGuiBrowser.cpp
@@ -58,7 +58,8 @@ int main(int argc, char* argv[])
 void TestGuiBrowser::initTestCase()
 {
     QVERIFY(Crypto::init());
-    Config::createTempFileInstance();
+    // Create temporary config file
+    Config::createConfigFromFile(TemporaryFile::createTempConfigFile(), {});
     // Disable autosave so we can test the modified file indicator
     config()->set(Config::AutoSaveAfterEveryChange, false);
     config()->set(Config::AutoSaveOnExit, false);
diff --git a/tests/gui/TestGuiFdoSecrets.cpp b/tests/gui/TestGuiFdoSecrets.cpp
index d9fe1f8ea..fc7e218ea 100644
--- a/tests/gui/TestGuiFdoSecrets.cpp
+++ b/tests/gui/TestGuiFdoSecrets.cpp
@@ -136,7 +136,8 @@ TestGuiFdoSecrets::~TestGuiFdoSecrets() = default;
 void TestGuiFdoSecrets::initTestCase()
 {
     VERIFY(Crypto::init());
-    Config::createTempFileInstance();
+    // Create temporary config file
+    Config::createConfigFromFile(TemporaryFile::createTempConfigFile(), {});
     config()->set(Config::AutoSaveAfterEveryChange, false);
     config()->set(Config::AutoSaveOnExit, false);
     config()->set(Config::GUI_ShowTrayIcon, true);
diff --git a/tests/util/TemporaryFile.cpp b/tests/util/TemporaryFile.cpp
index 413f03305..987852097 100644
--- a/tests/util/TemporaryFile.cpp
+++ b/tests/util/TemporaryFile.cpp
@@ -17,6 +17,29 @@
 
 #include "TemporaryFile.h"
 
+#include <QCoreApplication>
+#include <QDir>
+#include <QPointer>
+
+namespace
+{
+    QPointer<TemporaryFile> g_tempConfigFile;
+}
+
+QString TemporaryFile::createTempConfigFile()
+{
+    if (!qApp) {
+        Q_ASSERT(false);
+        return {};
+    }
+    if (g_tempConfigFile) {
+        delete g_tempConfigFile;
+    }
+    auto tmpFileName = QString("%1/%2_settings.XXXXXX").arg(QDir::tempPath(), QCoreApplication::applicationName());
+    g_tempConfigFile = new TemporaryFile(tmpFileName, qApp);
+    return g_tempConfigFile->fileName();
+}
+
 TemporaryFile::TemporaryFile()
     : TemporaryFile(nullptr)
 {
diff --git a/tests/util/TemporaryFile.h b/tests/util/TemporaryFile.h
index 3c1cc6aa0..3f1707fda 100644
--- a/tests/util/TemporaryFile.h
+++ b/tests/util/TemporaryFile.h
@@ -34,6 +34,8 @@ public:
     using QFile::open;
     bool open();
     bool copyFromFile(const QString& otherFileName);
+
+    static QString createTempConfigFile();
 };
 
 #endif // KEEPASSXC_TEMPORARYFILE_H