diff --git a/tests/exists.svtest b/tests/exists.svtest
index 63e52467699418309cc7fb4da9551ee0eeaad704..f215cf8263a4c0eaa2ac68518a2eb9a37f6e025a 100644
--- a/tests/exists.svtest
+++ b/tests/exists.svtest
@@ -17,7 +17,7 @@ test "EXISTS-one" {
 	}
 
 	if exists "x-nonsense" {
-        test_fail "exists test found non-existant header";
+        test_fail "exists test found non-existent header";
     }
 }
 
@@ -27,7 +27,7 @@ test "EXISTS-two" {
     }
 
     if exists ["from","to","x-nonsense"] {
-        test_fail "exists test found non-existant header";
+        test_fail "exists test found non-existent header";
     }
 }
 
@@ -37,6 +37,6 @@ test "EXISTS-three" {
     }
 
     if exists ["x-spam", "sub", "resent"] {
-        test_fail "exists test found non-existant header";
+        test_fail "exists test found non-existent header";
     }
 }
diff --git a/tests/extensions/body/basic.svtest b/tests/extensions/body/basic.svtest
index 050ea76f698ad2d8de15b0ec456f106fba21e361..fccf59767a4f13aa1b17df10abe7e45c75527aa1 100644
--- a/tests/extensions/body/basic.svtest
+++ b/tests/extensions/body/basic.svtest
@@ -84,14 +84,14 @@ Subject: No body is here!
 
 test "No body" {
 	if body :raw :contains "" {
-		test_fail "matched against non-existant body (:contains \"\")";
+		test_fail "matched against non-existent body (:contains \"\")";
 	}
 
 	if body :raw :is "" {
-		test_fail "matched against non-existant body (:is \"\")";
+		test_fail "matched against non-existent body (:is \"\")";
 	}
 
 	if body :raw :matches "*" {
-		test_fail "matched against non-existant body (:matches \"*\")";
+		test_fail "matched against non-existent body (:matches \"*\")";
 	}
 }
diff --git a/tests/extensions/environment/rfc.svtest b/tests/extensions/environment/rfc.svtest
index 7938765ffeabc4320515d8820c9a55ab24b95c9b..598ca56aca3f99c5e76dfab6be11e37a2c566510 100644
--- a/tests/extensions/environment/rfc.svtest
+++ b/tests/extensions/environment/rfc.svtest
@@ -2,7 +2,7 @@ require "vnd.dovecot.testsuite";
 require "environment";
 require "relational";
 
-test "Non-existant" {
+test "Non-existent" {
 	if environment :contains "nonsense" "" {
 		test_fail "matched unknown environment item";	
 	}
diff --git a/tests/extensions/include/errors/generic.sieve b/tests/extensions/include/errors/generic.sieve
index 56d0f97da3d291caa898d1fffc13529c490433ea..66eba181388aae2774f5213e9076a221166f6fe9 100644
--- a/tests/extensions/include/errors/generic.sieve
+++ b/tests/extensions/include/errors/generic.sieve
@@ -1,6 +1,6 @@
 require "include";
 
-# Non-existant sieve script
+# Non-existent sieve script
 include "frop.sieve";
 
 # Use of / in script names
diff --git a/tests/extensions/subaddress/basic.svtest b/tests/extensions/subaddress/basic.svtest
index 32f795422101306d3b3251c3ec470be6cbeb4566..679fda7a03f986dc483f80d113b061487341d370 100644
--- a/tests/extensions/subaddress/basic.svtest
+++ b/tests/extensions/subaddress/basic.svtest
@@ -102,10 +102,10 @@ test_set "envelope.to" "frop@sieve.nl";
 
 test "No detail" {
 	if envelope :detail "to" "virus" {
-		test_fail ":detail matched non-existant detail element in envelope (separator is missing)";
+		test_fail ":detail matched non-existent detail element in envelope (separator is missing)";
 	}
 
 	if address :detail "from" "virus" {
-		test_fail ":detail matched non-existant detail element in from header (separator is missing)";		
+		test_fail ":detail matched non-existent detail element in from header (separator is missing)";		
 	}
 }
diff --git a/tests/header.svtest b/tests/header.svtest
index 2fc5e8051c3077aeeefeedd95e3fe2f8a2bdce57..a8cee307ef0c9389f48424e11085c43f5a89c54f 100644
--- a/tests/header.svtest
+++ b/tests/header.svtest
@@ -45,7 +45,7 @@ test "Contains empty - exist" {
 
 test "Contains empty - not exist" {
 	if header :contains "x-nonsense" "" {
-		test_fail "header test :contains match type matches \"\" on non-existant header";
+		test_fail "header test :contains match type matches \"\" on non-existent header";
 	}
 }