diff --git a/server/site_tests/bluetooth_AdapterAdvMonitor/bluetooth_AdapterAdvMonitor.py b/server/site_tests/bluetooth_AdapterAdvMonitor/bluetooth_AdapterAdvMonitor.py
index 40724b2..be6ca89 100644
--- a/server/site_tests/bluetooth_AdapterAdvMonitor/bluetooth_AdapterAdvMonitor.py
+++ b/server/site_tests/bluetooth_AdapterAdvMonitor/bluetooth_AdapterAdvMonitor.py
@@ -46,13 +46,31 @@
         self.advmon_test_pattern_filter_only()
 
 
-    @test_wrapper('Single Client Tests',
+    @test_wrapper('Single Client Tests - Pattern Filter 1',
                   devices={'BLE_KEYBOARD':1, 'BLE_MOUSE':1})
-    def advmon_single_client_tests(self):
+    def advmon_single_client_tests_pattern_filter_1(self):
         """Tests monitor functionality for single client."""
         self.advmon_test_pattern_filter_1()
+
+
+    @test_wrapper('Single Client Tests - RSSI Filter 1',
+                  devices={'BLE_KEYBOARD':1, 'BLE_MOUSE':1})
+    def advmon_single_client_tests_rssi_filter_1(self):
+        """Tests monitor functionality for single client."""
         self.advmon_test_rssi_filter_1()
+
+
+    @test_wrapper('Single Client Tests - RSSI Filter 2',
+                  devices={'BLE_KEYBOARD':1, 'BLE_MOUSE':1})
+    def advmon_single_client_tests_rssi_filter_2(self):
+        """Tests monitor functionality for single client."""
         self.advmon_test_rssi_filter_2()
+
+
+    @test_wrapper('Single Client Tests - RSSI Filter 3',
+                  devices={'BLE_KEYBOARD':1, 'BLE_MOUSE':1})
+    def advmon_single_client_tests_rssi_filter_3(self):
+        """Tests monitor functionality for single client."""
         self.advmon_test_rssi_filter_3()
 
 
@@ -110,7 +128,10 @@
         """
         self.advmon_monitor_health_tests()
         self.advmon_pattern_filter_tests()
-        self.advmon_single_client_tests()
+        self.advmon_single_client_tests_pattern_filter_1()
+        self.advmon_single_client_tests_rssi_filter_1()
+        self.advmon_single_client_tests_rssi_filter_2()
+        self.advmon_single_client_tests_rssi_filter_3()
         self.advmon_multi_client_tests()
         self.advmon_fg_bg_combination_tests()
         self.advmon_suspend_resume_tests()
diff --git a/server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests b/server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests_pattern_filter_1
similarity index 84%
copy from server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests
copy to server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests_pattern_filter_1
index 5e3cc20..6dad8fe 100644
--- a/server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests
+++ b/server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests_pattern_filter_1
@@ -1,11 +1,11 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Copyright 2021 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from autotest_lib.server import utils
 
 AUTHOR = 'chromeos-bluetooth'
-NAME = 'bluetooth_AdapterAdvMonitor.advmon_single_client_tests'
+NAME = 'bluetooth_AdapterAdvMonitor.advmon_single_client_tests_pattern_filter_1'
 PURPOSE = ('batch of Bluetooth Advertisement Monitor tests')
 CRITERIA = 'All tests should pass'
 TIME = 'MEDIUM'
diff --git a/server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests b/server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests_rssi_filter_1
similarity index 85%
rename from server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests
rename to server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests_rssi_filter_1
index 5e3cc20..9d3e952 100644
--- a/server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests
+++ b/server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests_rssi_filter_1
@@ -1,11 +1,11 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Copyright 2021 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from autotest_lib.server import utils
 
 AUTHOR = 'chromeos-bluetooth'
-NAME = 'bluetooth_AdapterAdvMonitor.advmon_single_client_tests'
+NAME = 'bluetooth_AdapterAdvMonitor.advmon_single_client_tests_rssi_filter_1'
 PURPOSE = ('batch of Bluetooth Advertisement Monitor tests')
 CRITERIA = 'All tests should pass'
 TIME = 'MEDIUM'
diff --git a/server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests b/server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests_rssi_filter_2
similarity index 85%
copy from server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests
copy to server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests_rssi_filter_2
index 5e3cc20..4ad2b5d 100644
--- a/server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests
+++ b/server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests_rssi_filter_2
@@ -1,11 +1,11 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Copyright 2021 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from autotest_lib.server import utils
 
 AUTHOR = 'chromeos-bluetooth'
-NAME = 'bluetooth_AdapterAdvMonitor.advmon_single_client_tests'
+NAME = 'bluetooth_AdapterAdvMonitor.advmon_single_client_tests_rssi_filter_2'
 PURPOSE = ('batch of Bluetooth Advertisement Monitor tests')
 CRITERIA = 'All tests should pass'
 TIME = 'MEDIUM'
diff --git a/server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests b/server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests_rssi_filter_3
similarity index 85%
copy from server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests
copy to server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests_rssi_filter_3
index 5e3cc20..8d3cf55 100644
--- a/server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests
+++ b/server/site_tests/bluetooth_AdapterAdvMonitor/control.advmon_single_client_tests_rssi_filter_3
@@ -1,11 +1,11 @@
-# Copyright 2020 The Chromium OS Authors. All rights reserved.
+# Copyright 2021 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 from autotest_lib.server import utils
 
 AUTHOR = 'chromeos-bluetooth'
-NAME = 'bluetooth_AdapterAdvMonitor.advmon_single_client_tests'
+NAME = 'bluetooth_AdapterAdvMonitor.advmon_single_client_tests_rssi_filter_3'
 PURPOSE = ('batch of Bluetooth Advertisement Monitor tests')
 CRITERIA = 'All tests should pass'
 TIME = 'MEDIUM'