diff --git a/src/uu/echo/src/echo.rs b/src/uu/echo/src/echo.rs
index 7dfdf3113..7c0014229 100644
--- a/src/uu/echo/src/echo.rs
+++ b/src/uu/echo/src/echo.rs
@@ -117,6 +117,11 @@ pub fn uumain(args: impl uucore::Args) -> i32 {
 
     let matches = App::new(executable!())
         .name(NAME)
+        // TrailingVarArg specifies the final positional argument is a VarArg
+        // and it doesn't attempts the parse any further args.
+        // Final argument must have multiple(true) or the usage string equivalent.
+        .setting(clap::AppSettings::TrailingVarArg)
+        .setting(clap::AppSettings::AllowLeadingHyphen)
         .version(VERSION)
         .usage(SYNTAX)
         .about(SUMMARY)
diff --git a/tests/by-util/test_echo.rs b/tests/by-util/test_echo.rs
index 2d073d60b..7394ffc1e 100644
--- a/tests/by-util/test_echo.rs
+++ b/tests/by-util/test_echo.rs
@@ -173,3 +173,58 @@ fn test_disable_escapes() {
         .succeeds()
         .stdout_only(format!("{}\n", input_str));
 }
+
+#[test]
+fn test_hyphen_value() {
+    new_ucmd!().arg("-abc").succeeds().stdout_is("-abc\n");
+}
+
+#[test]
+fn test_multiple_hyphen_values() {
+    new_ucmd!()
+        .args(&["-abc", "-def", "-edf"])
+        .succeeds()
+        .stdout_is("-abc -def -edf\n");
+}
+
+#[test]
+fn test_hyphen_values_inside_string() {
+    new_ucmd!()
+        .arg("'\"\n'CXXFLAGS=-g -O2'\n\"'")
+        .succeeds()
+        .stdout
+        .contains("CXXFLAGS");
+}
+
+#[test]
+fn test_hyphen_values_at_start() {
+    let result = new_ucmd!()
+        .arg("-E")
+        .arg("-test")
+        .arg("araba")
+        .arg("-merci")
+        .run();
+
+    assert!(result.success);
+    assert_eq!(false, result.stdout.contains("-E"));
+    assert_eq!(result.stdout, "-test araba -merci\n");
+}
+
+#[test]
+fn test_hyphen_values_between() {
+    let result = new_ucmd!().arg("test").arg("-E").arg("araba").run();
+
+    assert!(result.success);
+    assert_eq!(result.stdout, "test -E araba\n");
+
+    let result = new_ucmd!()
+        .arg("dumdum ")
+        .arg("dum dum dum")
+        .arg("-e")
+        .arg("dum")
+        .run();
+
+    assert!(result.success);
+    assert_eq!(result.stdout, "dumdum  dum dum dum -e dum\n");
+    assert_eq!(true, result.stdout.contains("-e"));
+}