diff --git a/tools/genenv b/tools/genenv
index 7161d2d1d0898aa426c95b0b9bf9844e21261127..0bfc1099203868edfcc186e7922c67713b8e213a 100644
--- a/tools/genenv
+++ b/tools/genenv
@@ -54,7 +54,7 @@ DATADIR=/var/lib/mysql
 DEFAULT_STORAGE_ENGINE=innodb
 HOST_IP=$MY_IP
 INIT_CINDER_DB=true
-INIT_CONNECT=SET NAMES utf8
+INIT_CONNECT="SET NAMES utf8"
 INIT_DESIGNATE_DB=true
 INIT_GLANCE_DB=true
 INIT_HEAT_DB=true
@@ -272,7 +272,7 @@ ENDPOINT_TYPE=adminURL
 KEYSTONE_REGION=RegionOne
 NEUTRON_FLAT_NETWORK_INTERFACE=eth1
 NEUTRON_FLAT_NETWORK_NAME=physnet1
-ROOT_HELPER=sudo neutron-rootwrap /etc/neutron/rootwrap.conf
+ROOT_HELPER="sudo neutron-rootwrap /etc/neutron/rootwrap.conf"
 USE_NAMESPACES=true
 
 # Networking Options are nova or neutron