diff --git a/MAINTAINERS.yml b/MAINTAINERS.yml
index 44d2c990a0d3e19..55ab36e1ac46866 100644
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@@ -446,6 +446,7 @@ Bluetooth Audio:
     - tests/bsim/bluetooth/audio_samples/
     - tests/bluetooth/shell/audio.conf
     - tests/bluetooth/tester/overlay-le-audio.conf
+    - tests/bluetooth/tester/src/audio
     - doc/connectivity/bluetooth/api/audio/
     - samples/bluetooth/bap*/
     - samples/bluetooth/hap*/
diff --git a/tests/bluetooth/tester/CMakeLists.txt b/tests/bluetooth/tester/CMakeLists.txt
index eb3ad4bda24458c..2493fd11f999198 100644
--- a/tests/bluetooth/tester/CMakeLists.txt
+++ b/tests/bluetooth/tester/CMakeLists.txt
@@ -9,7 +9,6 @@ project(tester)
 
 zephyr_library_include_directories(${ZEPHYR_BASE}/samples/bluetooth)
 zephyr_library_include_directories(${ZEPHYR_BASE}/subsys/bluetooth/mesh)
-zephyr_library_include_directories(${ZEPHYR_BASE}/subsys/bluetooth/audio)
 zephyr_library_include_directories(${ZEPHYR_BASE}/subsys/bluetooth/host)
 target_sources(app PRIVATE
     src/main.c
@@ -26,75 +25,13 @@ if(CONFIG_BT_MESH)
 target_sources(app PRIVATE src/btp_mesh.c)
 endif()
 
-target_sources_ifdef(CONFIG_BT_VCP_VOL_REND app PRIVATE src/btp_vcp.c)
-
 if(CONFIG_BT_IAS OR CONFIG_BT_IAS_CLIENT)
 target_sources(app PRIVATE src/btp_ias.c)
 endif()
 
-if(CONFIG_BT_BAP_UNICAST OR BT_BAP_BROADCAST_SOURCE OR BT_BAP_BROADCAST_SINK)
-    target_sources(app PRIVATE
-            src/btp_bap_audio_stream.c
-            src/btp_bap.c
-            )
-endif()
-
-if(CONFIG_BT_BAP_UNICAST)
-    target_sources(app PRIVATE src/btp_bap_unicast.c)
-endif()
-
-if(CONFIG_BT_BAP_BROADCAST_SOURCE OR CONFIG_BT_BAP_BROADCAST_SOURCE)
-    target_sources(app PRIVATE src/btp_bap_broadcast.c)
-endif()
-
-if(CONFIG_BT_HAS)
-    target_sources(app PRIVATE src/btp_has.c)
-endif()
-
-if (CONFIG_BT_CSIP_SET_MEMBER)
-    target_sources(app PRIVATE src/btp_csis.c)
-endif()
-
-if (CONFIG_BT_CSIP_SET_COORDINATOR)
-    target_sources(app PRIVATE src/btp_csip.c)
-endif()
-
-if(CONFIG_BT_MICP_MIC_DEV)
-    target_sources(app PRIVATE src/btp_micp.c)
-endif()
-
-if(CONFIG_BT_AICS)
-    target_sources(app PRIVATE src/btp_aics.c)
-endif()
-
-if (CONFIG_BT_TBS_CLIENT)
-    target_sources(app PRIVATE src/btp_ccp.c)
-endif()
-
-if (CONFIG_BT_CAP_ACCEPTOR)
-    target_sources(app PRIVATE src/btp_cas.c)
-endif()
-
-if(CONFIG_BT_MCC OR CONFIG_BT_MCS)
-    target_sources(app PRIVATE src/btp_mcp.c)
-endif()
-
-if(CONFIG_BT_HAS)
-    target_sources(app PRIVATE src/btp_hap.c)
-endif()
-
-if(CONFIG_BT_CAP_INITIATOR)
-    target_sources(app PRIVATE src/btp_cap.c)
-endif()
-
-if(CONFIG_BT_TBS OR CONFIG_BT_GTBS)
-    target_sources(app PRIVATE src/btp_ccp.c)
-endif()
-
-if(CONFIG_BT_TMAP)
-    target_sources(app PRIVATE src/btp_tmap.c)
-endif()
-
 if(CONFIG_BT_OTS)
     target_sources(app PRIVATE src/btp_ots.c)
 endif()
+
+zephyr_library_include_directories(src src/btp src/audio/btp)
+add_subdirectory_ifdef(CONFIG_BT_AUDIO src/audio)
diff --git a/tests/bluetooth/tester/src/audio/CMakeLists.txt b/tests/bluetooth/tester/src/audio/CMakeLists.txt
new file mode 100644
index 000000000000000..38b4cac11cbe4d0
--- /dev/null
+++ b/tests/bluetooth/tester/src/audio/CMakeLists.txt
@@ -0,0 +1,69 @@
+# SPDX-License-Identifier: Apache-2.0
+
+cmake_minimum_required(VERSION 3.20.0)
+
+zephyr_library_include_directories(${ZEPHYR_BASE}/subsys/bluetooth/audio)
+
+if(CONFIG_BT_VCP_VOL_REND)
+  target_sources(app PRIVATE btp_vcp.c)
+endif()
+
+if(CONFIG_BT_BAP_UNICAST OR BT_BAP_BROADCAST_SOURCE OR BT_BAP_BROADCAST_SINK)
+    target_sources(app PRIVATE btp_bap_audio_stream.c btp_bap.c )
+endif()
+
+if(CONFIG_BT_BAP_UNICAST)
+    target_sources(app PRIVATE btp_bap_unicast.c)
+endif()
+
+if(CONFIG_BT_BAP_BROADCAST_SOURCE OR CONFIG_BT_BAP_BROADCAST_SOURCE)
+    target_sources(app PRIVATE btp_bap_broadcast.c)
+endif()
+
+if(CONFIG_BT_HAS)
+    target_sources(app PRIVATE btp_has.c)
+endif()
+
+if (CONFIG_BT_CSIP_SET_MEMBER)
+    target_sources(app PRIVATE btp_csis.c)
+endif()
+
+if (CONFIG_BT_CSIP_SET_COORDINATOR)
+    target_sources(app PRIVATE btp_csip.c)
+endif()
+
+if(CONFIG_BT_MICP_MIC_DEV)
+    target_sources(app PRIVATE btp_micp.c)
+endif()
+
+if(CONFIG_BT_AICS)
+    target_sources(app PRIVATE btp_aics.c)
+endif()
+
+if (CONFIG_BT_TBS_CLIENT)
+    target_sources(app PRIVATE btp_ccp.c)
+endif()
+
+if (CONFIG_BT_CAP_ACCEPTOR)
+    target_sources(app PRIVATE btp_cas.c)
+endif()
+
+if(CONFIG_BT_MCC OR CONFIG_BT_MCS)
+    target_sources(app PRIVATE btp_mcp.c)
+endif()
+
+if(CONFIG_BT_HAS)
+    target_sources(app PRIVATE btp_hap.c)
+endif()
+
+if(CONFIG_BT_CAP_INITIATOR)
+    target_sources(app PRIVATE btp_cap.c)
+endif()
+
+if(CONFIG_BT_TBS OR CONFIG_BT_GTBS)
+    target_sources(app PRIVATE btp_ccp.c)
+endif()
+
+if(CONFIG_BT_TMAP)
+    target_sources(app PRIVATE btp_tmap.c)
+endif()
diff --git a/tests/bluetooth/tester/src/btp/btp_aics.h b/tests/bluetooth/tester/src/audio/btp/btp_aics.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_aics.h
rename to tests/bluetooth/tester/src/audio/btp/btp_aics.h
diff --git a/tests/bluetooth/tester/src/btp/btp_ascs.h b/tests/bluetooth/tester/src/audio/btp/btp_ascs.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_ascs.h
rename to tests/bluetooth/tester/src/audio/btp/btp_ascs.h
diff --git a/tests/bluetooth/tester/src/btp/btp_bap.h b/tests/bluetooth/tester/src/audio/btp/btp_bap.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_bap.h
rename to tests/bluetooth/tester/src/audio/btp/btp_bap.h
diff --git a/tests/bluetooth/tester/src/btp/btp_cap.h b/tests/bluetooth/tester/src/audio/btp/btp_cap.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_cap.h
rename to tests/bluetooth/tester/src/audio/btp/btp_cap.h
diff --git a/tests/bluetooth/tester/src/btp/btp_cas.h b/tests/bluetooth/tester/src/audio/btp/btp_cas.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_cas.h
rename to tests/bluetooth/tester/src/audio/btp/btp_cas.h
diff --git a/tests/bluetooth/tester/src/btp/btp_ccp.h b/tests/bluetooth/tester/src/audio/btp/btp_ccp.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_ccp.h
rename to tests/bluetooth/tester/src/audio/btp/btp_ccp.h
diff --git a/tests/bluetooth/tester/src/btp/btp_csip.h b/tests/bluetooth/tester/src/audio/btp/btp_csip.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_csip.h
rename to tests/bluetooth/tester/src/audio/btp/btp_csip.h
diff --git a/tests/bluetooth/tester/src/btp/btp_csis.h b/tests/bluetooth/tester/src/audio/btp/btp_csis.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_csis.h
rename to tests/bluetooth/tester/src/audio/btp/btp_csis.h
diff --git a/tests/bluetooth/tester/src/btp/btp_hap.h b/tests/bluetooth/tester/src/audio/btp/btp_hap.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_hap.h
rename to tests/bluetooth/tester/src/audio/btp/btp_hap.h
diff --git a/tests/bluetooth/tester/src/btp/btp_has.h b/tests/bluetooth/tester/src/audio/btp/btp_has.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_has.h
rename to tests/bluetooth/tester/src/audio/btp/btp_has.h
diff --git a/tests/bluetooth/tester/src/btp/btp_mcp.h b/tests/bluetooth/tester/src/audio/btp/btp_mcp.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_mcp.h
rename to tests/bluetooth/tester/src/audio/btp/btp_mcp.h
diff --git a/tests/bluetooth/tester/src/btp/btp_mcs.h b/tests/bluetooth/tester/src/audio/btp/btp_mcs.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_mcs.h
rename to tests/bluetooth/tester/src/audio/btp/btp_mcs.h
diff --git a/tests/bluetooth/tester/src/btp/btp_micp.h b/tests/bluetooth/tester/src/audio/btp/btp_micp.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_micp.h
rename to tests/bluetooth/tester/src/audio/btp/btp_micp.h
diff --git a/tests/bluetooth/tester/src/btp/btp_mics.h b/tests/bluetooth/tester/src/audio/btp/btp_mics.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_mics.h
rename to tests/bluetooth/tester/src/audio/btp/btp_mics.h
diff --git a/tests/bluetooth/tester/src/btp/btp_pacs.h b/tests/bluetooth/tester/src/audio/btp/btp_pacs.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_pacs.h
rename to tests/bluetooth/tester/src/audio/btp/btp_pacs.h
diff --git a/tests/bluetooth/tester/src/btp/btp_tbs.h b/tests/bluetooth/tester/src/audio/btp/btp_tbs.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_tbs.h
rename to tests/bluetooth/tester/src/audio/btp/btp_tbs.h
diff --git a/tests/bluetooth/tester/src/btp/btp_tmap.h b/tests/bluetooth/tester/src/audio/btp/btp_tmap.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_tmap.h
rename to tests/bluetooth/tester/src/audio/btp/btp_tmap.h
diff --git a/tests/bluetooth/tester/src/btp/btp_vcp.h b/tests/bluetooth/tester/src/audio/btp/btp_vcp.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_vcp.h
rename to tests/bluetooth/tester/src/audio/btp/btp_vcp.h
diff --git a/tests/bluetooth/tester/src/btp/btp_vcs.h b/tests/bluetooth/tester/src/audio/btp/btp_vcs.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_vcs.h
rename to tests/bluetooth/tester/src/audio/btp/btp_vcs.h
diff --git a/tests/bluetooth/tester/src/btp/btp_vocs.h b/tests/bluetooth/tester/src/audio/btp/btp_vocs.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp/btp_vocs.h
rename to tests/bluetooth/tester/src/audio/btp/btp_vocs.h
diff --git a/tests/bluetooth/tester/src/btp_aics.c b/tests/bluetooth/tester/src/audio/btp_aics.c
similarity index 100%
rename from tests/bluetooth/tester/src/btp_aics.c
rename to tests/bluetooth/tester/src/audio/btp_aics.c
diff --git a/tests/bluetooth/tester/src/btp_bap.c b/tests/bluetooth/tester/src/audio/btp_bap.c
similarity index 100%
rename from tests/bluetooth/tester/src/btp_bap.c
rename to tests/bluetooth/tester/src/audio/btp_bap.c
diff --git a/tests/bluetooth/tester/src/btp_bap_audio_stream.c b/tests/bluetooth/tester/src/audio/btp_bap_audio_stream.c
similarity index 100%
rename from tests/bluetooth/tester/src/btp_bap_audio_stream.c
rename to tests/bluetooth/tester/src/audio/btp_bap_audio_stream.c
diff --git a/tests/bluetooth/tester/src/btp_bap_audio_stream.h b/tests/bluetooth/tester/src/audio/btp_bap_audio_stream.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp_bap_audio_stream.h
rename to tests/bluetooth/tester/src/audio/btp_bap_audio_stream.h
diff --git a/tests/bluetooth/tester/src/btp_bap_broadcast.c b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
similarity index 100%
rename from tests/bluetooth/tester/src/btp_bap_broadcast.c
rename to tests/bluetooth/tester/src/audio/btp_bap_broadcast.c
diff --git a/tests/bluetooth/tester/src/btp_bap_broadcast.h b/tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp_bap_broadcast.h
rename to tests/bluetooth/tester/src/audio/btp_bap_broadcast.h
diff --git a/tests/bluetooth/tester/src/btp_bap_unicast.c b/tests/bluetooth/tester/src/audio/btp_bap_unicast.c
similarity index 100%
rename from tests/bluetooth/tester/src/btp_bap_unicast.c
rename to tests/bluetooth/tester/src/audio/btp_bap_unicast.c
diff --git a/tests/bluetooth/tester/src/btp_bap_unicast.h b/tests/bluetooth/tester/src/audio/btp_bap_unicast.h
similarity index 100%
rename from tests/bluetooth/tester/src/btp_bap_unicast.h
rename to tests/bluetooth/tester/src/audio/btp_bap_unicast.h
diff --git a/tests/bluetooth/tester/src/btp_cap.c b/tests/bluetooth/tester/src/audio/btp_cap.c
similarity index 100%
rename from tests/bluetooth/tester/src/btp_cap.c
rename to tests/bluetooth/tester/src/audio/btp_cap.c
diff --git a/tests/bluetooth/tester/src/btp_cas.c b/tests/bluetooth/tester/src/audio/btp_cas.c
similarity index 100%
rename from tests/bluetooth/tester/src/btp_cas.c
rename to tests/bluetooth/tester/src/audio/btp_cas.c
diff --git a/tests/bluetooth/tester/src/btp_ccp.c b/tests/bluetooth/tester/src/audio/btp_ccp.c
similarity index 100%
rename from tests/bluetooth/tester/src/btp_ccp.c
rename to tests/bluetooth/tester/src/audio/btp_ccp.c
diff --git a/tests/bluetooth/tester/src/btp_csip.c b/tests/bluetooth/tester/src/audio/btp_csip.c
similarity index 100%
rename from tests/bluetooth/tester/src/btp_csip.c
rename to tests/bluetooth/tester/src/audio/btp_csip.c
diff --git a/tests/bluetooth/tester/src/btp_csis.c b/tests/bluetooth/tester/src/audio/btp_csis.c
similarity index 100%
rename from tests/bluetooth/tester/src/btp_csis.c
rename to tests/bluetooth/tester/src/audio/btp_csis.c
diff --git a/tests/bluetooth/tester/src/btp_hap.c b/tests/bluetooth/tester/src/audio/btp_hap.c
similarity index 100%
rename from tests/bluetooth/tester/src/btp_hap.c
rename to tests/bluetooth/tester/src/audio/btp_hap.c
diff --git a/tests/bluetooth/tester/src/btp_has.c b/tests/bluetooth/tester/src/audio/btp_has.c
similarity index 100%
rename from tests/bluetooth/tester/src/btp_has.c
rename to tests/bluetooth/tester/src/audio/btp_has.c
diff --git a/tests/bluetooth/tester/src/btp_mcp.c b/tests/bluetooth/tester/src/audio/btp_mcp.c
similarity index 100%
rename from tests/bluetooth/tester/src/btp_mcp.c
rename to tests/bluetooth/tester/src/audio/btp_mcp.c
diff --git a/tests/bluetooth/tester/src/btp_micp.c b/tests/bluetooth/tester/src/audio/btp_micp.c
similarity index 100%
rename from tests/bluetooth/tester/src/btp_micp.c
rename to tests/bluetooth/tester/src/audio/btp_micp.c
diff --git a/tests/bluetooth/tester/src/btp_tmap.c b/tests/bluetooth/tester/src/audio/btp_tmap.c
similarity index 100%
rename from tests/bluetooth/tester/src/btp_tmap.c
rename to tests/bluetooth/tester/src/audio/btp_tmap.c
diff --git a/tests/bluetooth/tester/src/btp_vcp.c b/tests/bluetooth/tester/src/audio/btp_vcp.c
similarity index 100%
rename from tests/bluetooth/tester/src/btp_vcp.c
rename to tests/bluetooth/tester/src/audio/btp_vcp.c