diff --git a/test/pts/gap_central_test.c b/test/pts/gap_central_test.c
index a18f766f5..f169877b0 100644
--- a/test/pts/gap_central_test.c
+++ b/test/pts/gap_central_test.c
@@ -183,9 +183,9 @@ static uint8_t ui_presentation_format[7];
 static uint16_t ui_aggregate_handle;
 static uint16_t handle = 0;
 
-//static bd_addr_t public_pts_address = {0x00, 0x1B, 0xDC, 0x07, 0x32, 0xef};
+static bd_addr_t public_pts_address = {0x00, 0x1B, 0xDC, 0x07, 0x32, 0xef};
 //static bd_addr_t public_pts_address = {0x00, 0x1B, 0xDC, 0x08, 0xe2, 0x72};
-static bd_addr_t public_pts_address = {0x00, 0x1B, 0xDC, 0x08, 0xe2, 0x5C};
+//static bd_addr_t public_pts_address = {0x00, 0x1B, 0xDC, 0x08, 0xe2, 0x5C};
 
 static int       public_pts_address_type = 0;
 static bd_addr_t current_pts_address;
@@ -1452,6 +1452,7 @@ static int ui_process_data_request(char buffer){
 
 static void ui_process_command(char buffer){
     int res;
+    int i;
     switch (buffer){
         case '1':
             printf("Enabling non-resolvable private address\n");
@@ -1541,7 +1542,9 @@ static void ui_process_command(char buffer){
             break;
         case 'F':
             printf("Drop bonding information\n");
-            le_device_db_remove(le_device_db_index);
+            for (i=0;i<le_device_db_max_count();i++){
+                 le_device_db_remove(le_device_db_index);
+            }
             gap_drop_link_key_for_bd_addr(public_pts_address);
             break;
         case 'H':
diff --git a/test/pts/gap_peripheral_test.c b/test/pts/gap_peripheral_test.c
index a4b089384..0e1019fcc 100644
--- a/test/pts/gap_peripheral_test.c
+++ b/test/pts/gap_peripheral_test.c
@@ -133,9 +133,9 @@ static void show_usage(void);
 static void update_advertisements(void);
 
 
-// static bd_addr_t tester_address = {0x00, 0x1B, 0xDC, 0x06, 0x07, 0x5F};
 static bd_addr_t tester_address = {0x00, 0x1B, 0xDC, 0x07, 0x32, 0xef};
-static bd_addr_t tester_address2 = {0x00, 0x1B, 0xDC, 0x08, 0xe2, 0x72};
+// static bd_addr_t tester_address = {0x00, 0x1B, 0xDC, 0x06, 0x07, 0x5F};
+// static bd_addr_t tester_address = {0x00, 0x1B, 0xDC, 0x08, 0xe2, 0x72};
 static int tester_address_type = 0;
 
 // general discoverable flags
@@ -875,7 +875,7 @@ static void stdin_process(char c){
         }
         return;
     }
-
+    int i;
     switch (c){
         case 'a':
             printf("a - advertisements off\n");
@@ -968,7 +968,6 @@ static void stdin_process(char c){
         case 'q':
             printf("Add PTS to whitelist");
             gap_whitelist_add(tester_address_type, tester_address);
-            gap_whitelist_add(tester_address_type, tester_address2);
             break;
         case '1':
         case '2':
@@ -1132,9 +1131,10 @@ static void stdin_process(char c){
             break;
         case 'F':
             printf("Drop bonding information\n");
-            le_device_db_remove(le_device_db_index);
+            for (i=0;i<le_device_db_max_count();i++){
+                le_device_db_remove(le_device_db_index);
+            }
             gap_drop_link_key_for_bd_addr(tester_address);
-            gap_drop_link_key_for_bd_addr(tester_address2);
             break;
         case '\n':
         case '\r':