diff --git a/plugins/org.eclipse.ease.lang.unittest/src/org/eclipse/ease/lang/unittest/reporters/JUnitReportGenerator.java b/plugins/org.eclipse.ease.lang.unittest/src/org/eclipse/ease/lang/unittest/reporters/JUnitReportGenerator.java
index 98f89ca..bf0abe6 100644
--- a/plugins/org.eclipse.ease.lang.unittest/src/org/eclipse/ease/lang/unittest/reporters/JUnitReportGenerator.java
+++ b/plugins/org.eclipse.ease.lang.unittest/src/org/eclipse/ease/lang/unittest/reporters/JUnitReportGenerator.java
@@ -59,9 +59,9 @@
 	private static String getClassName(ITestEntity testEntity) {
 		if ((testEntity.getParent() != null) && (testEntity.getParent().getParent() != null))
 			// we do want to skip the first level as the root object is a virtual element used in the viewer only.
-			return getClassName(testEntity.getParent()) + "/" + testEntity.getName().replaceAll("\\s", "_");
+			return getClassName(testEntity.getParent()) + "." + testEntity.getName().replaceAll("\\s", "_").replaceAll("\\.", "_");
 
-		return testEntity.getName();
+		return testEntity.getName().replaceAll("\\s", "_").replaceAll("\\.", "_");
 	}
 
 	@Override