diff --git a/Makefile b/Makefile
index 1c6151daa..ff12fb650 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 .PHONY: all clean test-unit eclipse
 
+export JAVA_TOOL_OPTIONS:='-Dfile.encoding=iso-8859-1'
+
 all: build-smack
 
 # Can not use 'build' as target name, because there is a
@@ -10,9 +12,12 @@ build-smack:
 clean:
 	cd build && ant clean
 
-test-unit:
+unit-test:
 	cd build && ant test-unit
 
+integration-test:
+	cd build && ant test
+
 eclipse: .settings .classpath .project
 
 .settings: