diff --git a/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt b/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt
index c0f7d03a48..e284feb9be 100644
--- a/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt
+++ b/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt
@@ -1,42 +1,46 @@
 ########### mysqle ###############
 
 include_directories(${MYSQL_INCLUDE_DIR})
 
 set( amarok_storage-mysqlestorage_PART_SRCS
      ../mysql-shared/MySqlStorage.cpp
      MySqlEmbeddedStorage.cpp
      MySqlEmbeddedStorageFactory.cpp
 )
 
 add_library(amarok_storage-mysqlestorage MODULE ${amarok_storage-mysqlestorage_PART_SRCS})
 
 string(REPLACE "-Wl,--fatal-warnings" "" CMAKE_SHARED_LINKER_FLAGS_NOFATALWARN "${CMAKE_SHARED_LINKER_FLAGS}")
 set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS_NOFATALWARN} )
 
 string(REPLACE "-Wl,--fatal-warnings" "" CMAKE_MODULE_LINKER_FLAGS_NOFATALWARN "${CMAKE_MODULE_LINKER_FLAGS}")
 set(CMAKE_MODULE_LINKER_FLAGS ${CMAKE_MODULE_LINKER_FLAGS_NOFATALWARN} )
 
 target_link_libraries(amarok_storage-mysqlestorage
     # amarok-sqlstorage
     amarokcore
     amaroklib
     Qt5::Core
     Qt5::Gui
     ${MYSQL_EMBEDDED_LIBRARIES}
     ${CMAKE_DL_LIBS}
     ${ZLIB_LIBRARIES}
 )
 
+if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "FreeBSD")
+        target_link_libraries(amarok_storage-mysqlestorage ${MYSQL_LIBRARIES})
+endif()
+
 if(NOT WIN32 AND NOT APPLE)
     target_link_libraries( amarok_storage-mysqlestorage crypt pthread )
 endif()
 
 if(APPLE)
 	SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
 endif()
 
 install(TARGETS amarok_storage-mysqlestorage DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 
 install(FILES amarok_storage-mysqlestorage.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 
 kcoreaddons_desktop_to_json(amarok_storage-mysqlestorage amarok_storage-mysqlestorage.desktop SERVICE_TYPES ${CMAKE_SOURCE_DIR}/src/amarok-plugin.desktop)
diff --git a/tests/core-impl/collections/db/sql/CMakeLists.txt b/tests/core-impl/collections/db/sql/CMakeLists.txt
index 1d0b83b508..58485b3ecb 100644
--- a/tests/core-impl/collections/db/sql/CMakeLists.txt
+++ b/tests/core-impl/collections/db/sql/CMakeLists.txt
@@ -1,129 +1,129 @@
 
 # macro function to build a test target.
 macro(add_database_test test_target test_sources)
     set( test_sources_internal
         ${test_sources}
         ${AMAROK_SOURCE_TREE}/core-impl/storage/sql/mysql-shared/MySqlStorage.cpp
         ${AMAROK_SOURCE_TREE}/core-impl/storage/sql/mysqlestorage/MySqlEmbeddedStorage.cpp
     )
 
     add_executable( ${test_target} ${test_sources} ${test_sources_internal} )
     add_test(NAME ${test_target} COMMAND $<TARGET_FILE:${test_target}>)
     ecm_mark_as_test(${test_target})
 
     if(APPLE)
         set_target_properties(${test_target} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
     endif()
 
     target_link_libraries(${test_target}
         amarokshared
         amarokcore
         amaroklib
         amarok-sqlcollection
         KF5::KIOCore
         KF5::ThreadWeaver
         Qt5::Test
         Qt5::Core
         ${MYSQL_EMBEDDED_LIBRARIES}
         ${CMAKE_DL_LIBS}
         ${ZLIB_LIBRARIES}
         ${GOOGLEMOCK_LIBRARIES}
     )
     if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "FreeBSD")
-        target_link_libraries(${test_target} ${MYSQL_LIBRARIES})
+        target_link_libraries(${test_target} ${MYSQL_LIBRARIES} crypt)
     endif()
 endmacro(add_database_test)
 
 
 include_directories(
     ${AMAROK_TEST_TREE}
     ${AMAROK_SOURCE_TREE}
     ${AMAROK_SOURCE_TREE}/core-impl/collections/db/sql
     ${AMAROK_UTILITY_TREE}
     ${CMAKE_BINARY_DIR}/src
     ${CMAKE_BINARY_DIR}/tests
     ${AMAROK_COLLECTION_SUPPORT_DIR}
     ${MYSQL_INCLUDE_DIR}
 )
 
 #------------------------------- DatabaseUpdater Test -------------------------------
 
 set( databaseupdatertest_SRCS
         TestDatabaseUpdater.cpp
         ${GOOGLEMOCK_SRCS}
     )
 
 add_database_test( testsqldatabaseupdater "${databaseupdatertest_SRCS}" )
 
 #-------------------------------- Test SqlAlbum -----------------------
 
 set( testsqlalbum_SRCS
         TestSqlAlbum.cpp
         ${GOOGLEMOCK_SRCS}
     )
 
 add_database_test( testsqlalbum "${testsqlalbum_SRCS}" )
 
 #-------------------------------- Test SqlArtist -----------------------
 
 set( testsqlartist_SRCS
         TestSqlArtist.cpp
         ${GOOGLEMOCK_SRCS}
     )
 
 
 add_database_test( testsqlartist "${testsqlartist_SRCS}" )
 #-------------------------------- Test SqlCollection -----------------------
 
 set( testsqlcollection_SRCS
         TestSqlCollection.cpp
         ${GOOGLEMOCK_SRCS}
     )
 
 
 add_database_test( testsqlcollection "${testsqlcollection_SRCS}" )
 
 #-------------------------------- Test SqlQueryMaker -----------------------
 
 set( testsqlquerymaker_SRCS
         TestSqlQueryMaker.cpp
         ${GOOGLEMOCK_SRCS}
     )
 
 
 add_database_test( testsqlquerymaker "${testsqlquerymaker_SRCS}" )
 
 #-------------------------------- Test SqlScanManager -----------------------
 
 set( testsqlscanmanager_SRCS
         TestSqlScanManager.cpp
         ${GOOGLEMOCK_SRCS}
     )
 
 add_database_test( testsqlscanmanager "${testsqlscanmanager_SRCS}" )
 
 #-------------------------------- Test SqlTrack -----------------------
 
 set( testsqltrack_SRCS
         TestSqlTrack.cpp
         ${AMAROK_TEST_TREE}/MetaNotificationSpy.cpp
         ${GOOGLEMOCK_SRCS}
     )
 
 
 add_database_test( testsqltrack "${testsqltrack_SRCS}" )
 
 #-------------------------------- Test SqlCollectionLocation -----------------------
 
 set( testsqlcollectionlocation_SRCS
         TestSqlCollectionLocation.cpp
 	${AMAROK_SOURCE_TREE}/core/logger/Logger.cpp
         ${GOOGLEMOCK_SRCS}
     )
 
 add_database_test( testsqlcollectionlocation "${testsqlcollectionlocation_SRCS}" )
 
 if(NOT WIN32 AND NOT APPLE)
     target_link_libraries( testsqlcollectionlocation crypt pthread )
 endif()