diff --git a/tests/e2e/env/CHANGELOG.md b/tests/e2e/env/CHANGELOG.md
index e7aaafd6fc4..d598349bc2e 100644
--- a/tests/e2e/env/CHANGELOG.md
+++ b/tests/e2e/env/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 - Support for screenshots on test errors
 
+## Fixed
+
+- Update `wc-e2e` script to fix an issue with directories with a space in their name
+
 # 0.2.0
 
 ## Added
diff --git a/tests/e2e/env/bin/wc-e2e.sh b/tests/e2e/env/bin/wc-e2e.sh
index 0f5eee0d23e..d5fee2dc478 100755
--- a/tests/e2e/env/bin/wc-e2e.sh
+++ b/tests/e2e/env/bin/wc-e2e.sh
@@ -30,8 +30,8 @@ TESTRESULT=0
 
 # Use the script symlink to find and change directory to the root of the package
 SCRIPTPATH=$(dirname "$0")
-REALPATH=$(readlink $0)
-cd $SCRIPTPATH/$(dirname "$REALPATH")/..
+REALPATH=$(readlink "$0")
+cd "$SCRIPTPATH/$(dirname "$REALPATH")/.."
 
 # Run scripts
 case $1 in
@@ -65,6 +65,6 @@ case $1 in
 esac
 
 # Restore working path
-cd $OLDPATH
+cd "$OLDPATH"
 
 exit $TESTRESULT