diff --git a/tests/bdd/ha-bhyve02/test_NAS_T0965.py b/tests/bdd/ha-bhyve02/test_NAS_T0965.py
index 22f549c25e1..f85cfd34cdd 100644
--- a/tests/bdd/ha-bhyve02/test_NAS_T0965.py
+++ b/tests/bdd/ha-bhyve02/test_NAS_T0965.py
@@ -151,11 +151,6 @@ def the_service_page_should_open(driver):
 def if_the_smb_service_is_not_started_start_the_service(driver):
     """If the SMB service is not started start the service."""
     assert wait_on_element(driver, 7, '//services')
-    assert wait_on_element(driver, 7, '//button[@ix-auto="button__S3_Actions"]')
-    # Scroll to SMB service
-    element = driver.find_element_by_xpath('//button[@ix-auto="button__S3_Actions"]')
-    driver.execute_script("arguments[0].scrollIntoView();", element)
-    time.sleep(1)
     assert wait_on_element(driver, 7, '//div[@ix-auto="overlay__SMB_Running"]', 'clickable')
     value_exist = attribute_value_exist(driver, '//mat-slide-toggle[@ix-auto="slider__SMB_Running"]', 'class', 'mat-checked')
     if not value_exist:
diff --git a/tests/bdd/ha-bhyve02/test_NAS_T0968.py b/tests/bdd/ha-bhyve02/test_NAS_T0968.py
index 174b26a8ccb..f95e1a3c9a6 100644
--- a/tests/bdd/ha-bhyve02/test_NAS_T0968.py
+++ b/tests/bdd/ha-bhyve02/test_NAS_T0968.py
@@ -149,12 +149,7 @@ def the_service_page_should_open(driver):
 def if_the_smb_service_is_not_started_start_the_service(driver):
     """If the SMB service is not started start the service."""
     assert wait_on_element(driver, 7, '//services')
-    assert wait_on_element(driver, 7, '//button[@ix-auto="button__S3_Actions"]')
-    # Scroll to SMB service
-    element = driver.find_element_by_xpath('//button[@ix-auto="button__S3_Actions"]')
-    driver.execute_script("arguments[0].scrollIntoView();", element)
-    time.sleep(1)
-    driver.find_element_by_xpath('//div[@ix-auto="value__SMB"]')
+    assert wait_on_element(driver, 7, '//div[@ix-auto="overlay__SMB_Running"]', 'clickable')
     value_exist = attribute_value_exist(driver, '//mat-slide-toggle[@ix-auto="slider__SMB_Running"]', 'class', 'mat-checked')
     if not value_exist:
         driver.find_element_by_xpath('//div[@ix-auto="overlay__SMB_Running"]').click()
diff --git a/tests/bdd/ha-bhyve02/test_NAS_T0971.py b/tests/bdd/ha-bhyve02/test_NAS_T0971.py
index 71758ce5318..311b4ffbe71 100644
--- a/tests/bdd/ha-bhyve02/test_NAS_T0971.py
+++ b/tests/bdd/ha-bhyve02/test_NAS_T0971.py
@@ -149,12 +149,7 @@ def the_service_page_should_open(driver):
 def if_the_smb_service_is_not_started_start_the_service(driver):
     """If the SMB service is not started start the service."""
     assert wait_on_element(driver, 7, '//services')
-    assert wait_on_element(driver, 7, '//button[@ix-auto="button__S3_Actions"]')
-    # Scroll to SMB service
-    element = driver.find_element_by_xpath('//button[@ix-auto="button__S3_Actions"]')
-    driver.execute_script("arguments[0].scrollIntoView();", element)
-    time.sleep(1)
-    driver.find_element_by_xpath('//div[@ix-auto="value__SMB"]')
+    assert wait_on_element(driver, 7, '//div[@ix-auto="overlay__SMB_Running"]', 'clickable')
     value_exist = attribute_value_exist(driver, '//mat-slide-toggle[@ix-auto="slider__SMB_Running"]', 'class', 'mat-checked')
     if not value_exist:
         driver.find_element_by_xpath('//div[@ix-auto="overlay__SMB_Running"]').click()