diff --git a/lib/luks2/luks2_reencrypt.c b/lib/luks2/luks2_reencrypt.c
index 7c32ee8e..502b5d91 100644
--- a/lib/luks2/luks2_reencrypt.c
+++ b/lib/luks2/luks2_reencrypt.c
@@ -3828,7 +3828,7 @@ static int reencrypt_init_by_keyslot_context(struct crypt_device *cd,
 
 	if (name && !device_direct_io(crypt_data_device(cd))) {
 		log_dbg(cd, "Device %s does not support direct I/O.", device_path(crypt_data_device(cd)));
-		/* FIXME: Add more specific error mesage for translation later. */
+		/* FIXME: Add more specific error message for translation later. */
 		log_err(cd, _("Failed to initialize reencryption device stack."));
 		return -EINVAL;
 	}
diff --git a/misc/dict_search/crypt_dict.c b/misc/dict_search/crypt_dict.c
index b9c7508c..1e682208 100644
--- a/misc/dict_search/crypt_dict.c
+++ b/misc/dict_search/crypt_dict.c
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
 		exit(EXIT_FAILURE);
 	}
 
-	/* run scan in separate processes, it is up to scheduler to assign CPUs inteligently */
+	/* run scan in separate processes, it is up to scheduler to assign CPUs intelligently */
 	for (i = 0; i < procs; i++)
 		check(cd, argv[3], i, procs);
 
diff --git a/tests/api-test-2.c b/tests/api-test-2.c
index b48f09d0..3d19fde6 100644
--- a/tests/api-test-2.c
+++ b/tests/api-test-2.c
@@ -2456,7 +2456,7 @@ static void LuksConvert(void)
 	OK_(strcmp(crypt_get_type(cd), CRYPT_LUKS1));
 	CRYPT_FREE(cd);
 
-	// exercice non-pbkdf2 LUKSv2 conversion
+	// exercise non-pbkdf2 LUKSv2 conversion
 	if (!_fips_mode) {
 		OK_(crypt_init(&cd, DEVICE_1));
 		OK_(crypt_set_data_offset(cd, offset));
@@ -2467,7 +2467,7 @@ static void LuksConvert(void)
 		CRYPT_FREE(cd);
 	}
 
-	// exercice non LUKS1 compatible keyslot
+	// exercise non LUKS1 compatible keyslot
 	OK_(crypt_init(&cd, DEVICE_1));
 	OK_(crypt_set_data_offset(cd, offset));
 	OK_(crypt_format(cd, CRYPT_LUKS2, cipher, cipher_mode, NULL, NULL, 32, &luks2));
@@ -2477,7 +2477,7 @@ static void LuksConvert(void)
 	FAIL_(crypt_convert(cd, CRYPT_LUKS1, NULL), "Unassigned keyslots are incompatible with LUKSv1 format");
 	CRYPT_FREE(cd);
 
-	// exercice LUKSv2 conversion with single pbkdf2 keyslot being active
+	// exercise LUKSv2 conversion with single pbkdf2 keyslot being active
 	OK_(crypt_init(&cd, DEVICE_1));
 	OK_(crypt_set_data_offset(cd, offset));
 	OK_(crypt_set_pbkdf_type(cd, &pbkdf2));
diff --git a/tests/blockwise-compat-test b/tests/blockwise-compat-test
index 0672ca21..fd0bf544 100755
--- a/tests/blockwise-compat-test
+++ b/tests/blockwise-compat-test
@@ -236,7 +236,7 @@ run_all() {
 	RUN "P" $1 read_lseek_blockwise $((2*BSIZE)) $BSIZE $((BSIZE+1))
 	RUN "P" $1 read_lseek_blockwise $((3*BSIZE-2)) $BSIZE $((BSIZE+1))
 
-	# hiting exactly the sector boundary
+	# hitting exactly the sector boundary
 	RUN "P" $1 read_lseek_blockwise $((BSIZE-1)) $BSIZE 1
 	RUN "P" $1 read_lseek_blockwise $((BSIZE-1)) $BSIZE $((BSIZE+1))
 	RUN "P" $1 read_lseek_blockwise $((BSIZE+1)) $BSIZE $((BSIZE-1))
@@ -290,7 +290,7 @@ run_all() {
 	RUN "P" $1 write_lseek_blockwise $((2*BSIZE)) $BSIZE $((BSIZE+1))
 	RUN "P" $1 write_lseek_blockwise $((3*BSIZE-2)) $BSIZE $((BSIZE+1))
 
-	# hiting exactly the sector boundary
+	# hitting exactly the sector boundary
 	RUN "P" $1 write_lseek_blockwise $((BSIZE-1)) $BSIZE 1
 	RUN "P" $1 write_lseek_blockwise $((BSIZE-1)) $BSIZE $((BSIZE+1))
 	RUN "P" $1 write_lseek_blockwise $((BSIZE+1)) $BSIZE $((BSIZE-1))