diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d11b273c7..862452644a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -747,14 +747,18 @@ if (USE_BOOST_UNITTESTS)
 endif()
 add_subdirectory(Documentation)
 
-add_dependencies(arangob zlibstatic v8_build)
-add_dependencies(arangod ev zlibstatic v8_build)
-add_dependencies(arangodump zlibstatic v8_build)
-add_dependencies(arangoimp zlibstatic v8_build)
-add_dependencies(arangorestore zlibstatic v8_build)
-add_dependencies(arangosh zlibstatic v8_build)
-#if (USE_MAINTAINER_MODE)
-#  add_dependencies(basics_suite v8_build)
-#  add_dependencies(geo_suite v8_build)
-#endif()
+add_dependencies(arangob       zlibstatic)
+add_dependencies(arangod       ev zlibstatic)
+add_dependencies(arangodump    zlibstatic)
+add_dependencies(arangoimp     zlibstatic)
+add_dependencies(arangorestore zlibstatic)
+add_dependencies(arangosh      zlibstatic)
 
+if (NOT USE_PRECOMPILED_V8)
+  add_dependencies(arangob       v8_build)
+  add_dependencies(arangod       v8_build)
+  add_dependencies(arangodump    v8_build)
+  add_dependencies(arangoimp     v8_build)
+  add_dependencies(arangorestore v8_build)
+  add_dependencies(arangosh      v8_build)
+endif ()
diff --git a/UnitTests/CMakeLists.txt b/UnitTests/CMakeLists.txt
index 93cf450cf7..5332bc7e26 100644
--- a/UnitTests/CMakeLists.txt
+++ b/UnitTests/CMakeLists.txt
@@ -48,8 +48,6 @@ target_link_libraries(${TEST_BASICS_SUITE}
 
 if (NOT USE_PRECOMPILED_V8)
   add_dependencies(basics_suite v8_build)
-else ()
-  add_dependencies(basics_suite)
 endif ()
 
 ################################################################################
@@ -71,6 +69,4 @@ target_link_libraries(${TEST_GEO_SUITE}
 
 if (NOT USE_PRECOMPILED_V8)
   add_dependencies(geo_suite v8_build)
-else ()
-  add_dependencies(geo_suite)
 endif ()