diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d05a4cdb55..bcd5c525788 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -290,10 +290,10 @@ option(CLANG_INCLUDE_TESTS
        "Generate build targets for the Clang unit tests."
        ${LLVM_INCLUDE_TESTS})
 
-# TODO: docs.
-add_subdirectory(test)
-
 if( CLANG_INCLUDE_TESTS )
+  # TODO: docs.
+  add_subdirectory(test) # XXX Emscripten: Backport fix from upstream LLVM 3.4 to actually skip tests if CLANG_INCLUDE_TESTS = OFF
+
   add_subdirectory(unittests)
 endif()
 
diff --git a/emscripten-version.txt b/emscripten-version.txt
index db39b14cd04..f488f67e2a2 100644
--- a/emscripten-version.txt
+++ b/emscripten-version.txt
@@ -1,2 +1,2 @@
-1.15.1
+1.16.0