diff --git a/docs/content/introduction.md b/docs/content/introduction.md
index 17c9b593..b0d2f0a5 100644
--- a/docs/content/introduction.md
+++ b/docs/content/introduction.md
@@ -101,7 +101,7 @@ MUA <---- STARTTLS ---- ┤(143)   MDA ╯        |
  ┗━━━━━━━━━━ Retrieval ━━━━━━━━━━┛
 ```
 
-If you're new to email infrastructure, both that table and the schema may be confusing.  
+If you're new to email infrastructure, both that table and the schema may be confusing.
 Read on to expand your understanding and learn about `docker-mailserver`'s configuration, including how you can customize it.
 
 ### Submission - SMTP
@@ -145,7 +145,7 @@ The best practice as of 2020 when it comes to securing Outward Submission is to
 - Port 465 is the reserved TCP port for Implicit TLS Submission (since 2018). There is actually a boisterous history to that ports usage, but let's keep it simple.
 
 !!! warning
-    This Submission setup is sometimes refered to as [SMTPS][wikipedia-smtps]. Long story short: this is incorrect and should be avoided.
+    This Submission setup is sometimes referred to as [SMTPS][wikipedia-smtps]. Long story short: this is incorrect and should be avoided.
 
 Although a very satisfactory setup, Implicit TLS on port 465 is somewhat "cutting edge". There exists another well established mail Submission setup that must be supported as well, SMTP+STARTTLS on port 587. It uses Explicit TLS: the client starts with a cleartext connection, then the server informs a TLS-encrypted "upgraded" connection may be established, and the client _may_ eventually decide to establish it prior to the Submission. Basically it's an opportunistic, opt-in TLS upgrade of the connection between the client and the server, at the client's discretion, using a mechanism known as [STARTTLS][wikipedia-starttls] that both ends need to implement.
 
diff --git a/target/bin/sedfile b/target/bin/sedfile
index 78369a49..106efe17 100755
--- a/target/bin/sedfile
+++ b/target/bin/sedfile
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Wrapper for 'sed -i': fail if file was not modified by sed and container was not restarted.
-# Error output is surpressed, when container is restarted to avoid harmless error messages.
+# Error output is suppressed, when container is restarted to avoid harmless error messages.
 # Use "--strict" as first parameter, to fail regardless of the container state (fresh or restarted).
 
 # When to use sedfile?
diff --git a/test/config/dovecot-lmtp/conf.d/90-quota.conf b/test/config/dovecot-lmtp/conf.d/90-quota.conf
index db1f7188..13a3f95e 100644
--- a/test/config/dovecot-lmtp/conf.d/90-quota.conf
+++ b/test/config/dovecot-lmtp/conf.d/90-quota.conf
@@ -30,7 +30,7 @@ plugin {
 
 # You can execute a given command when user exceeds a specified quota limit.
 # Each quota root has separate limits. Only the command for the first
-# exceeded limit is excecuted, so put the highest limit first.
+# exceeded limit is executed, so put the highest limit first.
 # The commands are executed via script service by connecting to the named
 # UNIX socket (quota-warning below).
 # Note that % needs to be escaped as %%, otherwise "% " expands to empty.
diff --git a/test/config/dovecot-lmtp/conf.d/auth-system.conf.ext b/test/config/dovecot-lmtp/conf.d/auth-system.conf.ext
index 4c0f6fdc..f9b28138 100644
--- a/test/config/dovecot-lmtp/conf.d/auth-system.conf.ext
+++ b/test/config/dovecot-lmtp/conf.d/auth-system.conf.ext
@@ -14,7 +14,7 @@ passdb {
   #args = dovecot
 }
 
-# System users (NSS, /etc/passwd, or similiar).
+# System users (NSS, /etc/passwd, or similar).
 # In many systems nowadays this uses Name Service Switch, which is
 # configured in /etc/nsswitch.conf. <doc/wiki/AuthDatabase.Passwd.txt>
 #passdb {
@@ -23,7 +23,7 @@ passdb {
   #args =
 #}
 
-# Shadow passwords for system users (NSS, /etc/shadow or similiar).
+# Shadow passwords for system users (NSS, /etc/shadow or similar).
 # Deprecated by PAM nowadays.
 # <doc/wiki/PasswordDatabase.Shadow.txt>
 #passdb {
@@ -44,7 +44,7 @@ passdb {
 ## User databases
 ##
 
-# System users (NSS, /etc/passwd, or similiar). In many systems nowadays this
+# System users (NSS, /etc/passwd, or similar). In many systems nowadays this
 # uses Name Service Switch, which is configured in /etc/nsswitch.conf.
 userdb {
   # <doc/wiki/AuthDatabase.Passwd.txt>
diff --git a/test/tests/serial/mail_lmtp_ip.bats b/test/tests/serial/mail_lmtp_ip.bats
index 2ceca916..c9ce479a 100644
--- a/test/tests/serial/mail_lmtp_ip.bats
+++ b/test/tests/serial/mail_lmtp_ip.bats
@@ -30,7 +30,7 @@ teardown_file() {
 }
 
 @test "checking postfix-lmtp: delivers mail to existing account" {
-  # maybe we can move this into the setup to speed things up futher.
+  # maybe we can move this into the setup to speed things up further.
   # this likely would need an async coroutine to avoid blocking the other tests while waiting for the server to come up
   wait_for_smtp_port_in_container mail_lmtp_ip
   run docker exec mail_lmtp_ip /bin/sh -c "nc 0.0.0.0 25 < /tmp/docker-mailserver-test/email-templates/existing-user1.txt"
diff --git a/test/tests/serial/test_helper.bats b/test/tests/serial/test_helper.bats
index 54d2c145..9a6684ec 100644
--- a/test/tests/serial/test_helper.bats
+++ b/test/tests/serial/test_helper.bats
@@ -126,7 +126,7 @@ BATS_TEST_NAME_PREFIX='test helper functions:'
   run cat "${path}/marker"
   assert_line "This marker file is there to identify the correct config being copied"
 
-  run duplicate_config_for_container non-existant-source-folder "${BATS_TEST_NAME}2"
+  run duplicate_config_for_container non-existent-source-folder "${BATS_TEST_NAME}2"
   assert_failure
 }