6 files changed, 10 insertions, 10 deletions
diff --git a/java/test/Freeze/complex/run.py b/java/test/Freeze/complex/run.py
index 5e0da40b743..92f59783fba 100755
--- a/java/test/Freeze/complex/run.py
+++ b/java/test/Freeze/complex/run.py
@@ -27,7 +27,7 @@ dbdir = os.path.join(os.getcwd(), "db")
 TestUtil.cleanDbDir(dbdir)
 
 print "starting populate...",
-populateProc = TestUtil.startClient("test.Freeze.complex.Client", " --dbdir %s populate" % os.getcwd(),
+populateProc = TestUtil.startClient("test.Freeze.complex.Client", " --dbdir '%s' populate" % os.getcwd(),
                                     startReader=False)
 print "ok"
 populateProc.startReader()
@@ -35,7 +35,7 @@ populateProc.startReader()
 populateProc.waitTestSuccess()
 
 print "starting verification client...",
-clientProc = TestUtil.startClient("test.Freeze.complex.Client", " --dbdir %s validate" % os.getcwd(), startReader=False)
+clientProc = TestUtil.startClient("test.Freeze.complex.Client", " --dbdir '%s' validate" % os.getcwd(), startReader=False)
 
 print "ok"
 clientProc.startReader()
diff --git a/java/test/Freeze/dbmap/run.py b/java/test/Freeze/dbmap/run.py
index 26e7650b684..76698abf205 100755
--- a/java/test/Freeze/dbmap/run.py
+++ b/java/test/Freeze/dbmap/run.py
@@ -24,7 +24,7 @@ dbdir = os.path.join(os.getcwd(), "db")
 TestUtil.cleanDbDir(dbdir)
 
 print "starting client...",
-clientProc = TestUtil.startClient("test.Freeze.dbmap.Client", os.getcwd(), startReader=False)
+clientProc = TestUtil.startClient("test.Freeze.dbmap.Client", "'" + os.getcwd() + "'", startReader=False)
 print "ok"
 clientProc.startReader()
 clientProc.waitTestSuccess()
diff --git a/java/test/Freeze/evictor/run.py b/java/test/Freeze/evictor/run.py
index 6534defd719..b739f85a150 100755
--- a/java/test/Freeze/evictor/run.py
+++ b/java/test/Freeze/evictor/run.py
@@ -23,7 +23,7 @@ from scripts import *
 dbdir = os.path.join(os.getcwd(), "db")
 TestUtil.cleanDbDir(dbdir)
 
-testOptions = " --Freeze.Warn.Deadlocks=0 --Freeze.DbEnv.db.DbHome=%s/db --Ice.Config=%s/config " % (os.getcwd(), os.getcwd())
+testOptions = " --Freeze.Warn.Deadlocks=0 --Freeze.DbEnv.db.DbHome='%s/db' --Ice.Config='%s/config' " % (os.getcwd(), os.getcwd())
 
 TestUtil.clientServerTest(testOptions, testOptions)
 
diff --git a/java/test/IceBox/configuration/run.py b/java/test/IceBox/configuration/run.py
index fb0b1fb0d7d..30f129410ed 100755
--- a/java/test/IceBox/configuration/run.py
+++ b/java/test/IceBox/configuration/run.py
@@ -20,8 +20,8 @@ if len(path) == 0:
 sys.path.append(os.path.join(path[0]))
 from scripts import *
 
-TestUtil.clientServerTest(additionalServerOptions="--Ice.Config=%s" % os.path.join(os.getcwd(), "config.icebox"),
+TestUtil.clientServerTest(additionalServerOptions='--Ice.Config="%s"' % os.path.join(os.getcwd(), "config.icebox"),
 	server=TestUtil.getIceBox())
-TestUtil.clientServerTest(additionalServerOptions="--Ice.Config=%s" % os.path.join(os.getcwd(), "config.icebox2"),
+TestUtil.clientServerTest(additionalServerOptions='--Ice.Config="%s"' % os.path.join(os.getcwd(), "config.icebox2"),
 	server=TestUtil.getIceBox())
 
diff --git a/java/test/IceSSL/configuration/run.py b/java/test/IceSSL/configuration/run.py
index 138300e7c3c..93cddb4a0c7 100755
--- a/java/test/IceSSL/configuration/run.py
+++ b/java/test/IceSSL/configuration/run.py
@@ -20,7 +20,7 @@ if len(path) == 0:
 sys.path.append(os.path.join(path[0]))
 from scripts import *
 
-testdir = os.getcwd()
+testdir = "'%s'" % os.getcwd()
 
 TestUtil.clientServerTest(additionalClientOptions=testdir)
 
diff --git a/java/test/Slice/generation/run.py b/java/test/Slice/generation/run.py
index 478486e6129..d2c39230f94 100755
--- a/java/test/Slice/generation/run.py
+++ b/java/test/Slice/generation/run.py
@@ -26,9 +26,9 @@ slice2java = os.path.join(TestUtil.getCppBinDir(), "slice2java")
 if not os.path.exists("classes"):
     os.mkdir("classes")
 
-command = slice2java + " --list-generated --output-dir classes File1.ice File2.ice"
-stdin, stdout, stderr = os.popen3(command)
-lines1 = stdout.readlines()
+command = '"' + slice2java + '" --list-generated --output-dir classes File1.ice File2.ice's
+p = TestUtil.runCommand(command)
+lines1 = p.stdout.readlines()
 lines2 = open(os.path.join(os.getcwd(), "list-generated.out"), "r").readlines()
 if len(lines1) != len(lines2):
     print "failed!"