diff --git a/src/uu/logname/src/logname.rs b/src/uu/logname/src/logname.rs
index bbe2dddae..7c5e2024b 100644
--- a/src/uu/logname/src/logname.rs
+++ b/src/uu/logname/src/logname.rs
@@ -39,14 +39,10 @@ static LONG_HELP: &str = "";
 pub fn uumain(args: Vec<String>) -> i32 {
     app!(SYNTAX, SUMMARY, LONG_HELP).parse(args);
 
-    exec();
-
-    0
-}
-
-fn exec() {
     match get_userlogin() {
         Some(userlogin) => println!("{}", userlogin),
         None => show_error!("no login name"),
     }
+
+    0
 }
diff --git a/tests/by-util/test_logname.rs b/tests/by-util/test_logname.rs
index 651491045..00c98c256 100644
--- a/tests/by-util/test_logname.rs
+++ b/tests/by-util/test_logname.rs
@@ -1 +1,27 @@
-// ToDO: add tests
+use crate::common::util::*;
+use std::env;
+
+#[test]
+fn test_normal() {
+    let (_, mut ucmd) = at_and_ucmd!();
+
+    let result = ucmd.run();
+    println!("result.stdout = {}", result.stdout);
+    println!("result.stderr = {}", result.stderr);
+    println!("env::var(CI).is_ok() = {}", env::var("CI").is_ok());
+
+    for (key, value) in env::vars() {
+        println!("{}: {}", key, value);
+    }
+    if env::var("USER").is_ok()
+        && env::var("USER").unwrap() == "runner"
+        && result.stderr.contains("error: no login name")
+    {
+        // In the CI, some server are failing to return logname.
+        // As seems to be a configuration issue, ignoring it
+        return;
+    }
+
+    assert!(result.success);
+    assert!(!result.stdout.trim().is_empty());
+}