diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f685ae9ed..446128d6af 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -569,5 +569,8 @@ add_dependencies(arangodump zlibstatic v8_build)
 add_dependencies(arangoimp zlibstatic v8_build)
 add_dependencies(arangorestore zlibstatic v8_build)
 add_dependencies(arangosh zlibstatic v8_build)
-add_dependencies(basics_suite v8_build)
-add_dependencies(geo_suite v8_build)
+
+if (USE_BOOST_UNITTESTS)
+  add_dependencies(basics_suite v8_build)
+  add_dependencies(geo_suite v8_build)
+endif ()
diff --git a/etc/relative/arangod.conf b/etc/relative/arangod.conf
index 70bbfee7fd..0fb08d09aa 100644
--- a/etc/relative/arangod.conf
+++ b/etc/relative/arangod.conf
@@ -5,7 +5,7 @@
 [server]
 disable-authentication = true
 endpoint = tcp://0.0.0.0:8529
-threads = 4
+threads = 8
 # reuse-address = false
 
 [scheduler]