diff --git a/cmake/common b/cmake/common
index 6a92dc3f..1c11b6ed 160000
--- a/cmake/common
+++ b/cmake/common
@@ -1 +1 @@
-Subproject commit 6a92dc3f21176d38cc7550d188c2be40c3190885
+Subproject commit 1c11b6ed26a028354ff1cf049e937ce65538fc05
diff --git a/conanfile.py b/conanfile.py
index b78c0480..686a9dd8 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -67,7 +67,7 @@ class UnitsConan(ConanFile):
             cmake.configure()
         else:
             # consumer's mode (library sources only)
-            cmake.configure(source_folder=folder, build_folder=folder)
+            cmake.configure(source_folder=folder)
         return cmake
 
     def configure(self):
@@ -95,7 +95,7 @@ class UnitsConan(ConanFile):
         cmake = self._configure_cmake()
         cmake.build()
         if self._run_tests:
-            cmake.test()
+            cmake.test(output_on_failure=True)
 
     def package(self):
         self.copy(pattern="LICENSE.md", dst="licenses")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3615cf8d..c44fddf3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -33,6 +33,9 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
 # include common tools and workarounds
 include(common/cmake/scripts)
 
+# use Conan configuration if available
+conan_init(cmake)
+
 # library definition
 add_library(units INTERFACE)
 #target_sources(units INTERFACE