diff --git a/CMakeLists.txt b/CMakeLists.txt
index 802e7322dd43b7b3210b298db7393a4d43774e0e..010d05b824ffee19291e32f453735c55db36cf0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,6 +195,7 @@ target_link_libraries(sot_loader ${Boost_LIBRARIES} roscpp ros_bridge tf)
 install(TARGETS sot_loader DESTINATION lib)
 
 add_subdirectory(src)
+add_subdirectory(tests)
 
 # Deal with the ROS part.
 add_service_files( FILES RunPythonFile.srv )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..456b9551a28d65cca8ddb344aacc7a1e9d365c8e
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,4 @@
+IF(BUILD_PYTHON_INTERFACE)
+  ADD_PYTHON_UNIT_TEST("py-import" "tests/test_import.py")
+  ADD_PYTHON_UNIT_TEST("py-joint_state" "tests/test_joint_state.py")
+ENDIF(BUILD_PYTHON_INTERFACE)