diff --git a/src/findlib/unittests/CMakeLists.txt b/src/findlib/unittests/CMakeLists.txt
index ff6e409d530..55a15bc8295 100644
--- a/src/findlib/unittests/CMakeLists.txt
+++ b/src/findlib/unittests/CMakeLists.txt
@@ -25,16 +25,19 @@ set (TEST_SRC
    test_findlib.cc
    )
 
-
 add_executable(test_findlib
     ${TEST_SRC}
     )
 target_link_libraries(test_findlib
-   bareos bareosfind
+   bareosfind bareos
    ${JANSSON_LIBRARIES}
    ${CMOCKA_LIBRARIES}
    )
 
 add_test(NAME test_findlib
-   COMMAND test_findlib)
+   COMMAND "test_findlib"
+   )
+set_property(TEST test_findlib
+   PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/src/lib:${CMAKE_BINARY_DIR}/src/findlib")
+
 add_dependencies(check test_findlib)
diff --git a/src/lib/unittests/CMakeLists.txt b/src/lib/unittests/CMakeLists.txt
index 31b3111d6fe..a3ce9c367fc 100644
--- a/src/lib/unittests/CMakeLists.txt
+++ b/src/lib/unittests/CMakeLists.txt
@@ -49,5 +49,9 @@ target_link_libraries(test_lib
    )
 
 add_test(NAME test_lib
-   COMMAND test_lib)
+   COMMAND test_lib
+   )
+set_property(TEST test_lib
+   PROPERTY ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/src/lib")
+
 add_dependencies(check test_lib)