diff --git a/mail-client/neomutt/neomutt-20211029-r1.ebuild b/mail-client/neomutt/neomutt-20211029-r1.ebuild
index b8a28e2720eb5..21f921b4b59ef 100644
--- a/mail-client/neomutt/neomutt-20211029-r1.ebuild
+++ b/mail-client/neomutt/neomutt-20211029-r1.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	local test_dir="$(readlink --canonicalize "${S}"/../neomutt-test-files-${TEST_FILES_COMMIT})"
 	pushd ${test_dir} || die "Could not cd into test_dir"
 	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
 		|| die "Failed to run the setup.sh script"
diff --git a/mail-client/neomutt/neomutt-20211029.ebuild b/mail-client/neomutt/neomutt-20211029.ebuild
index 6c5d607b8a486..57bee1ffc254b 100644
--- a/mail-client/neomutt/neomutt-20211029.ebuild
+++ b/mail-client/neomutt/neomutt-20211029.ebuild
@@ -116,7 +116,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	local test_dir="$(readlink --canonicalize "${S}"/../neomutt-test-files-${TEST_FILES_COMMIT})"
 	pushd ${test_dir} || die "Could not cd into test_dir"
 	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
 		|| die "Failed to run the setup.sh script"
diff --git a/mail-client/neomutt/neomutt-20220408.ebuild b/mail-client/neomutt/neomutt-20220408.ebuild
index b3f780bca0aca..f149b539eac9d 100644
--- a/mail-client/neomutt/neomutt-20220408.ebuild
+++ b/mail-client/neomutt/neomutt-20220408.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	local test_dir="$(readlink --canonicalize "${S}"/../neomutt-test-files-${TEST_FILES_COMMIT})"
 	pushd ${test_dir} || die "Could not cd into test_dir"
 	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
 		|| die "Failed to run the setup.sh script"
diff --git a/mail-client/neomutt/neomutt-20220415.ebuild b/mail-client/neomutt/neomutt-20220415.ebuild
index b3f780bca0aca..f149b539eac9d 100644
--- a/mail-client/neomutt/neomutt-20220415.ebuild
+++ b/mail-client/neomutt/neomutt-20220415.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	local test_dir="$(readlink --canonicalize "${S}"/../neomutt-test-files-${TEST_FILES_COMMIT})"
 	pushd ${test_dir} || die "Could not cd into test_dir"
 	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
 		|| die "Failed to run the setup.sh script"
diff --git a/mail-client/neomutt/neomutt-20220429.ebuild b/mail-client/neomutt/neomutt-20220429.ebuild
index b3f780bca0aca..f149b539eac9d 100644
--- a/mail-client/neomutt/neomutt-20220429.ebuild
+++ b/mail-client/neomutt/neomutt-20220429.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	local test_dir="$(readlink --canonicalize "${S}"/../neomutt-test-files-${TEST_FILES_COMMIT})"
 	pushd ${test_dir} || die "Could not cd into test_dir"
 	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
 		|| die "Failed to run the setup.sh script"
diff --git a/mail-client/neomutt/neomutt-99999999.ebuild b/mail-client/neomutt/neomutt-99999999.ebuild
index b3f780bca0aca..f149b539eac9d 100644
--- a/mail-client/neomutt/neomutt-99999999.ebuild
+++ b/mail-client/neomutt/neomutt-99999999.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 }
 
 src_test() {
-	local test_dir="$(readlink --canonicalize ${S}/../neomutt-test-files-${TEST_FILES_COMMIT})"
+	local test_dir="$(readlink --canonicalize "${S}"/../neomutt-test-files-${TEST_FILES_COMMIT})"
 	pushd ${test_dir} || die "Could not cd into test_dir"
 	NEOMUTT_TEST_DIR="${test_dir}" ./setup.sh \
 		|| die "Failed to run the setup.sh script"