diff --git a/services/scripts/test_service.sh b/services/scripts/test_service.sh
--- a/services/scripts/test_service.sh
+++ b/services/scripts/test_service.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-SERVICES=`./scripts/list_services.sh`
-SERVICE=`echo "$SERVICES" | grep $1` || echo "No such service: $1"
+SERVICES=$(./scripts/list_services.sh)
+SERVICE=$(grep "$1" <<< echo "$SERVICES") || echo "No such service: $1"
 
 if [ "$SERVICE" != "$1" ]; then
   echo "Expected one of these:"
@@ -15,5 +15,5 @@
 
 echo "${SERVICE} service will be tested"
 
-docker-compose build ${SERVICE}-server
-docker-compose run ${SERVICE}-server
+docker-compose build "${SERVICE}"-server
+docker-compose run "${SERVICE}"-server