diff --git a/build.gradle b/build.gradle
index f6935439..02afddfd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,6 +38,8 @@ if (project.hasProperty('platformVersion')) {
 
 [compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:-serial", "-Xlint:unchecked", "-Xlint:rawtypes"]
 
+[compileJava, compileTestJava]*.options*.encoding = "UTF-8"
+
 dependencies {
     compile "org.springframework:spring-core:$springVersion"
     compile "org.springframework:spring-context-support:$springVersion"
@@ -62,6 +64,7 @@ javadoc {
   ext.tmpDir = file("${buildDir}/api-work")
   
   configure(options) {
+      encoding  = "UTF-8"
       stylesheetFile = file("${srcDir}/spring-javadoc.css")
       overview = "${srcDir}/overview.html"
       docFilesSubDirs = true
diff --git a/src/test/java/org/springframework/shell/table/AbstractTestWithSample.java b/src/test/java/org/springframework/shell/table/AbstractTestWithSample.java
index 1806f570..ba9e85a6 100644
--- a/src/test/java/org/springframework/shell/table/AbstractTestWithSample.java
+++ b/src/test/java/org/springframework/shell/table/AbstractTestWithSample.java
@@ -42,7 +42,7 @@ public class AbstractTestWithSample {
 				this.getClass().getSimpleName(), testName.getMethodName());
 		InputStream stream = TableTest.class.getResourceAsStream(sampleName);
 		Assert.notNull(stream, "Can't find expected rendering result at " + sampleName);
-		return FileCopyUtils.copyToString(new InputStreamReader(stream)).replace("&", "");
+		return FileCopyUtils.copyToString(new InputStreamReader(stream, "UTF-8")).replace("&", "");
 	}
 
 	/**