diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go
index 28598187b1..d32ae7285d 100644
--- a/cmd/podman/containers/run.go
+++ b/cmd/podman/containers/run.go
@@ -64,7 +64,7 @@ func runFlags(cmd *cobra.Command) {
 
 	flags.SetNormalizeFunc(utils.AliasFlags)
 	flags.BoolVar(&runOpts.SigProxy, "sig-proxy", true, "Proxy received signals to the process")
-	flags.BoolVar(&runRmi, "rmi", false, "Remove image unless used by other containers, implies --rm=true")
+	flags.BoolVar(&runRmi, "rmi", false, "Remove image unless used by other containers, implies --rm")
 
 	preserveFdsFlagName := "preserve-fds"
 	flags.UintVar(&runOpts.PreserveFDs, "preserve-fds", 0, "Pass a number of additional file descriptors into the container")
@@ -113,7 +113,7 @@ func run(cmd *cobra.Command, args []string) error {
 
 	if runRmi {
 		if cmd.Flags().Changed("rm") && !cliVals.Rm {
-			return errors.New("the --rmi option does not work without --rm=true")
+			return errors.New("the --rmi option does not work without --rm")
 		}
 		cliVals.Rm = true
 	}
diff --git a/docs/source/markdown/podman-run.1.md.in b/docs/source/markdown/podman-run.1.md.in
index 68181e99b3..541e06df92 100644
--- a/docs/source/markdown/podman-run.1.md.in
+++ b/docs/source/markdown/podman-run.1.md.in
@@ -347,7 +347,7 @@ the container when it exits. The default is **false**.
 #### **--rmi**
 
 After exit of the container, remove the image unless another
-container is using it. Implies --rm=true on the new container. The default is *false*.
+container is using it. Implies --rm on the new container. The default is *false*.
 
 @@option rootfs
 
diff --git a/pkg/machine/applehv/machine.go b/pkg/machine/applehv/machine.go
index 78bf01f4fc..7564f85553 100644
--- a/pkg/machine/applehv/machine.go
+++ b/pkg/machine/applehv/machine.go
@@ -79,7 +79,7 @@ type MacMachine struct {
 }
 
 // acquireVMImage determines if the image is already in a FCOS stream. If so,
-// retrives the image path of the uncompressed file. Otherwise, the user has
+// retrieves the image path of the uncompressed file. Otherwise, the user has
 // provided an alternative image, so we set the image path and download the image.
 func (m *MacMachine) acquireVMImage(opts machine.InitOptions, dataDir string) error {
 	// Acquire the image
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index 62978d0ff4..c267d5d18e 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -196,7 +196,7 @@ func migrateVM(configPath string, config []byte, vm *MachineVM) error {
 }
 
 // acquireVMImage determines if the image is already in a FCOS stream. If so,
-// retrives the image path of the uncompressed file. Otherwise, the user has
+// retrieves the image path of the uncompressed file. Otherwise, the user has
 // provided an alternative image, so we set the image path and download the image.
 func (v *MachineVM) acquireVMImage(opts machine.InitOptions) error {
 	switch opts.ImagePath {
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 1a1c53de7b..040440e084 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -191,7 +191,7 @@ echo $rand        |   0 | $rand
     run_podman 1 image exists $NONLOCAL_IMAGE
 
     run_podman 125 run --rmi --rm=false $NONLOCAL_IMAGE /bin/true
-    is "$output" "Error: the --rmi option does not work without --rm=true" "--rmi should refuse to remove images when --rm=false set by user"
+    is "$output" "Error: the --rmi option does not work without --rm" "--rmi should refuse to remove images when --rm=false set by user"
 }
 
 # 'run --conmon-pidfile --cid-file' makes sure we don't regress on these flags.
diff --git a/test/system/160-volumes.bats b/test/system/160-volumes.bats
index 5c97dc89b8..760724ae4d 100644
--- a/test/system/160-volumes.bats
+++ b/test/system/160-volumes.bats
@@ -348,7 +348,7 @@ EOF
                stat -c "%u:%g:%s" /vol/myfile
     is "$output" "$(id -u):$(id -g):0" "with keep-id from containers.conf: stat(file in container) == my uid"
 
-    # With keep-id from containers.conf overriden with --userns=nomap
+    # With keep-id from containers.conf overridden with --userns=nomap
     CONTAINERS_CONF_OVERRIDE="$containersconf" run_podman run --rm -v $myvoldir:/vol:z --userns=nomap $IMAGE \
                stat -c "%u:%g:%s" /vol/myfile
     is "$output" "65534:65534:0" "w/o overridden containers.conf keep-id->nomap: stat(file in container) == root"