diff --git a/CMakeLists.txt b/CMakeLists.txt
index 917b5ba25ea845269a2324e94f0efb6b409a0f42..52983bbb1b84832b4762eb628d05cdadfa3b50f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,4 +161,6 @@ if(BUILD_PYTHON_INTERFACE)
   add_subdirectory(python)
 endif(BUILD_PYTHON_INTERFACE)
 
-add_subdirectory(tests)
+if(BUILD_TESTING)
+  add_subdirectory(tests)
+endif()
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 5933b96f208af4652cf5a8b650a3e23444d4f64e..f197aae9b9598b2263465b113c9ab99ede1dce1c 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -4,15 +4,18 @@ python_install_on_site(${PROJECT_NAME} __init__.py)
 python_install_on_site(${PROJECT_NAME} plot.py)
 python_install_on_site(${PROJECT_NAME} optimization.py)
 
-add_python_unit_test("python-curves" "python/test/test.py" "python")
-add_python_unit_test("python-constant" "python/test/test-constant.py" "python")
-add_python_unit_test("python-sinusoidal" "python/test/test-sinusoidal.py"
-                     "python")
-add_python_unit_test("python-minjerk" "python/test/test-minjerk.py" "python")
-add_python_unit_test("python-optimization" "python/test/optimization.py"
-                     "python")
-add_python_unit_test("python-notebook" "python/test/notebook.py" "python")
-add_python_unit_test("python-registration" "python/test/registration.py"
-                     "python")
-add_python_unit_test("python-curve-constraints"
-                     "python/test/test-curve-constraints.py" "python")
+if(BUILD_TESTING)
+  add_python_unit_test("python-curves" "python/test/test.py" "python")
+  add_python_unit_test("python-constant" "python/test/test-constant.py"
+                       "python")
+  add_python_unit_test("python-sinusoidal" "python/test/test-sinusoidal.py"
+                       "python")
+  add_python_unit_test("python-minjerk" "python/test/test-minjerk.py" "python")
+  add_python_unit_test("python-optimization" "python/test/optimization.py"
+                       "python")
+  add_python_unit_test("python-notebook" "python/test/notebook.py" "python")
+  add_python_unit_test("python-registration" "python/test/registration.py"
+                       "python")
+  add_python_unit_test("python-curve-constraints"
+                       "python/test/test-curve-constraints.py" "python")
+endif()