diff --git a/src/pinky/pinky.rs b/src/pinky/pinky.rs
index 72ccb8f5d..f911caee5 100644
--- a/src/pinky/pinky.rs
+++ b/src/pinky/pinky.rs
@@ -48,21 +48,21 @@ pub fn uumain(args: Vec<String>) -> i32 {
 The utmp file will be {}", utmpx::DEFAULT_FILE);
     let mut opts = new_coreopts!(SYNTAX, SUMMARY, &long_help);
     opts.optflag("l",
-                 "l",
+                 "",
                  "produce long format output for the specified USERs");
     opts.optflag("b",
-                 "b",
+                 "",
                  "omit the user's home directory and shell in long format");
-    opts.optflag("h", "h", "omit the user's project file in long format");
-    opts.optflag("p", "p", "omit the user's plan file in long format");
-    opts.optflag("s", "s", "do short format output, this is the default");
-    opts.optflag("f", "f", "omit the line of column headings in short format");
-    opts.optflag("w", "w", "omit the user's full name in short format");
+    opts.optflag("h", "", "omit the user's project file in long format");
+    opts.optflag("p", "", "omit the user's plan file in long format");
+    opts.optflag("s", "", "do short format output, this is the default");
+    opts.optflag("f", "", "omit the line of column headings in short format");
+    opts.optflag("w", "", "omit the user's full name in short format");
     opts.optflag("i",
-                 "i",
+                 "",
                  "omit the user's full name and remote host in short format");
     opts.optflag("q",
-                 "q",
+                 "",
                  "omit the user's full name, remote host and idle time in short format");
     opts.optflag("", "help", "display this help and exit");
     opts.optflag("", "version", "output version information and exit");
diff --git a/src/who/who.rs b/src/who/who.rs
index 3c85774f3..d71d902dc 100644
--- a/src/who/who.rs
+++ b/src/who/who.rs
@@ -55,7 +55,7 @@ pub fn uumain(args: Vec<String>) -> i32 {
     opts.optflag("H", "heading", "print line of column headings");
     opts.optflag("l", "login", "print system login processes");
     opts.optflag("", "lookup", "attempt to canonicalize hostnames via DNS");
-    opts.optflag("m", "m", "only hostname and user associated with stdin");
+    opts.optflag("m", "", "only hostname and user associated with stdin");
     opts.optflag("p", "process", "print active processes spawned by init");
     opts.optflag("q",
                  "count",
diff --git a/tests/test_base32.rs b/tests/test_base32.rs
index ee6a2bf1f..87bcca573 100644
--- a/tests/test_base32.rs
+++ b/tests/test_base32.rs
@@ -72,7 +72,7 @@ fn test_wrap_no_arg() {
         new_ucmd!()
             .arg(wrap_param)
             .fails()
-            .stderr_only(format!("base32: error: Argument to option '{}' missing.\n",
+            .stderr_only(format!("base32: error: Argument to option '{}' missing\n",
                                  if wrap_param == "-w" { "w" } else { "wrap" }));
     }
 }
diff --git a/tests/test_base64.rs b/tests/test_base64.rs
index 60835bdcb..94268acda 100644
--- a/tests/test_base64.rs
+++ b/tests/test_base64.rs
@@ -64,7 +64,7 @@ fn test_wrap_no_arg() {
         new_ucmd!()
             .arg(wrap_param)
             .fails()
-            .stderr_only(format!("base64: error: Argument to option '{}' missing.\n",
+            .stderr_only(format!("base64: error: Argument to option '{}' missing\n",
                                  if wrap_param == "-w" { "w" } else { "wrap" }));
     }
 }
diff --git a/tests/test_uniq.rs b/tests/test_uniq.rs
index 3d4f06b79..ffc4d5e37 100644
--- a/tests/test_uniq.rs
+++ b/tests/test_uniq.rs
@@ -65,14 +65,14 @@ fn test_stdin_all_repeated() {
 #[test]
 fn test_stdin_all_repeated_separate() {
     new_ucmd!()
-        .args(&["--all-repeated", "separate"]).pipe_in_fixture(INPUT)
+        .args(&["--all-repeated=separate"]).pipe_in_fixture(INPUT)
         .run().stdout_is_fixture("sorted-all-repeated-separate.expected");
 }
 
 #[test]
 fn test_stdin_all_repeated_prepend() {
     new_ucmd!()
-        .args(&["--all-repeated", "prepend"]).pipe_in_fixture(INPUT)
+        .args(&["--all-repeated=prepend"]).pipe_in_fixture(INPUT)
         .run().stdout_is_fixture("sorted-all-repeated-prepend.expected");
 }