diff --git a/.travis.yml b/.travis.yml
index 0e2087e35..a54970dd9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,7 +50,9 @@ before_install:
     # ^ odd linking problems related with brew which is not creating links
   - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$Tr_Xcode_Version" = "6.4" ]; then brew install Caskroom/cask/xquartz; fi
   - if [ "$Tr_Compiler_Version" != "" ] && [ "$Tr_Compiler_Version" != "default" ] && [ "$CC" = "gcc" ]; then export CXX="g++-${Tr_Compiler_Version}" CC="gcc-${Tr_Compiler_Version}"; fi
-  - if [ "$Tr_Compiler_Version" != "" ] && [ "$Tr_Compiler_Version" != "default" ] && [ "$CC" == "clang" ]; then export CXX="clang++-${Tr_Compiler_Version}" CC="clang-${Tr_Compiler_Version}"; fi
+  - if [ "$Tr_Compiler_Version" != "" ] && [ "$Tr_Compiler_Version" != "default" ] && [ "$CC" == "clang" ]; then
+      export CXX="clang++-${Tr_Compiler_Version}" CC="clang-${Tr_Compiler_Version}";
+    fi
   - $CC --version
   - $CXX --version
   - cmake --version
@@ -60,7 +62,7 @@ script:
   - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" = "" ]; then
         mkdir build;
         cd build;
-        cmake ..  -DCMAKE_INSTALL_PREFIX=$PWD/local -DBUILD_MODEL_VIEWER=ON -DBUILD_MAP_EDITOR=ON -DBUILD_IMPORT_EXPORT_TOOLS=ON -DBUILD_ZETAGLEST_TESTS=ON;
+        cmake ..  -DCMAKE_INSTALL_PREFIX=$PWD/local -DBUILD_MODEL_VIEWER=ON -DBUILD_MAP_EDITOR=ON -DBUILD_MODEL_IMPORT_EXPORT_TOOLS=ON -DBUILD_ZETAGLEST_TESTS=ON;
         make && make install;
     fi
   - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$(echo "$CC" | grep 'clang')" != "" ]; then
@@ -72,11 +74,8 @@ script:
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then
         mkdir build;
         cd build;
-        cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/local -DBUILD_MODEL_VIEWER=ON -DBUILD_MAP_EDITOR=ON -DBUILD_IMPORT_EXPORT_TOOLS=ON;
+        cmake .. -DCMAKE_INSTALL_PREFIX=$PWD/local -DBUILD_MODEL_VIEWER=ON -DBUILD_MAP_EDITOR=ON -DBUILD_MODEL_IMPORT_EXPORT_TOOLS=ON -DBUILD_ZETAGLEST_TESTS=ON;
         make && make install;
-        echo 'Mini test:';
-        echo '>>> zetaglest --version';
-        ./zetaglest --version | head -3;
         echo 'Dependencies:';
         otool -L zetaglest;
     fi
diff --git a/BUILD.md b/BUILD.md
index aa4679441..2958c3f2d 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -72,7 +72,7 @@ To edit maps:
 
 Use model import export tools:
 
-    BUILD_IMPORT_EXPORT_TOOLS=ON (off by default)
+    BUILD_MODEL_IMPORT_EXPORT_TOOLS=ON (off by default)
 
 The **wxWidgets (libwxgtk3.0-dev on some systems)** and **libxml2-dev*
 dependencies (mentioned below) is only required if you enable those
diff --git a/source/tests/CMakeLists.txt b/source/tests/CMakeLists.txt
index d960d7037..143f2bb10 100644
--- a/source/tests/CMakeLists.txt
+++ b/source/tests/CMakeLists.txt
@@ -7,6 +7,11 @@ SET(TARGET_NAME "zetaglest_tests")
 IF(BUILD_ZETAGLEST_TESTS)
 	MESSAGE(STATUS "Build ${TARGET_NAME} = YES")
 
+# The tests fail on Travis with clang on osx because of the use of "bind"
+	if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
+	endif()
+
 	INCLUDE (CheckIncludeFiles)
 
 	FIND_PACKAGE(CppUnit REQUIRED)