diff --git a/src/org/phpsrc/eclipse/pti/tools/phpunit/core/PHPUnit.java b/src/org/phpsrc/eclipse/pti/tools/phpunit/core/PHPUnit.java
index 50d6f32..b29b157 100644
--- a/src/org/phpsrc/eclipse/pti/tools/phpunit/core/PHPUnit.java
+++ b/src/org/phpsrc/eclipse/pti/tools/phpunit/core/PHPUnit.java
@@ -165,11 +165,11 @@ private void createSkeleton(String className, IFile classFile,
 					oldClass.getElementName());
 		}
 
-		String cmdLineArgs = "--" + skeletonOption + " " + className;
+		String cmdLineArgs = "--" + skeletonOption + " '" + className + "'";
 		cmdLineArgs += " "
 				+ OperatingSystem.escapeShellFileArg(classFile.getLocation()
 						.toOSString());
-		cmdLineArgs += " " + targetClassName;
+		cmdLineArgs += " '" + targetClassName + "'";
 		cmdLineArgs += " "
 				+ OperatingSystem.escapeShellFileArg(testClassLocation);