diff --git a/test/plugins/base.plugin.bats b/test/plugins/base.plugin.bats
index 7daf26197f..1def481eca 100755
--- a/test/plugins/base.plugin.bats
+++ b/test/plugins/base.plugin.bats
@@ -40,7 +40,7 @@ load ../../plugins/available/base.plugin
   mkcd "${dir_name}"
   assert_success
   assert_dir_exist "${BASH_IT_ROOT}/${dir_name}"
-  assert_equal $(pwd) "${BASH_IT_ROOT}/${dir_name}"
+  assert_equal "${PWD}" "${BASH_IT_ROOT}/${dir_name}"
 }
 
 @test 'plugins base: lsgrep()' {
diff --git a/test/run b/test/run
index 8820291640..fe4ac8477d 100755
--- a/test/run
+++ b/test/run
@@ -6,7 +6,7 @@ git submodule init && git submodule update
 
 if [ -z "${BASH_IT}" ]; then
   declare BASH_IT
-  BASH_IT=$(cd ${test_directory} && dirname "$(pwd)")
+  BASH_IT="$(cd "${test_directory}" && dirname "${PWD}")"
   export BASH_IT
 fi