diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e97429fbfd37f49281bfa339950cf6caddb1872..03bf66d8872f4f10624baf4ae5f3358e744afd2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,6 @@ SET(DOXYGEN_USE_MATHJAX YES)
 # JRL-cmakemodule setup
 INCLUDE(cmake/base.cmake)
 INCLUDE(cmake/boost.cmake)
-INCLUDE(cmake/python.cmake)
 
 # Project definition
 COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
@@ -28,11 +27,8 @@ PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
 CHECK_MINIMAL_CXX_STANDARD(14 ENFORCE)
 
 # Project dependencies
-FINDPYTHON()
-
 ADD_PROJECT_DEPENDENCY(dynamic-graph 4.4.0 REQUIRED)
-ADD_PROJECT_DEPENDENCY(eigenpy REQUIRED)
-SEARCH_FOR_BOOST_PYTHON(REQUIRED)
+ADD_PROJECT_DEPENDENCY(eigenpy 2.7.10 REQUIRED)
 IF(BUILD_TESTING)
   FIND_PACKAGE(Boost REQUIRED COMPONENTS unit_test_framework)
 ENDIF(BUILD_TESTING)
@@ -65,10 +61,8 @@ SET(${PROJECT_NAME}_SOURCES
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED
   ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
-TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} SYSTEM PUBLIC ${PYTHON_INCLUDE_DIR})
 TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
-TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC ${PYTHON_LIBRARY}
-  dynamic-graph::dynamic-graph)
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC dynamic-graph::dynamic-graph)
 TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME} PRIVATE)
 
 IF(SUFFIX_SO_VERSION)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5ca0cb2b78a2d80bd3ccde5c081f48ff00a8f90e..5da4f6ea7cda91769f056d5b54fda661427afb3c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -46,8 +46,7 @@ IF(UNIX AND NOT APPLE)
 ENDIF(UNIX AND NOT APPLE)
 
 TARGET_LINK_LIBRARIES(${PYTHON_MODULE} PRIVATE
-  ${LIBRARY_NAME} dynamic-graph-python
-  ${PYTHON_LIBRARY})
+  ${LIBRARY_NAME} ${PROJECT_NAME})
 TARGET_LINK_BOOST_PYTHON(${PYTHON_MODULE} PRIVATE)
 TARGET_INCLUDE_DIRECTORIES(${PYTHON_MODULE} SYSTEM PRIVATE ${PYTHON_INCLUDE_DIRS})