diff --git a/Foundation/testsuite/Makefile-Driver b/Foundation/testsuite/Makefile-Driver
index 1a2b3c64c..264fe2c15 100644
--- a/Foundation/testsuite/Makefile-Driver
+++ b/Foundation/testsuite/Makefile-Driver
@@ -47,5 +47,5 @@ target_libs    = PocoFoundation CppUnit
 include $(POCO_BASE)/build/rules/exec
 
 ifdef POCO_UNBUNDLED
-        SYSLIBS += -lz -lpcre
+        SYSLIBS += -lz -lpcre2-8 -lutf8proc
 endif
diff --git a/cmake/FindUtf8Proc.cmake b/cmake/FindUtf8Proc.cmake
index 8e0d1af1d..695903185 100644
--- a/cmake/FindUtf8Proc.cmake
+++ b/cmake/FindUtf8Proc.cmake
@@ -57,4 +57,12 @@ if(Utf8Proc_FOUND)
   set( UTF8PROC_INCLUDE_DIRS ${UTF8PROC_INCLUDE_DIR} )
 endif()
 
+if(Utf8Proc_FOUND AND NOT TARGET Utf8Proc::Utf8Proc)
+  add_library(Utf8Proc::Utf8Proc UNKNOWN IMPORTED)
+  set_target_properties(Utf8Proc::Utf8Proc PROPERTIES
+	  IMPORTED_LOCATION "${UTF8PROC_LIBRARY}"
+	  INTERFACE_INCLUDE_DIRECTORIES "${UTF8PROC_INCLUDE_DIR}"
+  )
+endif()
+
 mark_as_advanced(UTF8PROC_INCLUDE_DIR UTF8PROC_LIBRARY)