diff --git a/server/site_tests/network_WiFi_ChannelHop/control b/server/site_tests/network_WiFi_ChannelHop/control
index a18b4b7..727e7ea 100644
--- a/server/site_tests/network_WiFi_ChannelHop/control
+++ b/server/site_tests/network_WiFi_ChannelHop/control
@@ -6,7 +6,7 @@
 TIME = 'SHORT'
 NAME = 'network_WiFi_ChannelHop'
 TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_flaky')
+ATTRIBUTES = ('suite:wifi_matfunc')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SSIDSwitchBack/control b/server/site_tests/network_WiFi_SSIDSwitchBack/control
index c496a9d..1700d34 100644
--- a/server/site_tests/network_WiFi_SSIDSwitchBack/control
+++ b/server/site_tests/network_WiFi_SSIDSwitchBack/control
@@ -6,7 +6,7 @@
 TIME = 'SHORT'
 NAME = 'network_WiFi_SSIDSwitchBack'
 TEST_TYPE = 'Server'
-ATTRIBUTES = ('suite:wifi_flaky')
+ATTRIBUTES = ('suite:wifi_matfunc')
 DEPENDENCIES = 'wificell'
 
 DOC = """