diff --git a/CMakeLists.txt b/CMakeLists.txt
index a843ab894..35d21fa65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,10 +29,14 @@ configure_project(TESTS)
 add_subdirectory(libevmasm)
 add_subdirectory(libsolidity)
 add_subdirectory(solc)
+
 if (NOT EMSCRIPTEN)
 	add_subdirectory(liblll)
-	add_subdirectory(test)
 	add_subdirectory(lllc)
 endif()
 
+if (TESTS AND NOT EMSCRIPTEN)
+	add_subdirectory(test)
+endif()
+
 # TODO installation and packaging rules