diff --git a/lgsm/functions/command_dev_detect_glibc.sh b/lgsm/functions/command_dev_detect_glibc.sh
index bfb7a80cf..4fb472a94 100644
--- a/lgsm/functions/command_dev_detect_glibc.sh
+++ b/lgsm/functions/command_dev_detect_glibc.sh
@@ -16,7 +16,7 @@ if [ -z "$(command -v objdump)" ]; then
 fi
 
 if [ -z "${serverfiles}" ]; then
-	dir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"
+	dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
 fi
 
 if [ -d "${serverfiles}" ]; then
diff --git a/lgsm/functions/command_dev_detect_ldd.sh b/lgsm/functions/command_dev_detect_ldd.sh
index 668ca0377..d80ad0895 100644
--- a/lgsm/functions/command_dev_detect_ldd.sh
+++ b/lgsm/functions/command_dev_detect_ldd.sh
@@ -10,7 +10,7 @@ echo "Shared Object dependencies Checker"
 echo "================================="
 
 if [ -z "${serverfiles}" ]; then
-	dir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"
+	dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
 fi
 
 if [ -d "${serverfiles}" ]; then
diff --git a/tests/tests_jc2server.sh b/tests/tests_jc2server.sh
index 36d366069..c0d6d0b19 100644
--- a/tests/tests_jc2server.sh
+++ b/tests/tests_jc2server.sh
@@ -16,10 +16,10 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170619"
+version="171014"
 shortname="jc2"
 gameservername="jc2server"
-rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"
+rootdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
 selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 servicename="${selfname}"
 lockselfname=".${servicename}.lock"
diff --git a/tests/tests_ts3server.sh b/tests/tests_ts3server.sh
index dd5b8351b..7f327dc13 100644
--- a/tests/tests_ts3server.sh
+++ b/tests/tests_ts3server.sh
@@ -16,10 +16,10 @@ if [ -f ".dev-debug" ]; then
 	set -x
 fi
 
-version="170619"
+version="171014"
 shortname="ts3"
 gameservername="ts3server"
-rootdir="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"
+rootdir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
 selfname="$(basename $(readlink -f "${BASH_SOURCE[0]}"))"
 servicename="${selfname}"
 lockselfname=".${servicename}.lock"