diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp
index a15f63acbc1..4e09e42c447 100644
--- a/src/plugins/mcusupport/mcusupportoptions.cpp
+++ b/src/plugins/mcusupport/mcusupportoptions.cpp
@@ -167,12 +167,16 @@ bool McuPackage::addToPath() const
 
 void McuPackage::writeToSettings() const
 {
-    if (m_path.compare(m_defaultPath) == 0)
-        return;
-    QSettings *s = Core::ICore::settings();
-    s->beginGroup(Constants::SETTINGS_GROUP);
-    s->setValue(QLatin1String(Constants::SETTINGS_KEY_PACKAGE_PREFIX) + m_settingsKey, m_path);
-    s->endGroup();
+    const QString key = QLatin1String(Constants::SETTINGS_GROUP) + '/' +
+            QLatin1String(Constants::SETTINGS_KEY_PACKAGE_PREFIX) + m_settingsKey;
+    const QSettings *iS = Core::ICore::settings(QSettings::SystemScope);
+    QSettings *uS = Core::ICore::settings();
+    if (m_path == m_defaultPath || (
+                iS->contains(key) &&
+                m_path == Utils::FilePath::fromUserInput(iS->value(key).toString()).toString()))
+        uS->remove(key);
+    else
+        uS->setValue(key, m_path);
 }
 
 void McuPackage::setRelativePathModifier(const QString &path)
diff --git a/tests/auto/debugger/tst_offsets.cpp b/tests/auto/debugger/tst_offsets.cpp
index b06ce1482c0..2309b5296ae 100644
--- a/tests/auto/debugger/tst_offsets.cpp
+++ b/tests/auto/debugger/tst_offsets.cpp
@@ -272,11 +272,16 @@ void tst_offsets::offsets_data()
         OFFSET_TEST(QDateTimePrivate, m_timeZone) << 20 << 24;
         OFFSET_TEST(QDateTimePrivate, m_status) << 24 << 32;
 #   endif
-#else
+#elif QT_VERSION < 0x50e00
         OFFSET_TEST(QDateTimePrivate, m_msecs) << 0 << 0;
         OFFSET_TEST(QDateTimePrivate, m_status) << 8 << 8;
         OFFSET_TEST(QDateTimePrivate, m_offsetFromUtc) << 12 << 12;
         OFFSET_TEST(QDateTimePrivate, m_timeZone) << 20 << 24;
+#else
+        OFFSET_TEST(QDateTimePrivate, m_msecs) << 8 << 8;
+        OFFSET_TEST(QDateTimePrivate, m_status) << 4 << 4;
+        OFFSET_TEST(QDateTimePrivate, m_offsetFromUtc) << 16 << 16;
+        OFFSET_TEST(QDateTimePrivate, m_timeZone) << 20 << 24;
 #endif
 
 #ifdef HAS_BOOST