diff --git a/src/index.html b/src/index.html
index fb1644d..65ce5bc 100644
--- a/src/index.html
+++ b/src/index.html
@@ -2873,7 +2873,7 @@ <h1>
             <label class="control control-radio">
                 <span lang="en">Listen to Ruuvi sensors only (default)</span>
                 <span lang="fi">Kuuntele ainoastaan Ruuvi-antureita (oletus)</span>
-                <input type="radio" name="company_use_filtering" value="1" checked>
+                <input type="radio" id="company_use_filtering_default" name="company_use_filtering" value="1" checked>
                 <span class="control_indicator"></span>
             </label>
 
@@ -2891,7 +2891,7 @@ <h2>
                     <label class="control control-radio info-icon-container">
                         <span lang="en">Filter Bluetooth messages by manufacturer ID</span>
                         <span lang="fi">Suodata Bluetooth-viestit valmistajan tunnuksen mukaan</span>
-                        <input type="radio" name="company_use_filtering" value="2">
+                        <input type="radio" id="company_use_filtering_by_id" name="company_use_filtering" value="2">
                         <span class="control_indicator"></span>
                     </label>
                 </div>
@@ -2919,7 +2919,7 @@ <h3>
                     <label class="control control-radio">
                         <span lang="en">Listen to all Bluetooth beacon messages (not just Ruuvi sensors)</span>
                         <span lang="fi">Kuuntele kaikkia Bluetooth-majakkaviestejä (ei ainoastaan Ruuvi-antureita)</span>
-                        <input type="radio" name="company_use_filtering" value="0">
+                        <input type="radio" id="company_use_filtering_no_id" name="company_use_filtering" value="0">
                         <span class="control_indicator"></span>
                     </label>
                 </div>
diff --git a/tests/test_http.yaml b/tests/test_http.yaml
index 62a69ce..560e569 100644
--- a/tests/test_http.yaml
+++ b/tests/test_http.yaml
@@ -91,11 +91,13 @@ pages:
 
   - page: "#page-ntp_config"
     steps:
+      - do: selectRadio "#ntp_sync_default"  # Select radio 'Use default set of time servers (NTP servers) for time synchronisation'
       - do: clickAndNavigate "#page-ntp_config-button-continue"  # Click on 'Next' button
 
   - page: "#page-scanning"
     steps:
       - do: waitUntilLoaded 15000  # Wait until loaded
+      - do: selectRadio "#company_use_filtering_default"  # Select radio 'Listen to Ruuvi sensors only (default)'
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"
diff --git a/tests/test_http_with_auth.yaml b/tests/test_http_with_auth.yaml
index b8c07bc..75e9d35 100644
--- a/tests/test_http_with_auth.yaml
+++ b/tests/test_http_with_auth.yaml
@@ -103,11 +103,13 @@ pages:
 
   - page: "#page-ntp_config"
     steps:
+      - do: selectRadio "#ntp_sync_default"  # Select radio 'Use default set of time servers (NTP servers) for time synchronisation'
       - do: clickAndNavigate "#page-ntp_config-button-continue"  # Click on 'Next' button
 
   - page: "#page-scanning"
     steps:
       - do: waitUntilLoaded 15000  # Wait until loaded
+      - do: selectRadio "#company_use_filtering_default"  # Select radio 'Listen to Ruuvi sensors only (default)'
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"
diff --git a/tests/test_https_with_server_and_client_cert_checking.yaml b/tests/test_https_with_server_and_client_cert_checking.yaml
index 73ec6d8..846499c 100644
--- a/tests/test_https_with_server_and_client_cert_checking.yaml
+++ b/tests/test_https_with_server_and_client_cert_checking.yaml
@@ -106,11 +106,13 @@ pages:
 
   - page: "#page-ntp_config"
     steps:
+      - do: selectRadio "#ntp_sync_default"  # Select radio 'Use default set of time servers (NTP servers) for time synchronisation'
       - do: clickAndNavigate "#page-ntp_config-button-continue"  # Click on 'Next' button
 
   - page: "#page-scanning"
     steps:
       - do: waitUntilLoaded 15000  # Wait until loaded
+      - do: selectRadio "#company_use_filtering_default"  # Select radio 'Listen to Ruuvi sensors only (default)'
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"
diff --git a/tests/test_https_with_server_cert_checking.yaml b/tests/test_https_with_server_cert_checking.yaml
index 4dea0a4..bc1cb22 100644
--- a/tests/test_https_with_server_cert_checking.yaml
+++ b/tests/test_https_with_server_cert_checking.yaml
@@ -91,11 +91,13 @@ pages:
 
   - page: "#page-ntp_config"
     steps:
+      - do: selectRadio "#ntp_sync_default"  # Select radio 'Use default set of time servers (NTP servers) for time synchronisation'
       - do: clickAndNavigate "#page-ntp_config-button-continue"  # Click on 'Next' button
 
   - page: "#page-scanning"
     steps:
       - do: waitUntilLoaded 15000  # Wait until loaded
+      - do: selectRadio "#company_use_filtering_default"  # Select radio 'Listen to Ruuvi sensors only (default)'
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"
diff --git a/tests/test_mqtt_aws.yaml b/tests/test_mqtt_aws.yaml
index 4476c72..74ce0cc 100644
--- a/tests/test_mqtt_aws.yaml
+++ b/tests/test_mqtt_aws.yaml
@@ -100,11 +100,13 @@ pages:
 
   - page: "#page-ntp_config"
     steps:
+      - do: selectRadio "#ntp_sync_default"  # Select radio 'Use default set of time servers (NTP servers) for time synchronisation'
       - do: clickAndNavigate "#page-ntp_config-button-continue"  # Click on 'Next' button
 
   - page: "#page-scanning"
     steps:
       - do: waitUntilLoaded 15000  # Wait until loaded
+      - do: selectRadio "#company_use_filtering_default"  # Select radio 'Listen to Ruuvi sensors only (default)'
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"
diff --git a/tests/test_mqtt_ssl.yaml b/tests/test_mqtt_ssl.yaml
index ddf181a..99bd41d 100644
--- a/tests/test_mqtt_ssl.yaml
+++ b/tests/test_mqtt_ssl.yaml
@@ -88,11 +88,13 @@ pages:
 
   - page: "#page-ntp_config"
     steps:
+      - do: selectRadio "#ntp_sync_default"  # Select radio 'Use default set of time servers (NTP servers) for time synchronisation'
       - do: clickAndNavigate "#page-ntp_config-button-continue"  # Click on 'Next' button
 
   - page: "#page-scanning"
     steps:
       - do: waitUntilLoaded 15000  # Wait until loaded
+      - do: selectRadio "#company_use_filtering_default"  # Select radio 'Listen to Ruuvi sensors only (default)'
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"
diff --git a/tests/test_mqtt_tcp.yaml b/tests/test_mqtt_tcp.yaml
index f9bd5de..f1d9e1a 100644
--- a/tests/test_mqtt_tcp.yaml
+++ b/tests/test_mqtt_tcp.yaml
@@ -87,11 +87,13 @@ pages:
 
   - page: "#page-ntp_config"
     steps:
+      - do: selectRadio "#ntp_sync_default"  # Select radio 'Use default set of time servers (NTP servers) for time synchronisation'
       - do: clickAndNavigate "#page-ntp_config-button-continue"  # Click on 'Next' button
 
   - page: "#page-scanning"
     steps:
       - do: waitUntilLoaded 15000  # Wait until loaded
+      - do: selectRadio "#company_use_filtering_default"  # Select radio 'Listen to Ruuvi sensors only (default)'
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"
diff --git a/tests/test_mqtt_ws.yaml b/tests/test_mqtt_ws.yaml
index 618622e..9454890 100644
--- a/tests/test_mqtt_ws.yaml
+++ b/tests/test_mqtt_ws.yaml
@@ -88,11 +88,13 @@ pages:
 
   - page: "#page-ntp_config"
     steps:
+      - do: selectRadio "#ntp_sync_default"  # Select radio 'Use default set of time servers (NTP servers) for time synchronisation'
       - do: clickAndNavigate "#page-ntp_config-button-continue"  # Click on 'Next' button
 
   - page: "#page-scanning"
     steps:
       - do: waitUntilLoaded 15000  # Wait until loaded
+      - do: selectRadio "#company_use_filtering_default"  # Select radio 'Listen to Ruuvi sensors only (default)'
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"
diff --git a/tests/test_mqtt_wss.yaml b/tests/test_mqtt_wss.yaml
index b107548..4df81a0 100644
--- a/tests/test_mqtt_wss.yaml
+++ b/tests/test_mqtt_wss.yaml
@@ -88,11 +88,13 @@ pages:
 
   - page: "#page-ntp_config"
     steps:
+      - do: selectRadio "#ntp_sync_default"  # Select radio 'Use default set of time servers (NTP servers) for time synchronisation'
       - do: clickAndNavigate "#page-ntp_config-button-continue"  # Click on 'Next' button
 
   - page: "#page-scanning"
     steps:
       - do: waitUntilLoaded 15000  # Wait until loaded
+      - do: selectRadio "#company_use_filtering_default"  # Select radio 'Listen to Ruuvi sensors only (default)'
       - do: clickAndNavigate "#page-scanning-button-continue"  # Click on 'Next' button
 
   - page: "#page-finished"