diff --git a/src/main/java/de/rosstauscher/comparandum/report/html/HtmlReportGenerator.java b/src/main/java/de/rosstauscher/comparandum/report/html/HtmlReportGenerator.java
index afa7262..fe3c4d9 100644
--- a/src/main/java/de/rosstauscher/comparandum/report/html/HtmlReportGenerator.java
+++ b/src/main/java/de/rosstauscher/comparandum/report/html/HtmlReportGenerator.java
@@ -3,6 +3,7 @@
 import java.awt.Dimension;
 import java.io.File;
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.text.DateFormat;
 import java.util.Date;
 
@@ -53,12 +54,12 @@ protected void generateTestReportPage() throws IOException {
 		htmlPageTemplate = htmlPageTemplate.replace("${TEST_STATUS}", this.testStatus.toString());
 
 		Dimension actualSize = this.renderable.getDimension();
-		htmlPageTemplate = htmlPageTemplate.replace("${ACTUAL_IMG}", this.actualImageName);
+		htmlPageTemplate = htmlPageTemplate.replace("${ACTUAL_IMG}", URLEncoder.encode(this.actualImageName, "UTF-8"));
 		htmlPageTemplate = htmlPageTemplate.replace("${ACTUAL_WIDTH}", Integer.toString(actualSize.width));
 		htmlPageTemplate = htmlPageTemplate.replace("${ACTUAL_HEIGHT}", Integer.toString(actualSize.height));
 
 		Dimension expectedSize = this.testConfig.getComparatum().getDimension();
-		htmlPageTemplate = htmlPageTemplate.replace("${EXPECTED_IMG}", this.expectedImageName);
+		htmlPageTemplate = htmlPageTemplate.replace("${EXPECTED_IMG}",  URLEncoder.encode(this.expectedImageName, "UTF-8"));
 		htmlPageTemplate = htmlPageTemplate.replace("${EXPECTED_WIDTH}", Integer.toString(expectedSize.width));
 		htmlPageTemplate = htmlPageTemplate.replace("${EXPECTED_HEIGHT}", Integer.toString(expectedSize.height));
 		
diff --git a/src/main/java/de/rosstauscher/comparandum/report/html/IndexGenerator.java b/src/main/java/de/rosstauscher/comparandum/report/html/IndexGenerator.java
index 1d85028..bb7dcb7 100644
--- a/src/main/java/de/rosstauscher/comparandum/report/html/IndexGenerator.java
+++ b/src/main/java/de/rosstauscher/comparandum/report/html/IndexGenerator.java
@@ -6,6 +6,7 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
+import java.net.URLEncoder;
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.Map;
@@ -241,7 +242,7 @@ private void writeTestResults(TestResultNode node, int parentIndex) throws IOExc
 			int total = node.getFailed() + node.getPassed();
 			testStatus += "<span class=\"TOTAL\">"+total+"</span>)";
 		} else {
-			content = content.replace("${FILE}", node.getFileName());
+			content = content.replace("${FILE}", URLEncoder.encode(node.getFileName(), "UTF-8"));
 		}
 		
 		content = content.replace("${TEST_STATUS}", testStatus);