diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc0f6fd3..cbeef191 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -78,6 +78,7 @@
 - Dev: Mini feature refactor of BaseWindow. (#6074)
 - Dev: Removed dead code and some MSVC warnings. (#6024)
 - Dev: Added check if WEBP is supported. (#6073)
+- Dev: Tests won't add themselves to the autostart on Windows anymore. (#6084)
 
 ## 2.5.2
 
diff --git a/src/util/WindowsHelper.cpp b/src/util/WindowsHelper.cpp
index 6584604d..14dfcafe 100644
--- a/src/util/WindowsHelper.cpp
+++ b/src/util/WindowsHelper.cpp
@@ -1,5 +1,6 @@
 #include "util/WindowsHelper.hpp"
 
+#include "Application.hpp"
 #include "common/Literals.hpp"
 
 #include <QApplication>
@@ -64,6 +65,12 @@ bool isRegisteredForStartup()
 
 void setRegisteredForStartup(bool isRegistered)
 {
+    auto *app = tryGetApp();
+    if (app && app->isTest())
+    {
+        return;
+    }
+
     QSettings settings(RUN_KEY, QSettings::NativeFormat);
 
     if (isRegistered)