diff --git a/modules/setting/server.go b/modules/setting/server.go
index 641e18bdb4c..3ce32d73e43 100644
--- a/modules/setting/server.go
+++ b/modules/setting/server.go
@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"gitea.dev/modules/log"
+	"gitea.dev/modules/util"
 )
 
 // Scheme describes protocol types
@@ -272,9 +273,7 @@ func loadServerFrom(rootCfg ConfigProvider) {
 	RedirectOtherPort = sec.Key("REDIRECT_OTHER_PORT").MustBool(false)
 	PortToRedirect = sec.Key("PORT_TO_REDIRECT").MustString("80")
 	RedirectorUseProxyProtocol = sec.Key("REDIRECTOR_USE_PROXY_PROTOCOL").MustBool(UseProxyProtocol)
-	if len(StaticRootPath) == 0 {
-		StaticRootPath = AppWorkPath
-	}
+	StaticRootPath = util.IfZero(StaticRootPath, AppWorkPath)
 	StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(StaticRootPath)
 	StaticCacheTime = sec.Key("STATIC_CACHE_TIME").MustDuration(6 * time.Hour)
 	AppDataPath = sec.Key("APP_DATA_PATH").MustString(filepath.Join(AppWorkPath, "data"))
diff --git a/modules/timeutil/since_test.go b/modules/timeutil/since_test.go
index 927265ff191..e5ef72d9b3d 100644
--- a/modules/timeutil/since_test.go
+++ b/modules/timeutil/since_test.go
@@ -26,7 +26,7 @@ const (
 )
 
 func TestMain(m *testing.M) {
-	setting.StaticRootPath = "../../"
+	setting.SetupGiteaTestEnv()
 	setting.Names = []string{"english"}
 	setting.Langs = []string{"en-US"}
 	// setup