diff --git a/tests/bluetooth/controller/common/defaults_cmake.txt b/tests/bluetooth/controller/common/defaults_cmake.txt
index d1c35ba56b05566..28d6a8e4bdb529a 100644
--- a/tests/bluetooth/controller/common/defaults_cmake.txt
+++ b/tests/bluetooth/controller/common/defaults_cmake.txt
@@ -19,7 +19,7 @@ include_directories(
 FILE(GLOB ll_sw_sources
   ${ZEPHYR_BASE}/subsys/bluetooth/controller/util/mem.c
   ${ZEPHYR_BASE}/subsys/bluetooth/controller/util/memq.c
-  ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_chan.c
+	${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_chan.c
   ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_tx_queue.c
   ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp_local.c
   ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp_remote.c
@@ -31,7 +31,8 @@ FILE(GLOB ll_sw_sources
   ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp_chmu.c
   ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp_cc.c
   ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp.c
-  ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_conn.c
+	${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_conn.c
+	${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ll_addr.c
 )
 
 FILE(GLOB mock_sources
@@ -41,16 +42,15 @@ FILE(GLOB mock_sources
   ${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/lll.c
   ${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/lll_conn.c
   ${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/ll_assert.c
-  ${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/assert.c
-  ${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/util.c
-  ${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/ticker.c
-  ${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/ull.c
-  ${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/ull_conn_iso.c
-  ${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/ull_peripheral.c
-  ${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/ull_peripheral_iso.c
-  ${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/ull_central.c
-  ${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/ull_scan.c
-  ${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/lll_clock.c
+	${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/util.c
+	${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/ticker.c
+	${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/ull.c
+	${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/ull_conn_iso.c
+	${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/ull_peripheral.c
+	${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/ull_peripheral_iso.c
+	${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/ull_central.c
+	${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/ull_scan.c
+	${ZEPHYR_BASE}/tests/bluetooth/controller/mock_ctrl/src/lll_clock.c
 )
 
 FILE(GLOB common_sources
@@ -58,4 +58,10 @@ FILE(GLOB common_sources
   ${ZEPHYR_BASE}/tests/bluetooth/controller/common/src/helper_util.c
 )
 
+add_definitions(-include kconfig.h)
+if(KCONFIG_OVERRIDE_FILE)
+  add_definitions(-include ${KCONFIG_OVERRIDE_FILE})
+endif()
+
 add_definitions(-include ztest.h)
+add_definitions(-include soc.h)
diff --git a/tests/bluetooth/controller/common/unit_sources.txt b/tests/bluetooth/controller/common/unit_sources.txt
index f4d29e62b7994c6..33ccebe0b7879ab 100644
--- a/tests/bluetooth/controller/common/unit_sources.txt
+++ b/tests/bluetooth/controller/common/unit_sources.txt
@@ -19,19 +19,9 @@ include_directories(
 FILE(GLOB unit_sources
   ${ZEPHYR_BASE}/subsys/bluetooth/controller/util/mem.c
   ${ZEPHYR_BASE}/subsys/bluetooth/controller/util/memq.c
-  ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_chan.c
   ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_tx_queue.c
-  ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp_local.c
-  ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp_remote.c
-  ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp_pdu.c
-  ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp_common.c
-  ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp_phy.c
-  ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp_enc.c
-  ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp_conn_upd.c
-  ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp_chmu.c
-  ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp_cc.c
-  ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp.c
   ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_conn.c
+  ${ZEPHYR_BASE}/subsys/bluetooth/controller/ll_sw/ull_llcp*.c
 )
 
 add_definitions(-include ztest.h)
diff --git a/tests/bluetooth/controller/ctrl_feature_exchange/Kconfig b/tests/bluetooth/controller/ctrl_feature_exchange/Kconfig
index f59daf15eb52672..190f946de857acb 100644
--- a/tests/bluetooth/controller/ctrl_feature_exchange/Kconfig
+++ b/tests/bluetooth/controller/ctrl_feature_exchange/Kconfig
@@ -16,16 +16,16 @@ config BT_CTLR_PHY_UPDATE_SUPPORT
        default y
 
 config BT_CTLR_PHY_CODED_SUPPORT
-	bool
-	default y
+       bool
+       default y
 
 config BT_CTLR_PHY_2M_SUPPORT
-	bool
-	default y
+       bool
+       default y
 
 config ENTROPY_NRF_FORCE_ALT
-       bool
-       default n
+        bool
+	 default n
 
 config DT_HAS_NORDIC_NRF_RNG_ENABLED
        bool
diff --git a/tests/bluetooth/controller/mock_ctrl/include/kconfig.h b/tests/bluetooth/controller/mock_ctrl/include/kconfig.h
index 2eddf40c33e1164..6a7758345b914eb 100644
--- a/tests/bluetooth/controller/mock_ctrl/include/kconfig.h
+++ b/tests/bluetooth/controller/mock_ctrl/include/kconfig.h
@@ -182,3 +182,4 @@
 #define CONFIG_BT_BUF_ACL_TX_COUNT 7
 #define CONFIG_BT_BUF_ACL_TX_SIZE 251
 #define CONFIG_BT_CTLR_RX_BUFFERS 7
+#define CONFIG_NET_BUF_USER_DATA_SIZE 8