diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4457efc..490d720 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,11 +65,11 @@ option (USBPLAT "Detection USB platform." OFF)
 option (FTDI4222 "Build with FTDI FT4222 subplatform support." OFF)
 option (IPK "Generate IPK using CPack" OFF)
 option (RPM "Generate RPM using CPack" OFF)
-option (BUILDPYTHON3 "Use python3 for building/installing" OFF)
+option (BUILDPYTHON3 "Use python3 for building/installing/testing" OFF)
 option (ENABLEEXAMPLES "Disable building of examples" ON)
 option (INSTALLGPIOTOOL "Install gpio tool" OFF)
 option (BUILDARCH "Override architecture to build for - override" OFF)
-option (TESTS "Override the addition of tests" ON)
+option (BUILDTESTS "Override the addition of tests" ON)
 
 set (MRAAPLATFORMFORCE "" CACHE STRING "ALL")
 
@@ -97,19 +97,13 @@ else ()
   message(FATAL_ERROR "Only x86 and arm platforms currently supported")
 endif()
 
-if (BUILDSWIGPYTHON)
+if (BUILDSWIGPYTHON OR BUILDTESTS)
   if (BUILDPYTHON3)
     set (PYTHONBUILD_VERSION 3)
   else ()
     set (PYTHONBUILD_VERSION 2.7)
   endif ()
   find_package (PythonInterp ${PYTHONBUILD_VERSION} REQUIRED)
-  if (TESTS)
-    if (${PYTHONINTERP_FOUND})
-      enable_testing ()
-      add_subdirectory (tests)
-    endif ()
-  endif ()
 endif ()
 
 if (BUILDDOC)
@@ -192,3 +186,10 @@ add_subdirectory (src)
 if (ENABLEEXAMPLES)
   add_subdirectory (examples)
 endif ()
+
+if (BUILDTESTS)
+  if (${PYTHONINTERP_FOUND})
+    enable_testing ()
+    add_subdirectory (tests)
+  endif ()
+endif ()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 273b46d..8a484c9 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,9 +1,10 @@
-add_test (NAME py_general COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/general_checks.py)
-set_tests_properties(py_general PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/src/python/")
+if (BUILDSWIGPYTHON)
+    add_test (NAME py_general COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/general_checks.py)
+    set_tests_properties(py_general PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/src/python/")
 
-add_test (NAME py_platform COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/platform_checks.py)
-set_tests_properties(py_platform PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/src/python/")
-
-add_test (NAME py_gpio COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/gpio_checks.py)
-set_tests_properties(py_gpio PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/src/python/")
+    add_test (NAME py_platform COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/platform_checks.py)
+    set_tests_properties(py_platform PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/src/python/")
 
+    add_test (NAME py_gpio COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/gpio_checks.py)
+    set_tests_properties(py_gpio PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_BINARY_DIR}/src/python/")
+endif()