diff --git a/src/test/java/org/springframework/data/gemfire/ForkUtil.java b/src/test/java/org/springframework/data/gemfire/ForkUtil.java
index 710dc14b..90784526 100644
--- a/src/test/java/org/springframework/data/gemfire/ForkUtil.java
+++ b/src/test/java/org/springframework/data/gemfire/ForkUtil.java
@@ -35,8 +35,9 @@ public class ForkUtil {
 		String home = System.getProperty("java.home");
 
 		Process proc = null;
-		String java = home + "\\bin\\java ";
-		String argCp = "-cp " + cp;
+		String sp = System.getProperty("file.separator");
+		String java = home + sp + "bin" + sp + "java";
+		String argCp = " -cp " + cp;
 		String argClass = argument;
 
 		String cmd = java + argCp + " " + argClass;
@@ -48,7 +49,7 @@ public class ForkUtil {
 			throw new IllegalStateException("Cannot start command " + cmd, ioe);
 		}
 
-		System.out.println("Started fork");
+		System.out.println("Started fork from command\n" + cmd);
 		final Process p = proc;
 
 		final BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
@@ -96,7 +97,7 @@ public class ForkUtil {
 	public static OutputStream cacheServer() {
 		OutputStream os = cloneJVM("org.springframework.data.gemfire.fork.CacheServerProcess");
 		try {
-			Thread.sleep(3000);
+			Thread.sleep(3500);
 		} catch (InterruptedException ex) {
 			// ignore and move on
 		}
diff --git a/src/test/java/org/springframework/data/gemfire/listener/ListenerContainerTests.java b/src/test/java/org/springframework/data/gemfire/listener/ListenerContainerTests.java
index 1419b6b4..c296f83a 100644
--- a/src/test/java/org/springframework/data/gemfire/listener/ListenerContainerTests.java
+++ b/src/test/java/org/springframework/data/gemfire/listener/ListenerContainerTests.java
@@ -99,7 +99,7 @@ public class ListenerContainerTests {
 
 	@Before
 	public void setUp() throws Exception {
-		String query = "SELECT * from /test";
+		String query = "SELECT * from /test-cq";
 
 		container = new QueryListenerContainer();
 		container.setQueryService(pool.getQueryService());