diff --git a/autotests/testScan/hw.conf b/autotests/testScan/hw.conf
index b2464baf..660c874e 100644
--- a/autotests/testScan/hw.conf
+++ b/autotests/testScan/hw.conf
@@ -1,9 +1,10 @@
 [SETUP]
-num_radios=5
+num_radios=6
 start_iwd=0
 
 [HOSTAPD]
-rad0=ssid_hidden.conf
-rad1=ssid_open.conf
-rad2=ssid_8021x.conf
-rad3=ssid_psk.conf
+rad0=ssid_hidden_0.conf
+rad1=ssid_hidden_1.conf
+rad2=ssid_open.conf
+rad3=ssid_8021x.conf
+rad4=ssid_psk.conf
diff --git a/autotests/testScan/periodic_scan_test.py b/autotests/testScan/periodic_scan_test.py
index 3252f79f..439b844d 100644
--- a/autotests/testScan/periodic_scan_test.py
+++ b/autotests/testScan/periodic_scan_test.py
@@ -12,11 +12,7 @@ class Test(unittest.TestCase):
         'ssid_open': False,
         'ssid_psk': False,
         'ssid_8021x': False,
-        'ssid_hidden_5': False,
-        'ssid_hidden_6': False,
-        'ssid_hidden_7': False,
-        'ssid_hidden_8': False,
-        'ssid_hidden_9': False,
+        'ssid_hidden_1': False,
     }
 
     def set_network(self, ssid):
@@ -61,11 +57,7 @@ class Test(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
-        IWD.copy_to_storage('ssid_hidden_5.open')
-        IWD.copy_to_storage('ssid_hidden_6.open')
-        IWD.copy_to_storage('ssid_hidden_7.open')
-        IWD.copy_to_storage('ssid_hidden_8.open')
-        IWD.copy_to_storage('ssid_hidden_9.open')
+        IWD.copy_to_storage('ssid_hidden_1.open')
 
     @classmethod
     def tearDownClass(cls):
diff --git a/autotests/testScan/requested_scan_test.py b/autotests/testScan/requested_scan_test.py
index 3858b4f5..69297f27 100644
--- a/autotests/testScan/requested_scan_test.py
+++ b/autotests/testScan/requested_scan_test.py
@@ -15,10 +15,6 @@ class Test(unittest.TestCase):
         'ssid_psk': False,
         'ssid_8021x': False,
         'ssid_hidden_0': False,
-        'ssid_hidden_1': False,
-        'ssid_hidden_2': False,
-        'ssid_hidden_3': False,
-        'ssid_hidden_4': False,
     }
 
     def set_network(self, ssid):
@@ -63,10 +59,6 @@ class Test(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         IWD.copy_to_storage('ssid_hidden_0.open')
-        IWD.copy_to_storage('ssid_hidden_1.open')
-        IWD.copy_to_storage('ssid_hidden_2.open')
-        IWD.copy_to_storage('ssid_hidden_3.open')
-        IWD.copy_to_storage('ssid_hidden_4.open')
 
     @classmethod
     def tearDownClass(cls):
diff --git a/autotests/testScan/ssid_hidden.conf b/autotests/testScan/ssid_hidden.conf
deleted file mode 100644
index 2dfed56f..00000000
--- a/autotests/testScan/ssid_hidden.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-ssid=ssid_hidden_0
-interface=wln0
-hw_mode=g
-channel=1
-ignore_broadcast_ssid=1
-
-bss=wln0_1
-ssid=ssid_hidden_1
-ignore_broadcast_ssid=1
-
-bss=wln0_2
-ssid=ssid_hidden_2
-ignore_broadcast_ssid=1
-
-bss=wln0_3
-ssid=ssid_hidden_3
-ignore_broadcast_ssid=1
-
-bss=wln0_4
-ssid=ssid_hidden_4
-ignore_broadcast_ssid=1
-
-bss=wln0_5
-ssid=ssid_hidden_5
-ignore_broadcast_ssid=1
-
-bss=wln0_6
-ssid=ssid_hidden_6
-ignore_broadcast_ssid=1
-
-bss=wln0_7
-ssid=ssid_hidden_7
-ignore_broadcast_ssid=1
-
-bss=wln0_8
-ssid=ssid_hidden_8
-ignore_broadcast_ssid=1
-
-bss=wln0_9
-ssid=ssid_hidden_9
-ignore_broadcast_ssid=1
diff --git a/autotests/testScan/ssid_hidden_0.conf b/autotests/testScan/ssid_hidden_0.conf
new file mode 100644
index 00000000..5d15e360
--- /dev/null
+++ b/autotests/testScan/ssid_hidden_0.conf
@@ -0,0 +1,4 @@
+ssid=ssid_hidden_0
+hw_mode=g
+channel=1
+ignore_broadcast_ssid=1
diff --git a/autotests/testScan/ssid_hidden_1.conf b/autotests/testScan/ssid_hidden_1.conf
new file mode 100644
index 00000000..cc11803f
--- /dev/null
+++ b/autotests/testScan/ssid_hidden_1.conf
@@ -0,0 +1,4 @@
+ssid=ssid_hidden_1
+hw_mode=g
+channel=1
+ignore_broadcast_ssid=1
diff --git a/autotests/testScan/ssid_hidden_2.open b/autotests/testScan/ssid_hidden_2.open
deleted file mode 100644
index 28622594..00000000
--- a/autotests/testScan/ssid_hidden_2.open
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-AutoConnect=false
-Hidden=true
diff --git a/autotests/testScan/ssid_hidden_3.open b/autotests/testScan/ssid_hidden_3.open
deleted file mode 100644
index 28622594..00000000
--- a/autotests/testScan/ssid_hidden_3.open
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-AutoConnect=false
-Hidden=true
diff --git a/autotests/testScan/ssid_hidden_4.open b/autotests/testScan/ssid_hidden_4.open
deleted file mode 100644
index 28622594..00000000
--- a/autotests/testScan/ssid_hidden_4.open
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-AutoConnect=false
-Hidden=true
diff --git a/autotests/testScan/ssid_hidden_5.open b/autotests/testScan/ssid_hidden_5.open
deleted file mode 100644
index 28622594..00000000
--- a/autotests/testScan/ssid_hidden_5.open
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-AutoConnect=false
-Hidden=true
diff --git a/autotests/testScan/ssid_hidden_6.open b/autotests/testScan/ssid_hidden_6.open
deleted file mode 100644
index 28622594..00000000
--- a/autotests/testScan/ssid_hidden_6.open
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-AutoConnect=false
-Hidden=true
diff --git a/autotests/testScan/ssid_hidden_7.open b/autotests/testScan/ssid_hidden_7.open
deleted file mode 100644
index 28622594..00000000
--- a/autotests/testScan/ssid_hidden_7.open
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-AutoConnect=false
-Hidden=true
diff --git a/autotests/testScan/ssid_hidden_8.open b/autotests/testScan/ssid_hidden_8.open
deleted file mode 100644
index 28622594..00000000
--- a/autotests/testScan/ssid_hidden_8.open
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-AutoConnect=false
-Hidden=true
diff --git a/autotests/testScan/ssid_hidden_9.open b/autotests/testScan/ssid_hidden_9.open
deleted file mode 100644
index 28622594..00000000
--- a/autotests/testScan/ssid_hidden_9.open
+++ /dev/null
@@ -1,3 +0,0 @@
-[Settings]
-AutoConnect=false
-Hidden=true