diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt
index f2ee1d8aee..e7a00e285e 100644
--- a/arangod/CMakeLists.txt
+++ b/arangod/CMakeLists.txt
@@ -626,6 +626,7 @@ target_link_libraries(arangoserver
   fuerte
   boost_boost
   boost_system
+  snappy
   ${SYSTEM_LIBRARIES}
 )
 
diff --git a/arangosh/CMakeLists.txt b/arangosh/CMakeLists.txt
index 78f4978eae..92fe6af023 100644
--- a/arangosh/CMakeLists.txt
+++ b/arangosh/CMakeLists.txt
@@ -192,7 +192,7 @@ if (MSVC AND NOT(SKIP_PACKAGING))
   )
 endif ()
 
-add_executable(${BIN_ARANGOIMPORT}
+add_executable(arangoimport
   ${ProductVersionFiles_arangoimport}
   Import/AutoTuneThread.cpp
   Import/ImportFeature.cpp
@@ -214,7 +214,7 @@ target_link_libraries(${BIN_ARANGOIMPORT}
 )
 
 install(
-  TARGETS ${BIN_ARANGOIMPORT}
+  TARGETS arangoimport
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 install_config(arangoimport)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7183ab866c..e9c2e1c3d3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -219,6 +219,7 @@ target_link_libraries(arangodbtests
   rocksdb
   fuerte
   gtest
+  snappy
 )
 
 target_include_directories(arangodbtests PRIVATE