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/lib/Rest/Version.cpp b/lib/Rest/Version.cpp
index 67cc315abe..8babc0d5ea 100644
--- a/lib/Rest/Version.cpp
+++ b/lib/Rest/Version.cpp
@@ -154,7 +154,7 @@ std::string Version::getV8Version() {
 std::string Version::getOpenSSLVersion() {
 #ifdef OPENSSL_VERSION_TEXT
   return std::string(OPENSSL_VERSION_TEXT);
-#elif ARANGODB_OPENSSL_VERSION
+#elif defined(ARANGODB_OPENSSL_VERSION)
   return std::string(ARANGODB_OPENSSL_VERSION);
 #else
   return std::string("");