diff --git a/cmd/syncthing/gui.go b/cmd/syncthing/gui.go
index 8160266a..f7aae3a1 100644
--- a/cmd/syncthing/gui.go
+++ b/cmd/syncthing/gui.go
@@ -63,7 +63,7 @@ func init() {
 func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) error {
 	var err error
 
-	cert, err := tls.LoadX509KeyPair(locations[locHttpsCertFile], locations[locHttpsKeyFile])
+	cert, err := tls.LoadX509KeyPair(locations[locHTTPSCertFile], locations[locHTTPSKeyFile])
 	if err != nil {
 		l.Infoln("Loading HTTPS certificate:", err)
 		l.Infoln("Creating new HTTPS certificate")
@@ -76,7 +76,7 @@ func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) erro
 			name = tlsDefaultCommonName
 		}
 
-		cert, err = newCertificate(locations[locHttpsCertFile], locations[locHttpsKeyFile], name)
+		cert, err = newCertificate(locations[locHTTPSCertFile], locations[locHTTPSKeyFile], name)
 	}
 	if err != nil {
 		return err
diff --git a/cmd/syncthing/locations.go b/cmd/syncthing/locations.go
index 8f57ce44..b9027304 100644
--- a/cmd/syncthing/locations.go
+++ b/cmd/syncthing/locations.go
@@ -23,8 +23,8 @@ const (
 	locConfigFile    locationEnum = "config"
 	locCertFile                   = "certFile"
 	locKeyFile                    = "keyFile"
-	locHttpsCertFile              = "httpsCertFile"
-	locHttpsKeyFile               = "httpsKeyFile"
+	locHTTPSCertFile              = "httpsCertFile"
+	locHTTPSKeyFile               = "httpsKeyFile"
 	locDatabase                   = "database"
 	locLogFile                    = "logFile"
 	locCsrfTokens                 = "csrfTokens"
@@ -43,8 +43,8 @@ var locations = map[locationEnum]string{
 	locConfigFile:    "${config}/config.xml",
 	locCertFile:      "${config}/cert.pem",
 	locKeyFile:       "${config}/key.pem",
-	locHttpsCertFile: "${config}/https-cert.pem",
-	locHttpsKeyFile:  "${config}/https-key.pem",
+	locHTTPSCertFile: "${config}/https-cert.pem",
+	locHTTPSKeyFile:  "${config}/https-key.pem",
 	locDatabase:      "${config}/index-v0.11.0.db",
 	locLogFile:       "${config}/syncthing.log", // -logfile on Windows
 	locCsrfTokens:    "${config}/csrftokens.txt",
diff --git a/cmd/syncthing/testdata/.stfolder b/cmd/syncthing/testdata/.stfolder
new file mode 100644
index 00000000..e69de29b
diff --git a/cmd/syncthing/testdata/testfolder/.stfolder b/cmd/syncthing/testdata/testfolder/.stfolder
new file mode 100644
index 00000000..e69de29b