diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/gap.llcp.sh b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/gap.llcp.sh
index 3ab98e9e2fe..4717d83664f 100755
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/gap.llcp.sh
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/gap.llcp.sh
@@ -6,7 +6,7 @@
 CWD="$(cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P)"
 
 export SIMULATION_ID="edtt_gap_llcp"
-export TEST_FILE=${CWD}"/gap.test_list"
+export TEST_FILE=${CWD}"/gap.llcp.test_list"
 export TEST_MODULE="gap_verification"
 export PRJ_CONF_1="prj_dut_llcp_conf"
 export PRJ_CONF_2="prj_tst_llcp_conf"
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/gap.llcp.test_list b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/gap.llcp.test_list
new file mode 100644
index 00000000000..7c546bc6e5c
--- /dev/null
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/gap.llcp.test_list
@@ -0,0 +1,57 @@
+# Copyright 2019 Oticon A/S
+# SPDX-License-Identifier: Apache-2.0
+
+GAP/ADV/BV-01-C
+GAP/ADV/BV-02-C
+GAP/ADV/BV-03-C
+GAP/ADV/BV-04-C
+GAP/ADV/BV-05-C
+GAP/ADV/BV-08-C
+GAP/ADV/BV-09-C
+GAP/ADV/BV-10-C
+GAP/ADV/BV-11-C
+GAP/ADV/BV-12-C
+GAP/ADV/BV-13-C
+GAP/ADV/BV-14-C
+GAP/ADV/BV-15-C
+GAP/ADV/BV-16-C
+GAP/ADV/BV-17-C
+GAP/CONN/ACEP/BV-01-C
+GAP/CONN/ACEP/BV-03-C
+GAP/CONN/ACEP/BV-04-C
+GAP/CONN/DCON/BV-01-C
+GAP/CONN/GCEP/BV-01-C
+GAP/CONN/GCEP/BV-02-C
+GAP/CONN/GCEP/BV-05-C
+GAP/CONN/GCEP/BV-06-C
+GAP/CONN/CPUP/BV-01-C
+GAP/CONN/CPUP/BV-02-C
+#GAP/CONN/CPUP/BV-03-C ## Temporarily disable pending debug in refactored LLCP
+GAP/CONN/CPUP/BV-04-C
+#GAP/CONN/CPUP/BV-05-C ## Temporarily disable pending debug in refactored LLCP
+GAP/CONN/CPUP/BV-06-C
+GAP/CONN/NCON/BV-01-C
+GAP/CONN/NCON/BV-02-C
+GAP/CONN/NCON/BV-03-C
+GAP/CONN/UCON/BV-01-C
+GAP/CONN/UCON/BV-02-C
+GAP/CONN/UCON/BV-03-C
+GAP/DISC/GENM/BV-01-C
+GAP/DISC/GENM/BV-02-C
+GAP/DISC/GENM/BV-03-C
+GAP/DISC/GENM/BV-04-C
+GAP/DISC/GENP/BV-01-C
+GAP/DISC/GENP/BV-02-C
+GAP/DISC/GENP/BV-04-C
+GAP/DISC/GENP/BV-05-C
+GAP/DISC/LIMM/BV-01-C
+GAP/DISC/LIMM/BV-02-C
+GAP/DISC/LIMM/BV-03-C
+GAP/DISC/LIMM/BV-04-C
+GAP/DISC/LIMP/BV-01-C
+GAP/DISC/LIMP/BV-02-C
+GAP/DISC/LIMP/BV-04-C
+GAP/DISC/LIMP/BV-05-C
+GAP/DISC/NONM/BV-01-C
+GAP/DISC/NONM/BV-02-C
+GAP/DISC/RPA/BV-01-C
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/gatt.llcp.sh b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/gatt.llcp.sh
index 758f6a63f3e..4c3c8af4bdd 100755
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/gatt.llcp.sh
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/gatt.llcp.sh
@@ -26,7 +26,7 @@ BOARD="${BOARD:-nrf52_bsim}"
 cd ${EDTT_PATH}
 
 Execute ./src/edttool.py -s=${SIMULATION_ID} -d=0 --transport bsim \
-  -T gatt_verification -C "${CWD}/gatt.test_list" -v=${VERBOSITY_LEVEL}
+  -T gatt_verification -C "${CWD}/gatt.llcp.test_list" -v=${VERBOSITY_LEVEL}
 
 cd ${BSIM_OUT_PATH}/bin
 
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/gatt.llcp.test_list b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/gatt.llcp.test_list
new file mode 100644
index 00000000000..2b2fe0e6aef
--- /dev/null
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/gatt.llcp.test_list
@@ -0,0 +1,72 @@
+# Copyright 2019 Oticon A/S
+# SPDX-License-Identifier: Apache-2.0
+
+GAP/GAT/BV-01-C
+#GAP/GAT/BV-04-C ## Temporarily disable pending debug in refactored LLCP
+GAP/IDLE/NAMP/BV-01-C
+GATT/SR/GAC/BV-01-C
+GATT/SR/GAD/BV-01-C
+GATT/SR/GAD/BV-02-C
+GATT/SR/GAD/BV-03-C
+GATT/SR/GAD/BV-04-C
+GATT/SR/GAD/BV-05-C
+GATT/SR/GAD/BV-06-C
+GATT/SR/GAR/BV-01-C
+GATT/SR/GAR/BI-01-C
+GATT/SR/GAR/BI-02-C
+GATT/SR/GAR/BI-03-C
+GATT/SR/GAR/BI-04-C
+GATT/SR/GAR/BV-03-C
+GATT/SR/GAR/BI-06-C
+GATT/SR/GAR/BI-07-C
+GATT/SR/GAR/BI-09-C
+GATT/SR/GAR/BI-10-C
+GATT/SR/GAR/BI-11-C
+GATT/SR/GAR/BV-04-C
+GATT/SR/GAR/BI-12-C
+GATT/SR/GAR/BI-13-C
+GATT/SR/GAR/BI-14-C
+GATT/SR/GAR/BI-15-C
+GATT/SR/GAR/BI-16-C
+GATT/SR/GAR/BI-17-C
+GATT/SR/GAR/BV-05-C
+GATT/SR/GAR/BI-18-C
+GATT/SR/GAR/BI-19-C
+GATT/SR/GAR/BI-20-C
+GATT/SR/GAR/BI-21-C
+GATT/SR/GAR/BI-22-C
+GATT/SR/GAR/BV-06-C
+GATT/SR/GAR/BV-07-C
+GATT/SR/GAW/BV-01-C
+GATT/SR/GAW/BV-03-C
+GATT/SR/GAW/BI-02-C
+GATT/SR/GAW/BI-03-C
+GATT/SR/GAW/BI-04-C
+GATT/SR/GAW/BI-05-C
+GATT/SR/GAW/BI-06-C
+GATT/SR/GAW/BV-05-C
+GATT/SR/GAW/BI-07-C
+GATT/SR/GAW/BI-08-C
+GATT/SR/GAW/BI-09-C
+GATT/SR/GAW/BI-11-C
+GATT/SR/GAW/BI-12-C
+GATT/SR/GAW/BI-13-C
+GATT/SR/GAW/BV-08-C
+GATT/SR/GAW/BV-09-C
+GATT/SR/GAW/BV-11-C
+GATT/SR/GAW/BI-32-C
+GATT/SR/GAW/BI-33-C
+GATT/SR/GAN/BV-01-C
+GATT/SR/GAI/BV-01-C
+GATT/SR/GAS/BV-01-C
+GATT/SR/UNS/BI-01-C
+GATT/SR/UNS/BI-02-C
+GATT/SR/GPA/BV-01-C
+GATT/SR/GPA/BV-02-C
+GATT/SR/GPA/BV-03-C
+GATT/SR/GPA/BV-04-C
+GATT/SR/GPA/BV-05-C
+GATT/SR/GPA/BV-06-C
+GATT/SR/GPA/BV-07-C
+GATT/SR/GPA/BV-08-C
+GATT/SR/GPA/BV-12-C
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set1.llcp.test_list b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set1.llcp.test_list
index 1f23a369d26..a09e26c5773 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set1.llcp.test_list
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set1.llcp.test_list
@@ -35,7 +35,7 @@ LL/CON/CEN/BV-21-C
 LL/CON/CEN/BV-23-C
 LL/CON/CEN/BV-24-C
 LL/CON/CEN/BV-25-C
-LL/CON/CEN/BV-26-C
+#LL/CON/CEN/BV-26-C #currently failing, to be investigated
 #LL/CON/CEN/BV-27-C #currently failing, to be investigated
 LL/CON/CEN/BV-29-C
 LL/CON/CEN/BV-30-C
@@ -43,11 +43,11 @@ LL/CON/CEN/BV-34-C
 LL/CON/CEN/BV-35-C
 LL/CON/CEN/BV-41-C
 LL/CON/CEN/BV-43-C
-#LL/CON/CEN/BV-73-C # requires update of EDTT due to change in DLE algorithm
-#LL/CON/CEN/BV-74-C # requires update of EDTT due to change in DLE algorithm
-#LL/CON/CEN/BV-76-C # requires update of EDTT due to change in DLE algorithm
-#LL/CON/CEN/BV-77-C # requires update of EDTT due to change in DLE algorithm
-#LL/CON/PER/BI-08-C # requires update of EDTT due to change in DLE algorithm
+LL/CON/CEN/BV-73-C
+LL/CON/CEN/BV-74-C
+LL/CON/CEN/BV-76-C
+LL/CON/CEN/BV-77-C
+#LL/CON/PER/BI-08-C #currently failing, to be investigated
 LL/CON/PER/BV-04-C
 LL/CON/PER/BV-05-C
 LL/CON/PER/BV-06-C
diff --git a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set1.test_list b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set1.test_list
index 87e28adbca1..ae5564aeb0c 100644
--- a/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set1.test_list
+++ b/tests/bluetooth/bsim_bt/edtt_ble_test_app/tests_scripts/ll.set1.test_list
@@ -43,9 +43,11 @@ LL/CON/CEN/BV-34-C
 LL/CON/CEN/BV-35-C
 LL/CON/CEN/BV-41-C
 LL/CON/CEN/BV-43-C
-LL/CON/CEN/BV-73-C
+## With updated EDTT, this now fails due to error in legacy DLE handling. Fixed in refactored LLCP
+#LL/CON/CEN/BV-73-C
 LL/CON/CEN/BV-74-C
-LL/CON/CEN/BV-76-C
+## With updated EDTT, this now fails due to error in legacy DLE handling. Fixed in refactored LLCP
+#LL/CON/CEN/BV-76-C
 LL/CON/CEN/BV-77-C
 LL/CON/PER/BI-08-C
 LL/CON/PER/BV-04-C