diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8e0722..1fad3ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ if(HUNTER_ENABLED) # Use Hunter to manage dependencies
     target_link_libraries(inja INTERFACE nlohmann_json)
 else()
     target_include_directories(inja INTERFACE
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/test/thirdparty/json>
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/test/thirdparty>
         $<INSTALL_INTERFACE:${INJA_HEADER_INSTALL_DIR}>
     )
 endif()
diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
index 53a0679..b091192 100644
--- a/cmake/Config.cmake.in
+++ b/cmake/Config.cmake.in
@@ -1,4 +1,7 @@
 @PACKAGE_INIT@
 
+include(CMakeFindDependencyMacro)
+find_dependency(nlohmann_json CONFIG REQUIRED)
+
 include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
 check_required_components("@PROJECT_NAME@")
\ No newline at end of file
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3fd6afc..9f18bbf 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -38,14 +38,18 @@ if(HUNTER_ENABLED) # Use Hunter to manage dependencies
     # Add dependencies to target
     target_link_libraries(${UNITTEST_TARGET_NAME} Catch::Catch)
     target_link_libraries(${UNITTEST_TARGET_NAME} nlohmann_json)
+    target_link_libraries(${UNITTEST_TARGET_NAME} inja)
 else() # Manage dependencies manually
     # Prepare "Catch" library for other executables
-    set(CATCH_INCLUDE_DIR "thirdparty/catch")
     add_library(Catch INTERFACE)
-    target_include_directories(Catch INTERFACE ${CATCH_INCLUDE_DIR})
+    target_include_directories(Catch INTERFACE "thirdparty/catch")
+    # Prepare "JSON" library for other executables
+    add_library(JSON INTERFACE)
+    target_include_directories(JSON INTERFACE "thirdparty")
     # Add dependencies to target
     target_link_libraries(${UNITTEST_TARGET_NAME} Catch)
-    target_include_directories(${UNITTEST_TARGET_NAME} PRIVATE "../src" "thirdparty/json")
+    target_link_libraries(${UNITTEST_TARGET_NAME} JSON)
+    target_link_libraries(${UNITTEST_TARGET_NAME} inja)
 endif()
 
 ##