diff --git a/master.cfg b/master.cfg
index 980b49a..fe30470 100644
--- a/master.cfg
+++ b/master.cfg
@@ -1213,7 +1213,7 @@ class RunTestGDBNativeExtendedGDBServer_c32t32 (BuildAndTestGDBFactory):
 class RunTestGDBIndexBuild (BuildAndTestGDBFactory):
     """Testing with the "cc-with-tweaks.sh" passing -i."""
     def __init__ (self, **kwargs):
-        self.test_env = { "RUNTESTFLAGS" : util.Interpolate ('CC_FOR_TARGET="/bin/sh %(prop:builddir)s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i gcc" CXX_FOR_TARGET="/bin/sh %(prop:builddir)s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i g++"') }
+        self.test_env = { "RUNTESTFLAGS" : util.Interpolate ("'CC_FOR_TARGET=/bin/sh %(prop:builddir)s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i gcc' 'CXX_FOR_TARGET=/bin/sh %(prop:builddir)s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i g++'") }
         BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 class RunTestGDBIndexBuild_c32t32 (BuildAndTestGDBFactory):
@@ -1221,7 +1221,7 @@ class RunTestGDBIndexBuild_c32t32 (BuildAndTestGDBFactory):
     def __init__ (self, **kwargs):
         self.extra_CFLAGS = [ '-m32' ]
         self.extra_CXXFLAGS = self.extra_CFLAGS
-        self.test_env = { "RUNTESTFLAGS" : util.Interpolate ('CC_FOR_TARGET="/bin/sh %(prop:builddir)s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i gcc" CXX_FOR_TARGET="/bin/sh %(prop:builddir)s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i g++"') }
+        self.test_env = { "RUNTESTFLAGS" : util.Interpolate ("'CC_FOR_TARGET=/bin/sh %(prop:builddir)s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i gcc' 'CXX_FOR_TARGET=/bin/sh %(prop:builddir)s/binutils-gdb/gdb/contrib/cc-with-tweaks.sh -i g++'") }
         BuildAndTestGDBFactory.__init__ (self, **kwargs)
 
 # Class for only building GDB, without testing