diff --git a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
index bd9bf0d..7c2dd5d 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11a
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_check11a'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 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 74ea932..80a6395 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11b
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_check11b'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 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 6d9e71b..89c38ef 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check11g
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_check11g'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 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 6631e6e..d5b5b9c 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_PEAP
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_check1x_PEAP'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_release'
 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 a643bf4..aff1c0b 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_TTLS
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_check1x_TTLS'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_release'
 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 8a6a945..af500f0 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WEP
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_check1x_WEP'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_release'
 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 f6c052d..c803a2f 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check1x_WPA
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_check1x_WPA'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_release'
 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 d0a3e97..9a61e28 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT20
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_check24HT20'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 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 f67a020..9530b86 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check24HT40
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_check24HT40'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_release'
 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 5c6bd4b2..1104a1e 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT20
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_check5HT20'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 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 c65bf6c..1cbd30e 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_check5HT40
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_check5HT40'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 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 2808e64..424e90d 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHidden
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_checkHidden'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 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 d6b1afa..cfc6918 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWEP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWEP
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_checkHiddenWEP'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_flaky, wifi_android_correctness'
+SUITE = 'wifi_flaky, wifi_android_correctness, wifi_release'
 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 26fc884..0b5a56e 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkHiddenWPA
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_checkHiddenWPA'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 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 c160950..027d6e2 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkMixedWPA
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_checkMixedWPA'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 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 6efda03..8d086d5 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkNonAsciiSSID
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_checkNonAsciiSSID'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 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 b264ddc..a6ff841 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkOddWPAPassphrases
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_checkOddWPAPassphrases'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_release'
 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 6eb2246..87dc969 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkRawPMK
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_checkRawPMK'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_release'
 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 8968248..eb87dce 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkSSIDLimits
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_checkSSIDLimits'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 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 17b3d41..15e90b6 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP104
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_checkWEP104'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 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 6247779..2a456f3 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWEP40
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_checkWEP40'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 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 6fe481f..79b9d52 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA2'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 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 c2eb3cd..ebd7dcd 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA2_PMF
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA2_CCMP_PMF'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc'
+SUITE = 'wifi_matfunc, wifi_release'
 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 1653085..21d7464 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_CCMP
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA_CCMP'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 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 4d53f6a..456dd28 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_TKIP
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA_TKIP'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 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 20ebfd6..8dc7454 100644
--- a/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
+++ b/server/site_tests/network_WiFi_SimpleConnect/control.wifi_checkWPA_multi
@@ -6,7 +6,7 @@
 NAME = 'network_WiFi_SimpleConnect.wifi_checkWPA_multi'
 TIME = 'SHORT'
 TEST_TYPE = 'Server'
-SUITE = 'wifi_matfunc, wifi_android_correctness'
+SUITE = 'wifi_matfunc, wifi_android_correctness, wifi_release'
 DEPENDENCIES = 'wificell'
 
 DOC = """
diff --git a/test_suites/control.wifi_release b/test_suites/control.wifi_release
new file mode 100644
index 0000000..538dc3d
--- /dev/null
+++ b/test_suites/control.wifi_release
@@ -0,0 +1,39 @@
+# Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+AUTHOR = 'krisr@chromium.org'
+NAME = 'wifi_release'
+PURPOSE = 'Group of WiFi tests that are run against a release candidate'
+CRITERIA = 'Run a set of tests against a given release candidate.'
+
+TIME = 'SHORT'
+TEST_CATEGORY = 'General'
+TEST_CLASS = 'suite'
+TEST_TYPE = 'Server'
+
+DOC = """
+This suite is used for release candidate verification.
+
+@param build: The name of the image to test.
+          Ex: x86-mario-release/R17-1412.33.0-a1-b29
+@param board: The board to test on. Ex: x86-mario
+@param pool: The pool of machines to utilize for scheduling. If pool=None
+             board is used.
+@param check_hosts: require appropriate live hosts to exist in the lab.
+@param SKIP_IMAGE: (optional) If present and True, don't re-image devices.
+@param file_bugs: If True your suite will file bugs on failures.
+@param max_run_time: Amount of time each test shoud run in minutes.
+"""
+
+import common
+from autotest_lib.server.cros import provision
+from autotest_lib.server.cros.dynamic_suite import dynamic_suite
+
+dynamic_suite.reimage_and_run(
+    build=build, board=board, name=NAME, job=job, pool=pool,
+    check_hosts=check_hosts, add_experimental=True, num=num,
+    file_bugs=file_bugs, priority=priority, timeout_mins=timeout_mins,
+    max_runtime_mins=60, devserver_url=devserver_url,
+    version_prefix=provision.CROS_VERSION_PREFIX,
+    wait_for_results=wait_for_results)