diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37125b1b..f9ffe517 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,9 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
 
 set(projectPrefix UNITS_)
 
+option(${projectPrefix}BUILD_LA "Build code depending on the linear algebra library" ON)
+message(STATUS "${projectPrefix}BUILD_LA: ${${projectPrefix}BUILD_LA}")
+
 # make sure that the file is being used as an entry point
 include(modern_project_structure)
 ensure_entry_point()
diff --git a/conanfile.py b/conanfile.py
index 7abe41a2..84afb488 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -80,7 +80,7 @@ class MPUnitsConan(ConanFile):
 
     @property
     def _skip_la(self):
-        return bool(self.conf.get("user.build:skip_la", default=False))
+        return bool(self.conf.get("user.build:skip_la", default=True))
 
     @property
     def _skip_docs(self):
diff --git a/test/unit_test/runtime/CMakeLists.txt b/test/unit_test/runtime/CMakeLists.txt
index ee86ef23..d460233c 100644
--- a/test/unit_test/runtime/CMakeLists.txt
+++ b/test/unit_test/runtime/CMakeLists.txt
@@ -23,12 +23,9 @@
 cmake_minimum_required(VERSION 3.2)
 
 find_package(Catch2 3 CONFIG REQUIRED)
-find_package(wg21_linear_algebra CONFIG REQUIRED)
 
-add_executable(unit_tests_runtime distribution_test.cpp fmt_test.cpp linear_algebra_test.cpp math_test.cpp)
-target_link_libraries(
-    unit_tests_runtime PRIVATE mp-units::mp-units Catch2::Catch2WithMain wg21_linear_algebra::wg21_linear_algebra
-)
+add_executable(unit_tests_runtime distribution_test.cpp fmt_test.cpp math_test.cpp)
+target_link_libraries(unit_tests_runtime PRIVATE mp-units::mp-units Catch2::Catch2WithMain)
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     target_compile_options(