diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt
index ce6a5c40..538680b9 100644
--- a/test_package/CMakeLists.txt
+++ b/test_package/CMakeLists.txt
@@ -23,20 +23,11 @@
 cmake_minimum_required(VERSION 3.12)
 project(test_package)
 
-# set path to custom cmake modules
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
-
-# compilation options and flags used in a project development process
-include(common/scripts)
-
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup(TARGETS)
-
-# test conan-generated target
-add_executable(${PROJECT_NAME}_conan test_package.cpp)
-target_link_libraries(${PROJECT_NAME}_conan PRIVATE CONAN_PKG::mp-units)
+# enable package discovery based on the local configuration files
+list(PREPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR})
 
 # test cmake-generated target
 find_package(mp-units CONFIG REQUIRED)
-add_executable(${PROJECT_NAME}_cmake test_package.cpp)
-target_link_libraries(${PROJECT_NAME}_cmake PRIVATE mp-units::mp-units)
+add_executable(test_package test_package.cpp)
+target_link_libraries(test_package PRIVATE mp-units::mp-units)
+target_compile_features(test_package PRIVATE cxx_std_20)
diff --git a/test_package/conanfile.py b/test_package/conanfile.py
index 944dc08a..2fd170d7 100644
--- a/test_package/conanfile.py
+++ b/test_package/conanfile.py
@@ -21,11 +21,10 @@
 # SOFTWARE.
 
 from conans import ConanFile, CMake, tools, RunEnvironment
-import os
 
 class TestPackageConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
-    generators = "cmake", "cmake_find_package"
+    generators = "cmake_find_package_multi"
     
     def build(self):
         cmake = CMake(self)
@@ -34,5 +33,4 @@ class TestPackageConan(ConanFile):
 
     def test(self):
         if not tools.cross_building(self.settings):
-            self.run(os.path.join("bin", "test_package_conan"), run_environment=True)
-            self.run(os.path.join("bin", "test_package_cmake"), run_environment=True)
+            self.run("test_package", run_environment=True)