diff --git a/.travis.yml b/.travis.yml
index db60243f..8d360d18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,7 @@ script:
   - mkdir build
   - cd build
   - /opt/cmake/bin/cmake --version
-  - /opt/cmake/bin/cmake -DCMAKE_CXX_COMPILER=$COMPILER -DBLUETOE_EXCLUDE_SLOW_TESTS=1 ..
+  - /opt/cmake/bin/cmake -DCMAKE_CXX_COMPILER=$COMPILER -DBLUETOE_EXCLUDE_SLOW_TESTS=1 -DBLUETOE_BUILD_UNIT_TESTS=1 ..
   - make
   - ctest --verbose
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bb51475..15cb7f14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,8 @@ set(CMAKE_DISABLE_SOURCE_CHANGES ON)
 set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
 project(lib_bluetoe CXX)
 
+option(BLUETOE_BUILD_UNIT_TESTS "If true, unit test targets are added are build.")
+
 add_library(bluetoe_iface INTERFACE)
 target_compile_features(bluetoe_iface INTERFACE cxx_std_11)
 add_library(bluetoe::iface ALIAS bluetoe_iface)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 822eb989..3f243ee2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -28,22 +28,24 @@ function(bluetoe_add_test test_runner)
     add_and_register_test(${test_runner} bluetoe::iface)
 endfunction()
 
-add_and_register_test(write_queue_tests)
-add_and_register_test(service_tests)
-add_and_register_test(options_tests)
-add_and_register_test(characteristic_tests)
-add_and_register_test(characteristic_value_tests)
-add_and_register_test(advertising_tests)
-add_and_register_test(filter_tests)
-add_and_register_test(server_tests)
-add_and_register_test(auto_uuid_tests)
-add_and_register_test(scattered_access_tests)
-add_and_register_test(gap_service_tests)
-add_and_register_test(read_write_handler_tests)
-add_and_register_test(encryption_tests)
-
-add_subdirectory(att)
-add_subdirectory(link_layer)
-add_subdirectory(services)
-add_subdirectory(security_manager)
-add_subdirectory(hci)
\ No newline at end of file
+if ( BLUETOE_BUILD_UNIT_TESTS )
+    add_and_register_test(write_queue_tests)
+    add_and_register_test(service_tests)
+    add_and_register_test(options_tests)
+    add_and_register_test(characteristic_tests)
+    add_and_register_test(characteristic_value_tests)
+    add_and_register_test(advertising_tests)
+    add_and_register_test(filter_tests)
+    add_and_register_test(server_tests)
+    add_and_register_test(auto_uuid_tests)
+    add_and_register_test(scattered_access_tests)
+    add_and_register_test(gap_service_tests)
+    add_and_register_test(read_write_handler_tests)
+    add_and_register_test(encryption_tests)
+
+    add_subdirectory(att)
+    add_subdirectory(link_layer)
+    add_subdirectory(services)
+    add_subdirectory(security_manager)
+    add_subdirectory(hci)
+endif()
\ No newline at end of file