diff --git a/lib/nodes/CMakeLists.txt b/lib/nodes/CMakeLists.txt
index 5feea97db..123523853 100644
--- a/lib/nodes/CMakeLists.txt
+++ b/lib/nodes/CMakeLists.txt
@@ -59,7 +59,7 @@ endif()
 if(LIBIEC61850_FOUND)
     list(APPEND NODE_SRC iec61850_sv.c iec61850.c)
     list(APPEND INCLUDE_DIRS ${LIBIEC61850_INCLUDE_DIRS})
-    list(APPEND LIBRARIES ${LIBIEC61850_LIBRARIES} PkgConfig::LIBIEC61850)
+    list(APPEND LIBRARIES PkgConfig::LIBIEC61850)
 endif()
 
 # Enable OPAL-RT Asynchronous Process support (will result in 32bit binary!!!)
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 4f420827a..4ca244170 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -47,7 +47,7 @@ if(CRITERION_FOUND)
 
 	add_executable(unit-tests ${TEST_SRC})
 	target_link_libraries(unit-tests PUBLIC
-		${CRITERION_LIBRARIES}
+		PkgConfig::CRITERION
 		villas
 		Threads::Threads
 	)