diff --git a/modules/user/user.go b/modules/user/user.go
index 4415632ee..972629eae 100644
--- a/modules/user/user.go
+++ b/modules/user/user.go
@@ -4,9 +4,7 @@
 
 package user
 
-import (
-	"os"
-)
+import "os"
 
 func CurrentUsername() string {
 	curUserName := os.Getenv("USER")
diff --git a/modules/user/user_test.go b/modules/user/user_test.go
new file mode 100644
index 000000000..d7df15153
--- /dev/null
+++ b/modules/user/user_test.go
@@ -0,0 +1,22 @@
+package user
+
+import (
+	"os"
+	"testing"
+)
+
+func TestCurrentUsername(t *testing.T) {
+	os.Setenv("USER", "")
+	os.Setenv("USERNAME", "foobar")
+
+	user := CurrentUsername()
+	if user != "foobar" {
+		t.Errorf("expected foobar as user, got: %s", user)
+	}
+
+	os.Setenv("USER", "gitea")
+	user = CurrentUsername()
+	if user != "gitea" {
+		t.Errorf("expected gitea as user, got: %s", user)
+	}
+}