diff --git a/python/h5/CMakeLists.txt b/python/h5/CMakeLists.txt
index 03fc2099..01f00283 100644
--- a/python/h5/CMakeLists.txt
+++ b/python/h5/CMakeLists.txt
@@ -10,9 +10,9 @@ foreach(file ${python_sources})
 endforeach()
 
 # Install python files to proper location
-set(PYTHON_LIB_DEST ${PYTHON_LIB_DEST_ROOT}/${PROJECT_NAME})
+set(PYTHON_LIB_DEST ${CPP2PY_PYTHON_LIB_DEST_ROOT}/${PROJECT_NAME})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version.py DESTINATION ${PYTHON_LIB_DEST})
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${PYTHON_LIB_DEST_ROOT} FILES_MATCHING PATTERN "*.py" PATTERN "*_desc.py" EXCLUDE)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CPP2PY_PYTHON_LIB_DEST_ROOT} FILES_MATCHING PATTERN "*.py" PATTERN "*_desc.py" EXCLUDE)
 
 # Build the h5py_io library
 add_library(h5py_io STATIC h5py_io.cpp)
diff --git a/test/python/CMakeLists.txt b/test/python/CMakeLists.txt
index 61e0e856..b333a2d9 100644
--- a/test/python/CMakeLists.txt
+++ b/test/python/CMakeLists.txt
@@ -15,6 +15,6 @@ target_include_directories(storable PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 foreach(test ${all_tests})
   get_filename_component(test_name ${test} NAME_WE)
   get_filename_component(test_dir ${test} DIRECTORY)
-  add_test(NAME Py_${test_name} COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${test_dir}/${test_name}.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
+  add_test(NAME Py_${test_name} COMMAND ${CPP2PY_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${test_dir}/${test_name}.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
   set_property(TEST Py_${test_name} APPEND PROPERTY ENVIRONMENT PYTHONPATH=${PROJECT_BINARY_DIR}/python:${h5_BINARY_DIR}/python:${CMAKE_CURRENT_BINARY_DIR}:$ENV{PYTHONPATH} ${SANITIZER_RT_PRELOAD})
 endforeach()