diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index 4ecb8fcd709d575930be855c209db9107e438bdb..958d5e23ac65fab2e5a89d3542bf294d47808dde 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -1,6 +1,8 @@
 project( calamareslib )
 
+if( WITH_PARTITIONMANAGER )
 add_subdirectory( partitionmanager/calamares )
+endif()
 
 add_definitions( ${QT_DEFINITIONS} )
 add_definitions( -DQT_SHARED )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8ef83d6e937d8c827d82b33535ae9729e8d583b9..860c7f897b40f839da5d0ec2818cf81dbbf18f5f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,3 +1,5 @@
+if( WITH_PARTITIONMANAGER )
 add_executable(calapmtest calapmtest.cpp)
 add_definitions(-DCALAMARES)
 target_link_libraries(calapmtest calapm Qt5::Core)
+endif()