diff --git a/internal/config/config_test.go b/internal/config/config_test.go
index e09bcc534..140c391f4 100644
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
@@ -23,20 +23,21 @@ func init() {
 
 func TestDefaultValues(t *testing.T) {
 	expected := OptionsConfiguration{
-		ListenAddress:      []string{"0.0.0.0:22000"},
-		GlobalAnnServer:    "announce.syncthing.net:22026",
-		GlobalAnnEnabled:   true,
-		LocalAnnEnabled:    true,
-		LocalAnnPort:       21025,
-		LocalAnnMCAddr:     "[ff32::5222]:21026",
-		MaxSendKbps:        0,
-		MaxRecvKbps:        0,
-		ReconnectIntervalS: 60,
-		StartBrowser:       true,
-		UPnPEnabled:        true,
-		UPnPLease:          0,
-		UPnPRenewal:        30,
-		RestartOnWakeup:    true,
+		ListenAddress:        []string{"0.0.0.0:22000"},
+		GlobalAnnServer:      "announce.syncthing.net:22026",
+		GlobalAnnEnabled:     true,
+		LocalAnnEnabled:      true,
+		LocalAnnPort:         21025,
+		LocalAnnMCAddr:       "[ff32::5222]:21026",
+		MaxSendKbps:          0,
+		MaxRecvKbps:          0,
+		ReconnectIntervalS:   60,
+		StartBrowser:         true,
+		UPnPEnabled:          true,
+		UPnPLease:            0,
+		UPnPRenewal:          30,
+		RestartOnWakeup:      true,
+		AutoUpgradeIntervalH: 12,
 	}
 
 	cfg := New("test", device1)
@@ -114,20 +115,21 @@ func TestNoListenAddress(t *testing.T) {
 
 func TestOverriddenValues(t *testing.T) {
 	expected := OptionsConfiguration{
-		ListenAddress:      []string{":23000"},
-		GlobalAnnServer:    "syncthing.nym.se:22026",
-		GlobalAnnEnabled:   false,
-		LocalAnnEnabled:    false,
-		LocalAnnPort:       42123,
-		LocalAnnMCAddr:     "quux:3232",
-		MaxSendKbps:        1234,
-		MaxRecvKbps:        2341,
-		ReconnectIntervalS: 6000,
-		StartBrowser:       false,
-		UPnPEnabled:        false,
-		UPnPLease:          60,
-		UPnPRenewal:        15,
-		RestartOnWakeup:    false,
+		ListenAddress:        []string{":23000"},
+		GlobalAnnServer:      "syncthing.nym.se:22026",
+		GlobalAnnEnabled:     false,
+		LocalAnnEnabled:      false,
+		LocalAnnPort:         42123,
+		LocalAnnMCAddr:       "quux:3232",
+		MaxSendKbps:          1234,
+		MaxRecvKbps:          2341,
+		ReconnectIntervalS:   6000,
+		StartBrowser:         false,
+		UPnPEnabled:          false,
+		UPnPLease:            60,
+		UPnPRenewal:          15,
+		RestartOnWakeup:      false,
+		AutoUpgradeIntervalH: 24,
 	}
 
 	cfg, err := Load("testdata/overridenvalues.xml", device1)
diff --git a/internal/config/testdata/overridenvalues.xml b/internal/config/testdata/overridenvalues.xml
index 7470269f7..84d2999ff 100755
--- a/internal/config/testdata/overridenvalues.xml
+++ b/internal/config/testdata/overridenvalues.xml
@@ -16,5 +16,6 @@
         <upnpLeaseMinutes>60</upnpLeaseMinutes>
         <upnpRenewalMinutes>15</upnpRenewalMinutes>
         <restartOnWakeup>false</restartOnWakeup>
+        <autoUpgradeIntervalH>24</autoUpgradeIntervalH>
     </options>
 </configuration>
diff --git a/internal/model/testdata/.stignore b/internal/model/testdata/.stignore
old mode 100755
new mode 100644