diff --git a/test/chruby_exec_test.sh b/test/chruby_exec_test.sh
index ea7cfc87..c3987e90 100755
--- a/test/chruby_exec_test.sh
+++ b/test/chruby_exec_test.sh
@@ -23,7 +23,7 @@ function test_chruby_exec()
 
 function test_chruby_exec_with_version()
 {
-	local output=$(chruby-exec --version)
+	local output="$(chruby-exec --version)"
 
 	assertEquals "did not output the correct version" \
 		     "chruby version $CHRUBY_VERSION" \
diff --git a/test/setup b/test/setup
index a26734ed..4d60672d 100755
--- a/test/setup
+++ b/test/setup
@@ -5,7 +5,7 @@
 function log() {
 	if [[ -t 1 ]]; then
 		printf "%b>>>%b %b%s%b\n" "\x1b[1m\x1b[32m" "\x1b[0m" \
-		                          "\x1b[1m\x1b[37m" "$1" "\x1b[0m"
+															"\x1b[1m\x1b[37m" "$1" "\x1b[0m"
 	else
 		printf ">>> %s\n" "$1"
 	fi
@@ -14,7 +14,7 @@ function log() {
 function error() {
 	if [[ -t 1 ]]; then
 		printf "%b!!!%b %b%s%b\n" "\x1b[1m\x1b[31m" "\x1b[0m" \
-		                          "\x1b[1m\x1b[37m" "$1" "\x1b[0m" >&2
+															"\x1b[1m\x1b[37m" "$1" "\x1b[0m" >&2
 	else
 		printf "!!! %s\n" "$1" >&2
 	fi
@@ -150,9 +150,9 @@ function detect_system() {
 }
 
 detect_system || fail "Cannot auto-detect system type"
-[[ "$system_name" == "unknown"    ]] && fail "Could not detect system name"
+[[ "$system_name" == "unknown"		]] && fail "Could not detect system name"
 [[ "$system_version" == "unknown" ]] && fail "Could not detect system version"
-[[ "$system_arch" == "unknown"    ]] && fail "Could not detect system arch"
+[[ "$system_arch" == "unknown"		]] && fail "Could not detect system arch"
 
 test_ruby_archive="$test_ruby_engine-$test_ruby_version-p$test_ruby_patchlevel.tar.bz2"
 test_ruby_url="http://rvm.io/binaries/$system_name/$system_version/$system_arch/$test_ruby_archive"