diff --git a/py-scripts/test_ipv4_connection.py b/py-scripts/test_ipv4_connection.py
index 5242f5bd..2b1e1acb 100755
--- a/py-scripts/test_ipv4_connection.py
+++ b/py-scripts/test_ipv4_connection.py
@@ -43,8 +43,7 @@ class IPv4Test(LFCliBase):
 
     def build(self):
         # Build stations
-        if self.security == "wpa2":
-            self.station_profile.use_wpa2(True, self.ssid, self.password)
+        self.station_profile.use_security(self.security, self.ssid, self.password)
         self.station_profile.set_number_template(self.number_template)
         print("Creating stations")
         self.station_profile.set_command_flag("add_sta", "create_admin_down", 1)
diff --git a/py-scripts/test_ipv4_l4.py b/py-scripts/test_ipv4_l4.py
index 03407e73..2c3bf77e 100755
--- a/py-scripts/test_ipv4_l4.py
+++ b/py-scripts/test_ipv4_l4.py
@@ -83,8 +83,7 @@ class IPV4L4(LFCliBase):
 
     def build(self):
         # Build stations
-        if self.security == "wpa2":
-            self.station_profile.use_wpa2(True, self.ssid, self.password)
+        self.station_profile.use_security(self.security, self.ssid, self.password)
         self.station_profile.set_number_template(self.number_template)
         print("Creating stations")
         self.station_profile.set_command_flag("add_sta", "create_admin_down", 1)
diff --git a/py-scripts/test_ipv4_l4_urls_per_ten.py b/py-scripts/test_ipv4_l4_urls_per_ten.py
index 28281d2c..69340b1c 100755
--- a/py-scripts/test_ipv4_l4_urls_per_ten.py
+++ b/py-scripts/test_ipv4_l4_urls_per_ten.py
@@ -79,8 +79,7 @@ class IPV4L4(LFCliBase):
 
     def build(self):
         # Build stations
-        if self.security == "wpa2":
-            self.station_profile.use_wpa2(True, self.ssid, self.password)
+        self.station_profile.use_security(self.security, self.ssid, self.password)
         self.station_profile.set_number_template(self.number_template)
         print("Creating stations")
         self.station_profile.set_command_flag("add_sta", "create_admin_down", 1)
diff --git a/py-scripts/test_ipv4_variable_time.py b/py-scripts/test_ipv4_variable_time.py
index 043bedb5..ce45bbed 100755
--- a/py-scripts/test_ipv4_variable_time.py
+++ b/py-scripts/test_ipv4_variable_time.py
@@ -134,8 +134,7 @@ class IPV4VariableTime(LFCliBase):
                                            debug=self.debug)
 
     def build(self):
-        if self.security == "wpa2":
-            self.station_profile.use_wpa2(True, self.ssid, self.password)
+        self.station_profile.use_security(self.security, self.ssid, self.password)
         self.station_profile.set_number_template(self.number_template)
         print("Creating stations")
         self.station_profile.set_command_flag("add_sta", "create_admin_down", 1)
diff --git a/py-scripts/test_ipv6_connection.py b/py-scripts/test_ipv6_connection.py
index be24f1df..3b3ee89f 100755
--- a/py-scripts/test_ipv6_connection.py
+++ b/py-scripts/test_ipv6_connection.py
@@ -44,8 +44,7 @@ class IPv6Test(LFCliBase):
         self.station_profile.mode = 0
 
     def build(self):
-        if self.security == "wpa2":
-            self.station_profile.use_wpa2(True, self.ssid, self.password)
+        self.station_profile.use_security(self.security, self.ssid, self.password)
         self.profile.set_number_template(self.prefix)
         print("Creating stations")
         self.profile.set_command_flag("add_sta", "create_admin_down", 1)
diff --git a/py-scripts/test_ipv6_variable_time.py b/py-scripts/test_ipv6_variable_time.py
index 56178d09..c647ab95 100755
--- a/py-scripts/test_ipv6_variable_time.py
+++ b/py-scripts/test_ipv6_variable_time.py
@@ -136,8 +136,7 @@ class IPV6VariableTime(LFCliBase):
                                            debug=self.debug)
 
     def build(self):
-        if self.security == "wpa2":
-            self.station_profile.use_wpa2(True, self.ssid, self.password)
+        self.station_profile.use_security(self.security, self.ssid, self.password)
         self.station_profile.set_number_template(self.number_template)
         print("Creating stations")
         self.station_profile.set_command_flag("add_sta", "create_admin_down", 1)