diff --git a/android/pts-gap.txt b/android/pts-gap.txt
index af75dff..22a3c29 100644
--- a/android/pts-gap.txt
+++ b/android/pts-gap.txt
@@ -397,14 +397,30 @@ TC_DM_LEP_BV_05_C	PASS	btmgmt find -b
 TC_DM_LEP_BV_06_C	PASS
 TC_DM_LEP_BV_07_C	PASS
 TC_DM_LEP_BV_08_C	PASS
-TC_DM_LEP_BV_09_C	INC	JIRA #BA-64
-TC_DM_LEP_BV_10_C	INC	haltest:
-				gattc listen 1
-				gattc listen 1 0
+TC_DM_LEP_BV_09_C	PASS	haltest:
+				bluetooth enable
+				bluetooth set_adapter_property
+					BT_PROPERTY_ADAPTER_SCAN_MODE
+					BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE
+				gattc register_client
 				bluetooth start_discovery
-				bluetooth cancel_discovery
-				gattc listen 1
-				gattc listen 1 0
-				bluetooth create_bond
-TC_DM_LEP_BV_11_C	INC
+				gattc connect
+				l2test -n -P 31 <PTS addr>
+				disconnect
+TC_DM_LEP_BV_10_C	PASS	haltest:
+				bluetooth enable
+				bluetooth set_adapter_property
+					BT_PROPERTY_ADAPTER_SCAN_MODE
+					BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE
+				gattc register_client
+				gattc listen
+				bluetooth start_discovery
+				l2test -n -P 31 <PTS addr>
+TC_DM_LEP_BV_11_C	PASS	haltest:
+				bluetooth enable
+				bluetooth set_adapter_property
+					BT_PROPERTY_ADAPTER_SCAN_MODE
+					BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE
+				gattc register_client
+				gattc connect
 -------------------------------------------------------------------------------