subsystem: Add subsystem:wifi label to SimpleConnect tests as CQ HWTest sanity.

BUG=None
TEST=will test this CL with another CL

Change-Id: Iee9c9e5ac6361d67ec003bf5f4d6558cc3043c1a
Reviewed-on: https://chromium-review.googlesource.com/336272
Commit-Ready: Tien Chang <tienchang@chromium.org>
Tested-by: Tien Chang <tienchang@chromium.org>
Reviewed-by: Shuqian Zhao <shuqianz@chromium.org>
Reviewed-by: Kris Rambish <krisr@chromium.org>
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
index 6909e0d..29b2cc4 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
index 7ee1937..98fafd8 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
index 641d240..5cad60d 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, suite:wifi_matfunc_bcm4371,'
-              'suite:wifi_release, suite:wificell-pre-cq')
+              'suite:wifi_release, subsystem:wifi, suite:wificell-pre-cq')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP
index e89948a..abfdf66 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_bcm4371, '
-              'suite:wifi_release')
+              'suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS
index 6d3cc66..8394095 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_bcm4371, '
-              'suite:wifi_release, suite:wificell-pre-cq')
+              'suite:wifi_release, subsystem:wifi, suite:wificell-pre-cq')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
index 749a530..b753e7e 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_bcm4371, '
-              'suite:wifi_release')
+              'suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
index 0850183..4dd2466 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_bcm4371, '
-              'suite:wifi_release')
+              'suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
index f014328..b5aa2e5 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
index 4d74eb7..c2fab86 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_bcm4371, '
-              'suite:wifi_release')
+              'suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
index e83d0d5..2686a54 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
index 57a34cb..b07ea3e 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80
index 24b5bdf..5ad371d 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5VHT80
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkDFS b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkDFS
index c1043ed..0bf2fe5 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkDFS
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkDFS
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
index 10fb244..f292db8 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWEP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWEP
index b86afa4..57240a9 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWEP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWEP
@@ -6,7 +6,8 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_checkHiddenWEP'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-ATTRIBUTES = "suite:wifi_correctness_cros_core, suite:wifi_flaky, suite:wifi_release"
+ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_flaky, '
+              'suite:wifi_matfunc, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
index 0a9b995..cc4387c 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
index b962e38..be12b65 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID
index b064545..15a7bf8 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases
index 081a671..365f8f8 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_bcm4371, '
-              'suite:wifi_release')
+              'suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK
index 9ff74d5..55756ab 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_bcm4371, '
-              'suite:wifi_release')
+              'suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits
index 0f7b8a6..b533116 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkTruncatedBeacon b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkTruncatedBeacon
index 7c93ae3..fe5bf99 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkTruncatedBeacon
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkTruncatedBeacon
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
index 26fb45a..a27fbc7 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
index 418cd44..4511e1f 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2 b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
index 57b58d9..9234a1f 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
index f644a9b..788e253 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_bcm4371, '
-              'suite:wifi_release')
+              'suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_TKIP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_TKIP
index e5e6f24..4ee81ea 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_TKIP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_TKIP
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_matfunc, suite:wifi_matfunc_bcm4371, '
-              'suite:wifi_release')
+              'suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
index 618a20f..07fe9b2 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
index ddcd130..5814375 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
index 578cb12..4102c7a 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
@@ -7,7 +7,7 @@
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
 ATTRIBUTES = ('suite:wifi_correctness_cros_core, suite:wifi_matfunc, '
-              'suite:wifi_matfunc_bcm4371, suite:wifi_release')
+              'suite:wifi_matfunc_bcm4371, suite:wifi_release, subsystem:wifi')
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/site_utils/attribute_whitelist.txt b/site_utils/attribute_whitelist.txt
index abe387e..efe7023 100644
--- a/site_utils/attribute_whitelist.txt
+++ b/site_utils/attribute_whitelist.txt
@@ -143,3 +143,4 @@
 suite:youtube_mse_eme
 suite:youtube_page
 subsystem:default
+subsystem:wifi