diff --git a/test/avdtp/CMakeLists.txt b/test/avdtp/CMakeLists.txt
index 36c6bf867..89ff07e11 100644
--- a/test/avdtp/CMakeLists.txt
+++ b/test/avdtp/CMakeLists.txt
@@ -11,7 +11,7 @@ link_directories(${LIBUSB_LIBRARY_DIRS})
 link_libraries(${LIBUSB_LIBRARIES})
 
 # CppuTest
-pkg_check_modules(CPPUTEST REQUIRED CppuTest)
+pkg_check_modules(CPPUTEST REQUIRED cpputest)
 include_directories(${CPPUTEST_INCLUDE_DIRS})
 link_directories(${CPPUTEST_LIBRARY_DIRS})
 link_libraries(${CPPUTEST_LIBRARIES})
@@ -56,7 +56,7 @@ list(REMOVE_ITEM SOURCES_BLE   ${SOURCES_BLE_OFF})
 file(GLOB SOURCES_POSIX_OFF "../../platform/posix/le_device_db_fs.c")
 list(REMOVE_ITEM SOURCES_POSIX ${SOURCES_POSIX_OFF})
 
-set(SOURCES 
+set(SOURCES
 	${SOURCES_MD5}
 	${SOURCES_YXML}
 	${SOURCES_BLUEDROID}
diff --git a/test/btstack_util/CMakeLists.txt b/test/btstack_util/CMakeLists.txt
index bb3d38df1..0b09a2503 100644
--- a/test/btstack_util/CMakeLists.txt
+++ b/test/btstack_util/CMakeLists.txt
@@ -8,7 +8,7 @@ set (BTSTACK_ROOT ${CMAKE_SOURCE_DIR}/../../)
 find_package(PkgConfig REQUIRED)
 
 # CppuTest
-pkg_check_modules(CPPUTEST REQUIRED CppuTest)
+pkg_check_modules(CPPUTEST REQUIRED cpputest)
 include_directories(${CPPUTEST_INCLUDE_DIRS})
 link_directories(${CPPUTEST_LIBRARY_DIRS})
 link_libraries(${CPPUTEST_LIBRARIES})
diff --git a/test/flash_tlv/CMakeLists.txt b/test/flash_tlv/CMakeLists.txt
index 04dd28c43..4d1d79812 100644
--- a/test/flash_tlv/CMakeLists.txt
+++ b/test/flash_tlv/CMakeLists.txt
@@ -8,7 +8,7 @@ set (BTSTACK_ROOT ${CMAKE_SOURCE_DIR}/../../)
 find_package(PkgConfig REQUIRED)
 
 # CppuTest
-pkg_check_modules(CPPUTEST REQUIRED CppuTest)
+pkg_check_modules(CPPUTEST REQUIRED cpputest)
 include_directories(${CPPUTEST_INCLUDE_DIRS})
 link_directories(${CPPUTEST_LIBRARY_DIRS})
 link_libraries(${CPPUTEST_LIBRARIES})
diff --git a/test/gap/CMakeLists.txt b/test/gap/CMakeLists.txt
index cea08331d..06f637aa9 100644
--- a/test/gap/CMakeLists.txt
+++ b/test/gap/CMakeLists.txt
@@ -8,7 +8,7 @@ find_package(PkgConfig REQUIRED)
 find_package(PkgConfig REQUIRED)
 
 # CppuTest
-pkg_check_modules(CPPUTEST REQUIRED CppuTest)
+pkg_check_modules(CPPUTEST REQUIRED cpputest)
 include_directories(${CPPUTEST_INCLUDE_DIRS})
 link_directories(${CPPUTEST_LIBRARY_DIRS})
 link_libraries(${CPPUTEST_LIBRARIES})
diff --git a/test/gatt-service-client/CMakeLists.txt b/test/gatt-service-client/CMakeLists.txt
index efa6181c6..3c0eb6a0a 100644
--- a/test/gatt-service-client/CMakeLists.txt
+++ b/test/gatt-service-client/CMakeLists.txt
@@ -5,7 +5,7 @@ project(gatt-client-test)
 find_package(PkgConfig REQUIRED)
 
 # CppuTest
-pkg_check_modules(CPPUTEST REQUIRED CppuTest)
+pkg_check_modules(CPPUTEST REQUIRED cpputest)
 include_directories(${CPPUTEST_INCLUDE_DIRS})
 link_directories(${CPPUTEST_LIBRARY_DIRS})
 link_libraries(${CPPUTEST_LIBRARIES})
diff --git a/test/gatt_client/CMakeLists.txt b/test/gatt_client/CMakeLists.txt
index 18c66085f..d83ca8163 100644
--- a/test/gatt_client/CMakeLists.txt
+++ b/test/gatt_client/CMakeLists.txt
@@ -5,7 +5,7 @@ project(gatt-client-test)
 find_package(PkgConfig REQUIRED)
 
 # CppuTest
-pkg_check_modules(CPPUTEST REQUIRED CppuTest)
+pkg_check_modules(CPPUTEST REQUIRED cpputest)
 include_directories(${CPPUTEST_INCLUDE_DIRS})
 link_directories(${CPPUTEST_LIBRARY_DIRS})
 link_libraries(${CPPUTEST_LIBRARIES})
diff --git a/test/gatt_server/CMakeLists.txt b/test/gatt_server/CMakeLists.txt
index 44cf1f1b6..fa89f36d6 100644
--- a/test/gatt_server/CMakeLists.txt
+++ b/test/gatt_server/CMakeLists.txt
@@ -5,7 +5,7 @@ project(gatt_server)
 find_package(PkgConfig REQUIRED)
 
 # CppuTest
-pkg_check_modules(CPPUTEST REQUIRED CppuTest)
+pkg_check_modules(CPPUTEST REQUIRED cpputest)
 include_directories(${CPPUTEST_INCLUDE_DIRS})
 link_directories(${CPPUTEST_LIBRARY_DIRS})
 link_libraries(${CPPUTEST_LIBRARIES})
@@ -26,25 +26,25 @@ set(SOURCES
     ../../src/ble/att_db.c
     ../../src/ble/att_db_util.c
     ../../src/ble/att_server.c
-    ../../src/ble/gatt-service/battery_service_server.c 
-    ../../src/ble/gatt-service/cycling_power_service_server.c 
-    ../../src/ble/gatt-service/cycling_speed_and_cadence_service_server.c 
-    ../../src/ble/gatt-service/device_information_service_server.c 
-    ../../src/ble/gatt-service/heart_rate_service_server.c 
-    ../../src/ble/gatt-service/hids_device.c 
-    ../../src/ble/gatt-service/nordic_spp_service_server.c 
-    ../../src/ble/gatt-service/ublox_spp_service_server.c 
-    ../../src/ble/le_device_db_memory.c       
-    ../../src/btstack_crypto.c            
-    ../../src/btstack_linked_list.c       
-    ../../src/btstack_memory.c            
-    ../../src/btstack_memory_pool.c       
+    ../../src/ble/gatt-service/battery_service_server.c
+    ../../src/ble/gatt-service/cycling_power_service_server.c
+    ../../src/ble/gatt-service/cycling_speed_and_cadence_service_server.c
+    ../../src/ble/gatt-service/device_information_service_server.c
+    ../../src/ble/gatt-service/heart_rate_service_server.c
+    ../../src/ble/gatt-service/hids_device.c
+    ../../src/ble/gatt-service/nordic_spp_service_server.c
+    ../../src/ble/gatt-service/ublox_spp_service_server.c
+    ../../src/ble/le_device_db_memory.c
+    ../../src/btstack_crypto.c
+    ../../src/btstack_linked_list.c
+    ../../src/btstack_memory.c
+    ../../src/btstack_memory_pool.c
     ../../src/btstack_tlv.c
     ../../platform/posix/btstack_tlv_posix.c
     ../../src/btstack_util.c
-    ../../src/hci_cmd.c                   
-    ../../src/hci_dump.c                  
-    mock.c                                
+    ../../src/hci_cmd.c
+    ../../src/hci_dump.c
+    mock.c
 )
 
 # Enable ASAN
diff --git a/test/hfp/CMakeLists.txt b/test/hfp/CMakeLists.txt
index d6e902ffe..bf7ba6c0b 100644
--- a/test/hfp/CMakeLists.txt
+++ b/test/hfp/CMakeLists.txt
@@ -5,7 +5,7 @@ project(test-hfp)
 find_package(PkgConfig REQUIRED)
 
 # CppuTest
-pkg_check_modules(CPPUTEST REQUIRED CppuTest)
+pkg_check_modules(CPPUTEST REQUIRED cpputest)
 include_directories(${CPPUTEST_INCLUDE_DIRS})
 link_directories(${CPPUTEST_LIBRARY_DIRS})
 link_libraries(${CPPUTEST_LIBRARIES})
diff --git a/test/l2cap-cbm/CMakeLists.txt b/test/l2cap-cbm/CMakeLists.txt
index 6b970b55a..25a6e4950 100644
--- a/test/l2cap-cbm/CMakeLists.txt
+++ b/test/l2cap-cbm/CMakeLists.txt
@@ -5,7 +5,7 @@ project(gatt-client-test)
 find_package(PkgConfig REQUIRED)
 
 # CppuTest
-pkg_check_modules(CPPUTEST REQUIRED CppuTest)
+pkg_check_modules(CPPUTEST REQUIRED cpputest)
 include_directories(${CPPUTEST_INCLUDE_DIRS})
 link_directories(${CPPUTEST_LIBRARY_DIRS})
 link_libraries(${CPPUTEST_LIBRARIES})
diff --git a/test/l2cap-ecbm/CMakeLists.txt b/test/l2cap-ecbm/CMakeLists.txt
index 6b970b55a..25a6e4950 100644
--- a/test/l2cap-ecbm/CMakeLists.txt
+++ b/test/l2cap-ecbm/CMakeLists.txt
@@ -5,7 +5,7 @@ project(gatt-client-test)
 find_package(PkgConfig REQUIRED)
 
 # CppuTest
-pkg_check_modules(CPPUTEST REQUIRED CppuTest)
+pkg_check_modules(CPPUTEST REQUIRED cpputest)
 include_directories(${CPPUTEST_INCLUDE_DIRS})
 link_directories(${CPPUTEST_LIBRARY_DIRS})
 link_libraries(${CPPUTEST_LIBRARIES})
diff --git a/test/mesh/CMakeLists.txt b/test/mesh/CMakeLists.txt
index cb22b281c..d40296662 100644
--- a/test/mesh/CMakeLists.txt
+++ b/test/mesh/CMakeLists.txt
@@ -44,7 +44,7 @@ list(REMOVE_ITEM SOURCES_BLE ${SOURCES_OFF})
 
 set(SOURCES_MESH_NEW main.c)
 
-set(SOURCES 
+set(SOURCES
 	${SOURCES_POSIX}
 	${SOURCES_LIBUSB}
 	${SOURCES_SRC}
@@ -71,7 +71,7 @@ foreach(EXAMPLE_FILE ${EXAMPLES_C})
 		message("example ${EXAMPLE} -- with GATT DB")
 		add_custom_command(
 		    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE}.h
-    		COMMAND ${CMAKE_SOURCE_DIR}/../../tool/compile_gatt.py ${CMAKE_SOURCE_DIR}/${EXAMPLE}.gatt ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE}.h > /dev/null
+            COMMAND ${CMAKE_SOURCE_DIR}/../../tool/compile_gatt.py ${CMAKE_SOURCE_DIR}/${EXAMPLE}.gatt ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE}.h > /dev/null
 		)
 		add_executable(${EXAMPLE} ${EXAMPLE_FILE} ${CMAKE_CURRENT_BINARY_DIR}/${EXAMPLE}.h)
 	else()
@@ -85,7 +85,7 @@ endforeach(EXAMPLE_FILE)
 find_package(PkgConfig REQUIRED)
 
 # CppuTest
-pkg_check_modules(CPPUTEST REQUIRED CppuTest)
+pkg_check_modules(CPPUTEST REQUIRED cpputest)
 include_directories(${CPPUTEST_INCLUDE_DIRS})
 link_directories(${CPPUTEST_LIBRARY_DIRS})
 link_libraries(${CPPUTEST_LIBRARIES})