diff --git a/test/hfp/CMakeLists.txt b/test/hfp/CMakeLists.txt
index 7e968bbc0..1c0f3a98c 100644
--- a/test/hfp/CMakeLists.txt
+++ b/test/hfp/CMakeLists.txt
@@ -78,9 +78,13 @@ list(APPEND SOURCES mock.c test_sequences.c)
 add_library(btstack STATIC ${SOURCES})
 
 # create targets for all examples
-file(GLOB EXAMPLES_C    "*.c")
+file(GLOB EXAMPLES_C "*.c")
 list(SORT EXAMPLES_C)
 
+# remove some
+file(GLOB EXAMPLES_OFF "test_sequences.c" "mock.c")
+list(REMOVE_ITEM EXAMPLES_C   ${EXAMPLES_OFF})
+
 # create targets
 foreach(EXAMPLE_FILE ${EXAMPLES_C})
 	get_filename_component(EXAMPLE ${EXAMPLE_FILE} NAME_WE)
diff --git a/test/hfp/cvsd_plc_test.c b/test/hfp/cvsd_plc_test.c
index 94a8b3475..b797a1cd4 100644
--- a/test/hfp/cvsd_plc_test.c
+++ b/test/hfp/cvsd_plc_test.c
@@ -8,7 +8,7 @@
 #include "CppUTest/TestHarness.h"
 #include "CppUTest/CommandLineTestRunner.h"
 
-#include "btstack_cvsd_plc.h"
+#include "classic/btstack_cvsd_plc.h"
 #include "wav_util.h"
 
 const  int     audio_samples_per_frame = 60;
diff --git a/test/hfp/pklg_cvsd_test.c b/test/hfp/pklg_cvsd_test.c
index 251147d41..6bebc439c 100644
--- a/test/hfp/pklg_cvsd_test.c
+++ b/test/hfp/pklg_cvsd_test.c
@@ -51,7 +51,7 @@
 #include <unistd.h>
 
 #include "btstack.h"
-#include "btstack_cvsd_plc.h"
+#include "classic/btstack_cvsd_plc.h"
 
 #include "wav_util.h"