diff --git a/Makefile b/Makefile
index 9ed4e023e1..e818d292f6 100644
--- a/Makefile
+++ b/Makefile
@@ -278,7 +278,7 @@ test/version/version: version/version.go
 
 .PHONY: codespell
 codespell:
-	codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,swagger.yaml,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L hastable,te,clos,ans,pullrequest,uint,iff,od,seeked,splitted,marge,erro,hist,ether,specif -w
+	codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,swagger.yaml,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L passt,bu,hastable,te,clos,ans,pullrequest,uint,iff,od,seeked,splitted,marge,erro,hist,ether,specif -w
 
 .PHONY: validate
 validate: lint .gitvalidation validate.completions man-page-check swagger-check tests-included tests-expect-exit pr-removes-fixed-skips
diff --git a/cmd/podman/containers/export.go b/cmd/podman/containers/export.go
index c3ddef39bd..51d4c3694e 100644
--- a/cmd/podman/containers/export.go
+++ b/cmd/podman/containers/export.go
@@ -79,7 +79,7 @@ func export(cmd *cobra.Command, args []string) error {
 		if err := parse.ValidateFileName(outputFile); err != nil {
 			return err
 		}
-		// open file here with WRONLY since on MacOS it can fail to open /dev/stderr in read mode for example
+		// open file here with O_WRONLY since on MacOS it can fail to open /dev/stderr in read mode for example
 		// https://github.com/containers/podman/issues/16870
 		file, err := os.OpenFile(outputFile, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
 		if err != nil {
diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go
index fc1fc62f3d..cf0291e354 100644
--- a/libpod/runtime_img.go
+++ b/libpod/runtime_img.go
@@ -81,7 +81,7 @@ func (r *Runtime) IsExternalContainerCallback(_ context.Context) libimage.IsExte
 	// NOTE: pruning external containers is subject to race conditions
 	// (e.g., when a container gets removed). To address this and similar
 	// races, pruning had to happen inside c/storage.  Containers has to be
-	// labelled with "podman/libpod" along with callbacks similar to
+	// labeled with "podman/libpod" along with callbacks similar to
 	// libimage.
 	return func(idOrName string) (bool, error) {
 		_, err := r.LookupContainer(idOrName)
diff --git a/test/e2e/run_networking_test.go b/test/e2e/run_networking_test.go
index 9bb2eac3c7..263864e21e 100644
--- a/test/e2e/run_networking_test.go
+++ b/test/e2e/run_networking_test.go
@@ -144,7 +144,7 @@ var _ = Describe("Podman run networking", func() {
 		// already expected to be present and processed by
 		// Podman's DNS resolver i.e ( aarvark-dns or dnsname ).
 		Expect(session.OutputToString()).ToNot(ContainSubstring("nameserver 1.1.1.1"))
-		// But /etc/resolve.conf must contain othe nameserver
+		// But /etc/resolve.conf must contain other nameserver
 		// i.e dns server configured for network.
 		Expect(session.OutputToString()).To(ContainSubstring("nameserver"))
 
diff --git a/test/e2e/systemd_activate_test.go b/test/e2e/systemd_activate_test.go
index 35b4e98504..fc40c734c6 100644
--- a/test/e2e/systemd_activate_test.go
+++ b/test/e2e/systemd_activate_test.go
@@ -72,7 +72,7 @@ var _ = Describe("Systemd activate", func() {
 		defer os.RemoveAll(tmpRootDir)
 
 		// When SELinux is enabled, a storage root directory should be
-		// labeld with a specific value
+		// labeled with a specific value
 		if selinux.GetEnabled() {
 			rootDir := "/var/lib/containers"
 			label := "container_var_lib_t"
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index ceb9f9e099..746020cb4c 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -857,7 +857,7 @@ EOF
 
     oomscore=$((oomscore+1))
     CONTAINERS_CONF=$PODMAN_TMPDIR/containers.conf run_podman run --oom-score-adj=$oomscore --rm $IMAGE cat /proc/self/oom_score_adj
-    is "$output" "$oomscore" "--oom-score-adj should overide containers.conf"
+    is "$output" "$oomscore" "--oom-score-adj should override containers.conf"
 }
 
 # CVE-2022-1227 : podman top joins container mount NS and uses nsenter from image
diff --git a/test/system/150-login.bats b/test/system/150-login.bats
index f909914c4f..2523bc021b 100644
--- a/test/system/150-login.bats
+++ b/test/system/150-login.bats
@@ -203,19 +203,19 @@ function _push_search_test() {
                --creds ${PODMAN_LOGIN_USER}:${PODMAN_LOGIN_PASS} \
                $IMAGE localhost:${PODMAN_LOGIN_REGISTRY_PORT}/$destname
 
-    # Search a pushed image without --cert-dir will be failed if --tls-verify=true
+    # Search a pushed image without --cert-dir should fail if --tls-verify=true
     run_podman $2 search --tls-verify=$1 \
                --format "table {{.Name}}" \
                --creds ${PODMAN_LOGIN_USER}:${PODMAN_LOGIN_PASS} \
                localhost:${PODMAN_LOGIN_REGISTRY_PORT}/$destname
 
-    # Search a pushed image without --creds will be failed
+    # Search a pushed image without --creds should fail
     run_podman 125 search --tls-verify=$1 \
                --format "table {{.Name}}" \
                --cert-dir ${PODMAN_LOGIN_WORKDIR}/trusted-registry-cert-dir \
                localhost:${PODMAN_LOGIN_REGISTRY_PORT}/$destname
 
-    # Search a pushed image will be successed
+    # Search a pushed image should succeed
     run_podman search --tls-verify=$1 \
                --format "table {{.Name}}" \
                --cert-dir ${PODMAN_LOGIN_WORKDIR}/trusted-registry-cert-dir \