Remove EXPERIMENTAL = True from all non-BVT tests.

The EXPERIMENTAL setting is being deprecated; the setting is a no-op
when the test isn't in the BVT and isn't in a suite with `file_bugs`
set to True.  This removes the EXPERIMENTAL setting from control
files where the setting has no effect.

BUG=None
TEST=None

Change-Id: Ic9e26ab0cd229ffbd2cbb340823e9e03b6b7c318
Reviewed-on: https://chromium-review.googlesource.com/199440
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Prashanth B <beeps@chromium.org>
diff --git a/client/site_tests/audio_AudioCorruption/control b/client/site_tests/audio_AudioCorruption/control
index 58cd977..ceafbfa 100644
--- a/client/site_tests/audio_AudioCorruption/control
+++ b/client/site_tests/audio_AudioCorruption/control
@@ -13,7 +13,6 @@
 TEST_CATEGORY = "General"
 TEST_CLASS = "audio"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test verifies Chrome can catch error for playing corrupted mp3 audio.
diff --git a/client/site_tests/autoupdate_CannedOmahaUpdate/control b/client/site_tests/autoupdate_CannedOmahaUpdate/control
index 7b0b55e..201ac0b 100644
--- a/client/site_tests/autoupdate_CannedOmahaUpdate/control
+++ b/client/site_tests/autoupdate_CannedOmahaUpdate/control
@@ -15,6 +15,5 @@
 TEST_CLASS = 'platform'
 TEST_CATEGORY = 'Functional'
 TEST_TYPE = 'client'
-EXPERIMENTAL = True
 
 job.run_test('autoupdate_CannedOmahaUpdate')
diff --git a/client/site_tests/bluetooth_RegressionClient/control b/client/site_tests/bluetooth_RegressionClient/control
index f3466cb..de7ab6d 100644
--- a/client/site_tests/bluetooth_RegressionClient/control
+++ b/client/site_tests/bluetooth_RegressionClient/control
@@ -8,7 +8,6 @@
 TEST_CATEGORY = "Benchmark"
 TEST_CLASS = "bluetooth"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 
 DOC = """
diff --git a/client/site_tests/cellular_OutOfCreditsSubscriptionState/control b/client/site_tests/cellular_OutOfCreditsSubscriptionState/control
index b30aff1..1faddcb 100644
--- a/client/site_tests/cellular_OutOfCreditsSubscriptionState/control
+++ b/client/site_tests/cellular_OutOfCreditsSubscriptionState/control
@@ -17,7 +17,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "network"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 DOC = """
   Tests that shill marks a cellular service as out-of-credits according to the
   modem subscription state by using a pseudomodem.
diff --git a/client/site_tests/cellular_ServiceName/control b/client/site_tests/cellular_ServiceName/control
index 4c5f456..974ac6e 100644
--- a/client/site_tests/cellular_ServiceName/control
+++ b/client/site_tests/cellular_ServiceName/control
@@ -14,7 +14,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "network"
 TEST_TYPE = "client"
-EXPERIMENTAL = "true"
 
 DOC = """
   Tests that shill reports the correct service name depending on the SIM
diff --git a/client/site_tests/desktopui_HangDetector/control b/client/site_tests/desktopui_HangDetector/control
index b0a3280..ad1210f 100644
--- a/client/site_tests/desktopui_HangDetector/control
+++ b/client/site_tests/desktopui_HangDetector/control
@@ -4,7 +4,6 @@
 
 AUTHOR = "cmasone@chromium.org"
 NAME = "desktopui_HangDetector"
-EXPERIMENTAL = "True"
 SUITE = "regression"
 TIME = "FAST"
 TEST_TYPE = "client"
diff --git a/client/site_tests/desktopui_UrlFetchWithChromeDriver/control.bvt b/client/site_tests/desktopui_UrlFetchWithChromeDriver/control.bvt
index 8c04bd4..b3f768f 100644
--- a/client/site_tests/desktopui_UrlFetchWithChromeDriver/control.bvt
+++ b/client/site_tests/desktopui_UrlFetchWithChromeDriver/control.bvt
@@ -15,7 +15,6 @@
 #SUITE = "bvt"
 TEST_CLASS = "desktopui"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test opens a new browser to the given URL and waits for the specified
diff --git a/client/site_tests/dummy_Pass/control b/client/site_tests/dummy_Pass/control
index 1be9b7f..4e2a42d 100644
--- a/client/site_tests/dummy_Pass/control
+++ b/client/site_tests/dummy_Pass/control
@@ -7,7 +7,6 @@
 PURPOSE = "Demonstrate success methods of autotests."
 CRITERIA = "This test will always succeed."
 SUITE = "something_else, dummy, dummyclientretries, push_to_prod"
-EXPERIMENTAL = "True"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "dummy"
diff --git a/client/site_tests/dummy_Pass/control.experimental b/client/site_tests/dummy_Pass/control.experimental
index 8ae925e..6293042 100644
--- a/client/site_tests/dummy_Pass/control.experimental
+++ b/client/site_tests/dummy_Pass/control.experimental
@@ -7,7 +7,6 @@
 PURPOSE = "Demonstrate success methods of autotests."
 CRITERIA = "This test will always succeed."
 SUITE = "something_else, dummy, dummyclientretries"
-EXPERIMENTAL = "True"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "dummy"
diff --git a/client/site_tests/enterprise_InstallAttributes/control b/client/site_tests/enterprise_InstallAttributes/control
index 818ac8f..423b814 100755
--- a/client/site_tests/enterprise_InstallAttributes/control
+++ b/client/site_tests/enterprise_InstallAttributes/control
@@ -10,7 +10,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "Enterprise"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test verifies that taking device ownership creates the
diff --git a/client/site_tests/graphics_GLBench/control b/client/site_tests/graphics_GLBench/control
index 3d78a18..c437921 100644
--- a/client/site_tests/graphics_GLBench/control
+++ b/client/site_tests/graphics_GLBench/control
@@ -18,7 +18,6 @@
 TEST_CATEGORY = 'Performance'
 TEST_CLASS = "gl"
 TEST_TYPE = 'client'
-EXPERIMENTAL = 'True'
 
 DOC = """
 This benchmark executes glbench, a graphics benchmark designed to time how long
diff --git a/client/site_tests/graphics_LibDRM/control b/client/site_tests/graphics_LibDRM/control
index 7d8b9b0..9ffc3d3 100644
--- a/client/site_tests/graphics_LibDRM/control
+++ b/client/site_tests/graphics_LibDRM/control
@@ -14,7 +14,6 @@
 TEST_TYPE = "client"
 
 SUITE = "graphics"
-EXPERIMENTAL = "True"
 
 DOC = """
 Runs libdrm test apps.
diff --git a/client/site_tests/graphics_SyncControlTest/control b/client/site_tests/graphics_SyncControlTest/control
index 2d2ec13..e5d0cba 100644
--- a/client/site_tests/graphics_SyncControlTest/control
+++ b/client/site_tests/graphics_SyncControlTest/control
@@ -27,7 +27,6 @@
 situation where we have written new prototype code. The GLX side currently is a
 no-op that will always succeed.
 """
-EXPERIMENTAL='True'
 SYNC_COUNT='1'
 TIME='FAST'
 TEST_CATEGORY = 'Functional'
diff --git a/client/site_tests/graphics_VTSwitch/control b/client/site_tests/graphics_VTSwitch/control
index 9cdfd92..8886715 100644
--- a/client/site_tests/graphics_VTSwitch/control
+++ b/client/site_tests/graphics_VTSwitch/control
@@ -19,7 +19,6 @@
 TEST_TYPE = "client"
 
 SUITE = "graphics"
-EXPERIMENTAL = "True"
 
 DOC = """
 Switches between VT1 and VT2 repeatedly and logs in/out of Chrome to make sure
diff --git a/client/site_tests/graphics_WebGLAquarium/control b/client/site_tests/graphics_WebGLAquarium/control
index eefe489..9822913 100644
--- a/client/site_tests/graphics_WebGLAquarium/control
+++ b/client/site_tests/graphics_WebGLAquarium/control
@@ -11,7 +11,6 @@
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "graphics"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 This runs the WebGL aquarium test.
diff --git a/client/site_tests/hardware_SAT/control.hwqual b/client/site_tests/hardware_SAT/control.hwqual
index 59c30fc..96b70a5 100644
--- a/client/site_tests/hardware_SAT/control.hwqual
+++ b/client/site_tests/hardware_SAT/control.hwqual
@@ -23,7 +23,6 @@
 """
 NAME = 'hardware_SAT 10 minutes'
 SUITE = 'hwqual'
-EXPERIMENTAL = 'True'
 TEST_CLASS = 'hardware'
 TEST_CATEGORY = 'Stress'
 TEST_TYPE = 'client'
diff --git a/client/site_tests/kernel_CrosECSysfs/control b/client/site_tests/kernel_CrosECSysfs/control
index c14fdf4..425a55e 100644
--- a/client/site_tests/kernel_CrosECSysfs/control
+++ b/client/site_tests/kernel_CrosECSysfs/control
@@ -7,7 +7,6 @@
 PURPOSE = 'Test cros_ec driver and sysfs interface'
 CRITERIA = 'Fails if EC sysfs interface is not present'
 TIME = 'SHORT'
-EXPERIMENTAL = 'True'
 SUITE = 'kernel_daily_regression'
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'kernel'
diff --git a/client/site_tests/kernel_LTP/control.full b/client/site_tests/kernel_LTP/control.full
index 0585649..0131813 100755
--- a/client/site_tests/kernel_LTP/control.full
+++ b/client/site_tests/kernel_LTP/control.full
@@ -6,7 +6,6 @@
 AUTHOR = "The Chromium OS Authors,chromeos-kernel-test@google.com"
 TIME = "LONG"
 SUITE = "kernel_weekly_regression"
-EXPERIMENTAL = "True"
 TEST_CATEGORY = "FUNCTIONAL"
 TEST_CLASS = "KERNEL"
 TEST_TYPE = "CLIENT"
diff --git a/client/site_tests/kernel_LTP/control.kernel_tests b/client/site_tests/kernel_LTP/control.kernel_tests
index 492fc29..3087bf7 100644
--- a/client/site_tests/kernel_LTP/control.kernel_tests
+++ b/client/site_tests/kernel_LTP/control.kernel_tests
@@ -6,7 +6,6 @@
 AUTHOR = "The Chromium OS Authors,chromeos-kernel-test@google.com"
 TIME = "MEDIUM"
 SUITE = "kernel_weekly_regression"
-EXPERIMENTAL = "True"
 TEST_CATEGORY = "FUNCTIONAL"
 TEST_CLASS = "KERNEL"
 TEST_TYPE = "CLIENT"
diff --git a/client/site_tests/kernel_LTP/control.kernel_unittests b/client/site_tests/kernel_LTP/control.kernel_unittests
index 19a8f4a..fe9fbed 100644
--- a/client/site_tests/kernel_LTP/control.kernel_unittests
+++ b/client/site_tests/kernel_LTP/control.kernel_unittests
@@ -6,7 +6,6 @@
 AUTHOR = "The Chromium OS Authors,chromeos-kernel-test@google.com"
 TIME = "MEDIUM"
 SUITE = "kernel_weekly_regression"
-EXPERIMENTAL = "True"
 TEST_CATEGORY = "FUNCTIONAL"
 TEST_CLASS = "KERNEL"
 TEST_TYPE = "CLIENT"
diff --git a/client/site_tests/login_ChromeProfileSanitary/control b/client/site_tests/login_ChromeProfileSanitary/control
index 547275f..ef9ad31 100644
--- a/client/site_tests/login_ChromeProfileSanitary/control
+++ b/client/site_tests/login_ChromeProfileSanitary/control
@@ -9,7 +9,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "login"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test checks that a browser crash during a user session does not cause the
diff --git a/client/site_tests/network_3GScanningProperty/control b/client/site_tests/network_3GScanningProperty/control
index 2c4953b..62c5a25 100644
--- a/client/site_tests/network_3GScanningProperty/control
+++ b/client/site_tests/network_3GScanningProperty/control
@@ -15,7 +15,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "network"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 DOC = """
 Test that the |Scanning| Property of the shill cellular device object is
 updated correctly in the following two scenarios:
diff --git a/client/site_tests/network_3GSmokeTest/control.wardmodem_e362 b/client/site_tests/network_3GSmokeTest/control.wardmodem_e362
index 3d26ef8..c5e6c88 100644
--- a/client/site_tests/network_3GSmokeTest/control.wardmodem_e362
+++ b/client/site_tests/network_3GSmokeTest/control.wardmodem_e362
@@ -14,7 +14,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "network"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 DOC = """
   Tests that 3G modem can connect to the network
 
diff --git a/client/site_tests/network_ChromeCellularNetworkPresent/control b/client/site_tests/network_ChromeCellularNetworkPresent/control
index 21d71de..43006ae 100644
--- a/client/site_tests/network_ChromeCellularNetworkPresent/control
+++ b/client/site_tests/network_ChromeCellularNetworkPresent/control
@@ -10,7 +10,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "network"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 
diff --git a/client/site_tests/network_ChromeCellularNetworkProperties/control b/client/site_tests/network_ChromeCellularNetworkProperties/control
index c52ae2c..e932626 100644
--- a/client/site_tests/network_ChromeCellularNetworkProperties/control
+++ b/client/site_tests/network_ChromeCellularNetworkProperties/control
@@ -10,7 +10,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "network"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 DOC = """
 
 This test configures the cellular pseudomodem in various ways and makes sure
diff --git a/client/site_tests/network_ChromeCellularSmokeTest/control b/client/site_tests/network_ChromeCellularSmokeTest/control
index 7740f7e..f35b33d 100644
--- a/client/site_tests/network_ChromeCellularSmokeTest/control
+++ b/client/site_tests/network_ChromeCellularSmokeTest/control
@@ -14,7 +14,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "network"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 DOC = """
   Tests that Chrome can bring the network to a connected state and effectively
   access the internet through the cellular network. The test repeats a
diff --git a/client/site_tests/network_ChromeWifiConfigure/control b/client/site_tests/network_ChromeWifiConfigure/control
index 95aa5af..f2d25c5 100644
--- a/client/site_tests/network_ChromeWifiConfigure/control
+++ b/client/site_tests/network_ChromeWifiConfigure/control
@@ -14,7 +14,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "network"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 DOC = """
   Tests that Chrome can do the following using chrome.networkingPrivate:
   * Configure a new wifi network with Security = psk.
diff --git a/client/site_tests/network_ChromeWifiTDLS/control b/client/site_tests/network_ChromeWifiTDLS/control
index 1c31a12..9252e13 100644
--- a/client/site_tests/network_ChromeWifiTDLS/control
+++ b/client/site_tests/network_ChromeWifiTDLS/control
@@ -13,7 +13,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "network"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 DOC = """
   Tests that Shill responds to a Device.PerformTDLSOperation call via the
   networikingPrivate API. It does not assume that configuration will actually
diff --git a/client/site_tests/network_DisableInterface/control.pseudomodem b/client/site_tests/network_DisableInterface/control.pseudomodem
index 930381f..0a99feb 100644
--- a/client/site_tests/network_DisableInterface/control.pseudomodem
+++ b/client/site_tests/network_DisableInterface/control.pseudomodem
@@ -11,7 +11,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "network"
 TEST_TYPE = "client"
-EXPERIMENTAL = "true"
 
 DOC = """
 This test depends on the ifconfig utility to both disable and reenable a
diff --git a/client/site_tests/network_SIMLocking/control b/client/site_tests/network_SIMLocking/control
index 79de1de..6ea7473 100644
--- a/client/site_tests/network_SIMLocking/control
+++ b/client/site_tests/network_SIMLocking/control
@@ -15,7 +15,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "network"
 TEST_TYPE = "client"
-EXPERIMENTAL = True
 
 DOC = """
 Test the SIM locking functionality of shill.
diff --git a/client/site_tests/platform_ChromeCgroups/control b/client/site_tests/platform_ChromeCgroups/control
index df78a59..64e2623 100644
--- a/client/site_tests/platform_ChromeCgroups/control
+++ b/client/site_tests/platform_ChromeCgroups/control
@@ -11,7 +11,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test verifies that the chrome_renderers foreground and background
diff --git a/client/site_tests/platform_KernelVersionByBoard/control b/client/site_tests/platform_KernelVersionByBoard/control
index 96ddca6..5bd5aa3 100644
--- a/client/site_tests/platform_KernelVersionByBoard/control
+++ b/client/site_tests/platform_KernelVersionByBoard/control
@@ -10,7 +10,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test contains a list of expected kernel versions per board (e.g. '3.4')
diff --git a/client/site_tests/platform_Pkcs11Events/control.regression b/client/site_tests/platform_Pkcs11Events/control.regression
index 63d5e4e..218f4f3 100644
--- a/client/site_tests/platform_Pkcs11Events/control.regression
+++ b/client/site_tests/platform_Pkcs11Events/control.regression
@@ -6,7 +6,6 @@
 NAME = "platform_Pkcs11Events"
 PURPOSE = "Tests the response of the PKCS #11 system to login events."
 CRITERIA = "Fails if the PKCS #11 system does not respond correctly to events."
-EXPERIMENTAL = "True"
 SUITE = "regression"
 TIME = "SHORT"
 TEST_CATEGORY = "Stress"
diff --git a/client/site_tests/platform_TPMEvict/control b/client/site_tests/platform_TPMEvict/control
index 3feba1a..9e68951 100644
--- a/client/site_tests/platform_TPMEvict/control
+++ b/client/site_tests/platform_TPMEvict/control
@@ -6,7 +6,6 @@
 NAME = "platform_TPMEvict"
 PURPOSE = "Tests the TPM under low-resource conditions."
 CRITERIA = "Fails if any operations fail."
-EXPERIMENTAL = "True"
 SUITE = "regression"
 TIME = "SHORT"
 TEST_CATEGORY = "Stress"
diff --git a/client/site_tests/power_AudioDetector/control.10s b/client/site_tests/power_AudioDetector/control.10s
index 5d405d3..5acd983 100644
--- a/client/site_tests/power_AudioDetector/control.10s
+++ b/client/site_tests/power_AudioDetector/control.10s
@@ -16,7 +16,6 @@
 TEST_CLASS = "power"
 TEST_TYPE = "client"
 # SUITE = "kernel_per-build_regression"
-# EXPERIMENTAL = "True"
 
 DOC = """
 This test verifies that the system will not suspend while audio is playing.
diff --git a/client/site_tests/power_BacklightSuspend/control b/client/site_tests/power_BacklightSuspend/control
index 6ebd067..4954c22 100644
--- a/client/site_tests/power_BacklightSuspend/control
+++ b/client/site_tests/power_BacklightSuspend/control
@@ -12,7 +12,6 @@
 TEST_TYPE = "client"
 
 SUITE = "kernel_per-build_regression"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test requests a brightness level to be set after resume.  It then triggers
diff --git a/client/site_tests/power_CameraSuspend/control b/client/site_tests/power_CameraSuspend/control
index d68bcdb..854a20b 100644
--- a/client/site_tests/power_CameraSuspend/control
+++ b/client/site_tests/power_CameraSuspend/control
@@ -10,7 +10,6 @@
 TEST_CLASS = "power"
 TEST_TYPE = "client"
 DEPENDENCIES = "webcam"
-EXPERIMENTAL = "True"
 
 DOC = """
 Suspend the system with the camera device open.
diff --git a/client/site_tests/power_CheckAfterSuspend/control.TPMCheckStress b/client/site_tests/power_CheckAfterSuspend/control.TPMCheckStress
index 5d016a9..98c7e10 100644
--- a/client/site_tests/power_CheckAfterSuspend/control.TPMCheckStress
+++ b/client/site_tests/power_CheckAfterSuspend/control.TPMCheckStress
@@ -11,7 +11,6 @@
 TEST_CATEGORY = "Stress,Reliability"
 TEST_CLASS = "Hardware"
 TEST_TYPE = "Client"
-EXPERIMENTAL = "True"
 
 DOC = """
     A check of the state of the TPM (Trusted Platform Module) after S3 Resume
diff --git a/client/site_tests/power_CheckAfterSuspend/control.per_build b/client/site_tests/power_CheckAfterSuspend/control.per_build
index bbfdfc7..33176f8 100644
--- a/client/site_tests/power_CheckAfterSuspend/control.per_build
+++ b/client/site_tests/power_CheckAfterSuspend/control.per_build
@@ -11,7 +11,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "Hardware"
 TEST_TYPE = "Client"
-EXPERIMENTAL = "True"
 
 DOC = """
     A check of the state of the system after S3 Resume
diff --git a/client/site_tests/power_FlashVideoSuspend/control b/client/site_tests/power_FlashVideoSuspend/control
index 4af8493..8e6c18d 100644
--- a/client/site_tests/power_FlashVideoSuspend/control
+++ b/client/site_tests/power_FlashVideoSuspend/control
@@ -9,7 +9,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "power"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 Suspends the system with a video playing.
diff --git a/client/site_tests/power_IdleSuspend/control b/client/site_tests/power_IdleSuspend/control
index 9589d43..170e7ad 100644
--- a/client/site_tests/power_IdleSuspend/control
+++ b/client/site_tests/power_IdleSuspend/control
@@ -9,7 +9,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "power"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 Tests that powerd tries to suspend when the system is idle.
diff --git a/client/site_tests/power_KernelSuspend/control b/client/site_tests/power_KernelSuspend/control
index fe07c5a..588197e 100644
--- a/client/site_tests/power_KernelSuspend/control
+++ b/client/site_tests/power_KernelSuspend/control
@@ -11,7 +11,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "power"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 Simple system suspend. This is the most basic suspend test.
diff --git a/client/site_tests/power_MemorySuspend/control b/client/site_tests/power_MemorySuspend/control
index 9f0c2b2..db17217 100644
--- a/client/site_tests/power_MemorySuspend/control
+++ b/client/site_tests/power_MemorySuspend/control
@@ -9,7 +9,6 @@
 TEST_CATEGORY = "Regression"
 TEST_CLASS = "power"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 Memory suspend test: uses the memory_suspend_test binary to fill all
diff --git a/client/site_tests/power_SuspendStress/control.audio b/client/site_tests/power_SuspendStress/control.audio
index 43c92bf..a9af806 100644
--- a/client/site_tests/power_SuspendStress/control.audio
+++ b/client/site_tests/power_SuspendStress/control.audio
@@ -10,7 +10,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "power"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 Runs eight minutes of suspend/resume cycles in the background of an audio tone.
diff --git a/client/site_tests/power_SuspendStress/control.bare b/client/site_tests/power_SuspendStress/control.bare
index bf939b9..0aefed2 100644
--- a/client/site_tests/power_SuspendStress/control.bare
+++ b/client/site_tests/power_SuspendStress/control.bare
@@ -10,7 +10,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "power"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 Runs eight minutes of bare suspend/resume cycles without additional workload.
diff --git a/client/site_tests/power_SuspendStress/control.disk b/client/site_tests/power_SuspendStress/control.disk
index afc3a3f..6c23b0e 100644
--- a/client/site_tests/power_SuspendStress/control.disk
+++ b/client/site_tests/power_SuspendStress/control.disk
@@ -10,7 +10,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "power"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 Runs eight minutes of suspend/resume cycles in the background of a file I/O bench.
diff --git a/client/site_tests/power_SuspendStress/control.idle b/client/site_tests/power_SuspendStress/control.idle
index 1e77d1e..5d860c9 100644
--- a/client/site_tests/power_SuspendStress/control.idle
+++ b/client/site_tests/power_SuspendStress/control.idle
@@ -10,7 +10,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "power"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 Runs eight minutes of suspend/resume tests where suspend is triggered by idling.
diff --git a/client/site_tests/power_SuspendStress/control.video b/client/site_tests/power_SuspendStress/control.video
index d4d3db0..f11c8d7 100644
--- a/client/site_tests/power_SuspendStress/control.video
+++ b/client/site_tests/power_SuspendStress/control.video
@@ -10,7 +10,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "power"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 Runs eight minutes of suspend/resume cycles in the background of an OpenGL video.
diff --git a/client/site_tests/power_VideoDetector/control b/client/site_tests/power_VideoDetector/control
index e2a7cbb..d2e3450 100644
--- a/client/site_tests/power_VideoDetector/control
+++ b/client/site_tests/power_VideoDetector/control
@@ -14,7 +14,6 @@
 TEST_TYPE = "client"
 
 SUITE = "kernel_daily_regression"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test verifies that the backlight does not get dimmed during video playback.
diff --git a/client/site_tests/power_VideoSuspend/control b/client/site_tests/power_VideoSuspend/control
index fe981c2..eb314ff 100644
--- a/client/site_tests/power_VideoSuspend/control
+++ b/client/site_tests/power_VideoSuspend/control
@@ -9,7 +9,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "power"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 Suspends the system with a video playing.
diff --git a/client/site_tests/power_VideoSuspend/control.multiformat b/client/site_tests/power_VideoSuspend/control.multiformat
index 5bdca1d..e381981 100644
--- a/client/site_tests/power_VideoSuspend/control.multiformat
+++ b/client/site_tests/power_VideoSuspend/control.multiformat
@@ -9,7 +9,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "power"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 Suspends the system with a video playing.
diff --git a/client/site_tests/security_BundledExtensionsTelemetry/control b/client/site_tests/security_BundledExtensionsTelemetry/control
index 0178887..263a002 100644
--- a/client/site_tests/security_BundledExtensionsTelemetry/control
+++ b/client/site_tests/security_BundledExtensionsTelemetry/control
@@ -15,7 +15,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "security"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test uses telemetry to ask Chrome what extensions it has installed,
diff --git a/client/site_tests/telemetry_AFDOGenerateClient/control b/client/site_tests/telemetry_AFDOGenerateClient/control
index 47d6065..4a70779 100644
--- a/client/site_tests/telemetry_AFDOGenerateClient/control
+++ b/client/site_tests/telemetry_AFDOGenerateClient/control
@@ -6,7 +6,6 @@
 NAME = "telemetry_AFDOGenerateClient"
 PURPOSE = "Navigate a set of pages so that a Chrome profile can be captured"
 SUITE = "AFDO_page_replay"
-EXPERIMENTAL = "True"
 TIME = "LONG"
 TEST_CATEGORY = "Benchmark"
 TEST_CLASS = "Chrome AFDO"
diff --git a/client/site_tests/video_ChromeHWDecodeUsed/control.h264 b/client/site_tests/video_ChromeHWDecodeUsed/control.h264
index e4d5b7b..264134e 100644
--- a/client/site_tests/video_ChromeHWDecodeUsed/control.h264
+++ b/client/site_tests/video_ChromeHWDecodeUsed/control.h264
@@ -14,7 +14,6 @@
 TEST_CLASS = "video"
 TEST_TYPE = "client"
 DEPENDENCIES = "hw_video_acc_h264"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test verifies H.264 video decode acceleration works.
diff --git a/client/site_tests/video_ChromeHWDecodeUsed/control.vp8 b/client/site_tests/video_ChromeHWDecodeUsed/control.vp8
index 202d0be..f1fc64a 100644
--- a/client/site_tests/video_ChromeHWDecodeUsed/control.vp8
+++ b/client/site_tests/video_ChromeHWDecodeUsed/control.vp8
@@ -14,7 +14,6 @@
 TEST_CLASS = "video"
 TEST_TYPE = "client"
 DEPENDENCIES = "hw_video_acc_vp8"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test verifies VP8 video decode acceleration works.
diff --git a/client/site_tests/video_VideoCorruption/control.h264 b/client/site_tests/video_VideoCorruption/control.h264
index c7e6c4c..5ed5f31 100644
--- a/client/site_tests/video_VideoCorruption/control.h264
+++ b/client/site_tests/video_VideoCorruption/control.h264
@@ -13,7 +13,6 @@
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test verifies Chrome can catch error for playing corrupted mp4 video.
diff --git a/client/site_tests/video_VideoCorruption/control.vp8 b/client/site_tests/video_VideoCorruption/control.vp8
index 2dddc09..b145498 100644
--- a/client/site_tests/video_VideoCorruption/control.vp8
+++ b/client/site_tests/video_VideoCorruption/control.vp8
@@ -13,7 +13,6 @@
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test verifies Chrome can catch error for playing corrupted webm video.
diff --git a/client/site_tests/video_VideoDecodeMemoryUsage/control.h264 b/client/site_tests/video_VideoDecodeMemoryUsage/control.h264
index 3d0e7cd..dc15ef5 100644
--- a/client/site_tests/video_VideoDecodeMemoryUsage/control.h264
+++ b/client/site_tests/video_VideoDecodeMemoryUsage/control.h264
@@ -10,7 +10,6 @@
 TEST_CATEGORY = 'Performance'
 TEST_CLASS = 'video'
 TEST_TYPE = 'client'
-EXPERIMENTAL = 'True'
 
 DOC = """
 Measure the memory usage in different cases:
diff --git a/client/site_tests/video_VideoDecodeMemoryUsage/control.vp8 b/client/site_tests/video_VideoDecodeMemoryUsage/control.vp8
index f75b805..1b2482e 100644
--- a/client/site_tests/video_VideoDecodeMemoryUsage/control.vp8
+++ b/client/site_tests/video_VideoDecodeMemoryUsage/control.vp8
@@ -10,7 +10,6 @@
 TEST_CATEGORY = 'Performance'
 TEST_CLASS = 'video'
 TEST_TYPE = 'client'
-EXPERIMENTAL = 'True'
 
 DOC = """
 Measure the memory usage in different cases:
diff --git a/client/site_tests/video_VideoSeek/control.h264 b/client/site_tests/video_VideoSeek/control.h264
index 11f720e..296e125 100644
--- a/client/site_tests/video_VideoSeek/control.h264
+++ b/client/site_tests/video_VideoSeek/control.h264
@@ -14,7 +14,6 @@
 TEST_CLASS = "video"
 TEST_TYPE = "client"
 DEPENDENCIES = "hw_video_acc_h264"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test verifies H264 non-resolution-changing video can seek on machines with VDA.
diff --git a/client/site_tests/video_VideoSeek/control.h264.switchres b/client/site_tests/video_VideoSeek/control.h264.switchres
index 9b9a660..7d8e5f4 100644
--- a/client/site_tests/video_VideoSeek/control.h264.switchres
+++ b/client/site_tests/video_VideoSeek/control.h264.switchres
@@ -14,7 +14,6 @@
 TEST_CLASS = "video"
 TEST_TYPE = "client"
 DEPENDENCIES = "hw_video_acc_h264"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test verifies H264 resolution-changing video can seek on machines with VDA.
diff --git a/client/site_tests/video_VideoSeek/control.vp8 b/client/site_tests/video_VideoSeek/control.vp8
index f978649..5b1fd24 100644
--- a/client/site_tests/video_VideoSeek/control.vp8
+++ b/client/site_tests/video_VideoSeek/control.vp8
@@ -14,7 +14,6 @@
 TEST_CLASS = "video"
 TEST_TYPE = "client"
 DEPENDENCIES = "hw_video_acc_vp8"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test verifies VP8 non-resolution-changing video can seek on machines with VDA.
diff --git a/client/site_tests/video_VideoSeek/control.vp8.switchres b/client/site_tests/video_VideoSeek/control.vp8.switchres
index da8149f..95b54a9 100644
--- a/client/site_tests/video_VideoSeek/control.vp8.switchres
+++ b/client/site_tests/video_VideoSeek/control.vp8.switchres
@@ -14,7 +14,6 @@
 TEST_CLASS = "video"
 TEST_TYPE = "client"
 DEPENDENCIES = "hw_video_acc_vp8"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test verifies VP8 resolution-changing video can seek on machines with VDA.
diff --git a/client/tests/aborttest/control b/client/tests/aborttest/control
index f97cfca..fea1d3c 100644
--- a/client/tests/aborttest/control
+++ b/client/tests/aborttest/control
@@ -1,6 +1,4 @@
 AUTHOR = "Martin Bligh <mbligh@google.com>"
-EXPERIMENTAL = 'True'  # Not really, but this is only for testing autotest...
-                       # not testing _with_ autotest.
 NAME = "Abort test"
 TEST_TYPE = "client"
 TEST_CLASS = "General"
diff --git a/client/tests/barriertest/control b/client/tests/barriertest/control
index 2f14f31..68b4edc 100644
--- a/client/tests/barriertest/control
+++ b/client/tests/barriertest/control
@@ -1,6 +1,4 @@
 AUTHOR = "Colby Ranger <cranger@google.com>"
-EXPERIMENTAL = 'True'  # This isn't actually experimental, but it only tests
-                       # autotest itself.
 TIME = "MEDIUM"
 NAME = "Barrier Test"
 TEST_TYPE = "client"
diff --git a/client/tests/btreplay/control b/client/tests/btreplay/control
index 0e2a8e0..11614a3 100644
--- a/client/tests/btreplay/control
+++ b/client/tests/btreplay/control
@@ -1,5 +1,4 @@
 AUTHOR = "Joshua Root <jmr@gelato.unsw.edu.au>"
-EXPERIMENTAL = 'True'  # Change if you use this and it works.  :-)
 NAME = "btreplay"
 TIME = "short"
 TEST_CLASS = "Kernel"
diff --git a/client/tests/cpu_hotplug/control b/client/tests/cpu_hotplug/control
index 826584b..85d17c5 100644
--- a/client/tests/cpu_hotplug/control
+++ b/client/tests/cpu_hotplug/control
@@ -2,7 +2,6 @@
 DOC = 'lhcs_regression: Regression test for CPU hotplug'
 NAME = 'cpu_hotplug'
 TIME = 'MEDIUM' ## ?
-EXPERIMENTAL = 'True'
 TEST_CLASS = 'kernel'
 TEST_CATEGORY = 'Functional'
 TEST_TYPE = 'client'
diff --git a/client/tests/cyclictest/control b/client/tests/cyclictest/control
index 51ce596..5b79b03 100644
--- a/client/tests/cyclictest/control
+++ b/client/tests/cyclictest/control
@@ -5,7 +5,6 @@
 '''
 NAME = 'cyclic_test'
 TIME = 'MEDIUM' ## ?
-EXPERIMENTAL = 'True'
 TEST_CLASS = 'kernel'
 TEST_CATEGORY = 'Functional'
 TEST_TYPE = 'client'
diff --git a/client/tests/dbt2/control b/client/tests/dbt2/control
index 572b527..67269e8 100644
--- a/client/tests/dbt2/control
+++ b/client/tests/dbt2/control
@@ -8,7 +8,6 @@
 currently hardcoded to use PostgreSQL but the kit also supports MySQL.
 """
 TIME="SHORT"
-EXPERIMENTAL = "True"
 
 job.run_test('dbt2', db_type='pgsql', args='-w 1 -c 20 -d 1800 -s 100 -n -z "autotest pgsql"', tag='pgsql')
 job.run_test('dbt2', db_type='pgpool', args='-w 1 -c 20 -d 1800 -s 100 -n -z "autotest pgpool"', tag='pgpool')
diff --git a/client/tests/error_cleanup/control b/client/tests/error_cleanup/control
index efebec2..9edbd16 100644
--- a/client/tests/error_cleanup/control
+++ b/client/tests/error_cleanup/control
@@ -1,6 +1,4 @@
 AUTHOR = "Gregory Smith <gps@google.com>"
-EXPERIMENTAL = 'True'  # Not really, but this is only for testing autotest...
-                       # not testing _with_ autotest.
 NAME = "error test for cleanup phase exception"
 TEST_TYPE = "client"
 TEST_CLASS = "General"
diff --git a/client/tests/error_initialize/control b/client/tests/error_initialize/control
index dbd54bd..0de7af1 100644
--- a/client/tests/error_initialize/control
+++ b/client/tests/error_initialize/control
@@ -1,6 +1,4 @@
 AUTHOR = "Gregory Smith <gps@google.com>"
-EXPERIMENTAL = 'True'  # Not really, but this is only for testing autotest...
-                       # not testing _with_ autotest.
 NAME = "error test for initialize phase exception"
 TEST_TYPE = "client"
 TEST_CLASS = "General"
diff --git a/client/tests/error_setup/control b/client/tests/error_setup/control
index 40d6f9c..c1c662e 100644
--- a/client/tests/error_setup/control
+++ b/client/tests/error_setup/control
@@ -1,6 +1,4 @@
 AUTHOR = "Gregory Smith <gps@google.com>"
-EXPERIMENTAL = 'True'  # Not really, but this is only for testing autotest...
-                       # not testing _with_ autotest.
 NAME = "error test for setup phase exception"
 TEST_TYPE = "client"
 TEST_CLASS = "General"
diff --git a/client/tests/error_skip_step/control b/client/tests/error_skip_step/control
index 7d1f7ee..043b9be 100644
--- a/client/tests/error_skip_step/control
+++ b/client/tests/error_skip_step/control
@@ -1,6 +1,4 @@
 AUTHOR = 'Gregory P. Smith <gps@google.com>'
-EXPERIMENTAL = 'True'  # Not really, but this is only for testing autotest...
-                       # not testing _with_ autotest.
 NAME = 'error test, make sure TestNAError skips steps in step enginer'
 TEST_TYPE = 'client'
 TEST_CLASS = 'General'
diff --git a/client/tests/error_test_bug/control b/client/tests/error_test_bug/control
index 57a4f57..eb0217f 100644
--- a/client/tests/error_test_bug/control
+++ b/client/tests/error_test_bug/control
@@ -1,6 +1,4 @@
 AUTHOR = "Gregory Smith <gps@google.com>"
-EXPERIMENTAL = 'True'  # Not really, but this is only for testing autotest...
-                       # not testing _with_ autotest.
 NAME = "error test of a buggy test class"
 TEST_TYPE = "client"
 TEST_CLASS = "General"
diff --git a/client/tests/error_test_error/control b/client/tests/error_test_error/control
index 648828b..5e86178 100644
--- a/client/tests/error_test_error/control
+++ b/client/tests/error_test_error/control
@@ -1,6 +1,4 @@
 AUTHOR = "Gregory Smith <gps@google.com>"
-EXPERIMENTAL = 'True'  # Not really, but this is only for testing autotest...
-                       # not testing _with_ autotest.
 NAME = "error test for ERROR"
 TEST_TYPE = "client"
 TEST_CLASS = "General"
diff --git a/client/tests/error_test_fail/control b/client/tests/error_test_fail/control
index 8d0c193..959cbc8 100644
--- a/client/tests/error_test_fail/control
+++ b/client/tests/error_test_fail/control
@@ -1,6 +1,4 @@
 AUTHOR = "Gregory Smith <gps@google.com>"
-EXPERIMENTAL = 'True'  # Not really, but this is only for testing autotest...
-                       # not testing _with_ autotest.
 NAME = "error test for FAIL"
 TEST_TYPE = "client"
 TEST_CLASS = "General"
diff --git a/client/tests/error_test_na/control b/client/tests/error_test_na/control
index df361a6..1704af7 100644
--- a/client/tests/error_test_na/control
+++ b/client/tests/error_test_na/control
@@ -1,6 +1,4 @@
 AUTHOR = "Gregory Smith <gps@google.com>"
-EXPERIMENTAL = 'True'  # Not really, but this is only for testing autotest...
-                       # not testing _with_ autotest.
 NAME = "error test for TEST_NA"
 TEST_TYPE = "client"
 TEST_CLASS = "General"
diff --git a/client/tests/error_test_na/control2 b/client/tests/error_test_na/control2
index 0c37ac4..4567628 100644
--- a/client/tests/error_test_na/control2
+++ b/client/tests/error_test_na/control2
@@ -1,6 +1,4 @@
 AUTHOR = "Gregory Smith <gps@google.com>"
-EXPERIMENTAL = 'True'  # Not really, but this is only for testing autotest...
-                       # not testing _with_ autotest.
 NAME = "error test for top level TestNAError == TEST_NA"
 TEST_TYPE = "client"
 TEST_CLASS = "General"
diff --git a/client/tests/fio/control b/client/tests/fio/control
index 086647c..45e536b 100644
--- a/client/tests/fio/control
+++ b/client/tests/fio/control
@@ -4,7 +4,6 @@
 TEST_CLASS = "General"
 TEST_TYPE = "client"
 TIME = 'MEDIUM'
-EXPERIMENTAL = "True"
 DOC='''
 fio is an I/O tool meant to be used both for benchmark and stress/hardware 
 verification. This test runs the fio tool. Details can be found at : 
diff --git a/client/tests/flail/control b/client/tests/flail/control
index 82a27bd..1bec6b5 100644
--- a/client/tests/flail/control
+++ b/client/tests/flail/control
@@ -4,7 +4,6 @@
 TEST_CLASS = "General"
 TEST_TYPE = "client"
 TIME = 'MEDIUM'
-EXPERIMENTAL = "True"
 
 DOC='''
 flail is a  systemcall fuzzer tool. This test simply runs flail.
diff --git a/client/tests/fs_mark/control b/client/tests/fs_mark/control
index 081d41f..5af48bf 100644
--- a/client/tests/fs_mark/control
+++ b/client/tests/fs_mark/control
@@ -4,7 +4,6 @@
 TEST_CLASS = "General"
 TEST_TYPE = "client"
 TIME = 'MEDIUM'
-EXPERIMENTAL = "True"
 DOC='''
 Detect barrier issues in file systems.
 
diff --git a/client/tests/fsfuzzer/control b/client/tests/fsfuzzer/control
index 8c8c7e8..230db89 100644
--- a/client/tests/fsfuzzer/control
+++ b/client/tests/fsfuzzer/control
@@ -4,7 +4,6 @@
 TEST_CLASS = "General"
 TEST_TYPE = "client"
 TIME = 'MEDIUM'
-EXPERIMENTAL = "True"
 
 DOC='''
 fsfuzzer is a file system fuzzer tool. This test simply runs fsfuzzer.
diff --git a/client/tests/interbench/control b/client/tests/interbench/control
index 00ddce9..5500f05 100644
--- a/client/tests/interbench/control
+++ b/client/tests/interbench/control
@@ -4,7 +4,6 @@
 TEST_CLASS = "General"
 TEST_TYPE = "client"
 TIME = 'MEDIUM'
-EXPERIMENTAL = "True"
 DOC='''
 Information of 'interbench' can be found at :
 http://members.optusnet.com.au/ckolivas/interbench/
diff --git a/client/tests/kernbench/control.readprofile b/client/tests/kernbench/control.readprofile
index 4d935ac..ef81808 100644
--- a/client/tests/kernbench/control.readprofile
+++ b/client/tests/kernbench/control.readprofile
@@ -4,7 +4,6 @@
 TEST_CLASS = "Kernel"
 TEST_CATEGORY = "Benchmark"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 DOC = """
 Run kernbench using the readprofile profiler.
 """
diff --git a/client/tests/kvmtest/control.testdir b/client/tests/kvmtest/control.testdir
index fbb5197..1348fbc 100644
--- a/client/tests/kvmtest/control.testdir
+++ b/client/tests/kvmtest/control.testdir
@@ -4,7 +4,6 @@
 TEST_TYPE = 'client'
 TEST_CLASS = 'Kernel'
 TEST_CATEGORY = 'Functional'
-EXPERIMENTAL = 'True'
 DOC = '''
 Run kvm-test, but using a custom kvm-test test dir (/opt/kvmtest_tests).
 '''
diff --git a/client/tests/kvmtest/control.with_modbuild b/client/tests/kvmtest/control.with_modbuild
index 18c5d58..39d7f26 100644
--- a/client/tests/kvmtest/control.with_modbuild
+++ b/client/tests/kvmtest/control.with_modbuild
@@ -4,7 +4,6 @@
 TEST_TYPE = 'client'
 TEST_CLASS = 'Kernel'
 TEST_CATEGORY = 'Functional'
-EXPERIMENTAL = 'True'
 DOC = '''
 Run kvm-test after first downloading, building and installing the KVM module.
 '''
diff --git a/client/tests/lsb_dtk/control b/client/tests/lsb_dtk/control
index ed4ee6c..dd42b99 100644
--- a/client/tests/lsb_dtk/control
+++ b/client/tests/lsb_dtk/control
@@ -4,7 +4,6 @@
 TEST_CATEGORY = "FUNCTIONAL"
 TEST_CLASS = "KERNEL"
 TEST_TYPE = "CLIENT"
-EXPERIMENTAL = "True"
 DOC = """
 Test for LSB-DTK
 """
diff --git a/client/tests/ltp/control.sample b/client/tests/ltp/control.sample
index 0aa7cd5..4bebb45 100644
--- a/client/tests/ltp/control.sample
+++ b/client/tests/ltp/control.sample
@@ -6,7 +6,6 @@
 individual test case is written from the system call's manpage.
 """
 SUITE = "kernel_per-build_regression"
-EXPERIMENTAL = "True"
 TIME = "MEDIUM"
 TEST_CATEGORY = "FUNCTIONAL"
 TEST_CLASS = "KERNEL"
diff --git a/client/tests/real_time_tests/control b/client/tests/real_time_tests/control
index 3dfb0e4..5f97156 100644
--- a/client/tests/real_time_tests/control
+++ b/client/tests/real_time_tests/control
@@ -6,7 +6,6 @@
 TEST_CLASS = "Kernel"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "Client"
-EXPERIMENTAL = "True"
 
 DOC = """Runs the Kernel Realtime tests from
 http://git.kernel.org/?p=linux/kernel/git/galak/ltp.git;a=tree;f=testcases/realtime"""
diff --git a/client/tests/rmaptest/control b/client/tests/rmaptest/control
index 4722121..a64614c 100644
--- a/client/tests/rmaptest/control
+++ b/client/tests/rmaptest/control
@@ -6,7 +6,6 @@
 TEST_CLASS = "Kernel"
 TEST_CATEGORY = "Fuctional"
 TEST_TYPE = "Client"
-EXPERIMENTAL = "True"
 
 DOC = """
 Create lots of VMAs mapped by lots of tasks.  To tickle objrmap and the
diff --git a/client/tests/rttester/control b/client/tests/rttester/control
index 38eb1b2..6529e33 100644
--- a/client/tests/rttester/control
+++ b/client/tests/rttester/control
@@ -6,7 +6,6 @@
 TEST_CLASS = "Kernel"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "Client"
-EXPERIMENTAL = "True"
 
 DOC = "Runs some real time tests from rttester"
 job.run_test('rttester')
diff --git a/client/tests/selftest/control b/client/tests/selftest/control
index 35f3e10..f066f74 100644
--- a/client/tests/selftest/control
+++ b/client/tests/selftest/control
@@ -1,5 +1,4 @@
 AUTHOR = "Andy Whitcroft <apw@shadowen.org>"
-EXPERIMENTAL = "True"
 TIME = "MEDIUM"
 NAME = "Self Test"
 TEST_TYPE = "client"
diff --git a/client/tests/sparse/control b/client/tests/sparse/control
index c7a07b0..5ce3812 100644
--- a/client/tests/sparse/control
+++ b/client/tests/sparse/control
@@ -1,5 +1,4 @@
 NAME='Sparse Kernel Test'
-EXPERIMENTAL='True'
 TIME='MEDIUM'
 TEST_TYPE='client'
 TEST_CATEGORY='Functional'
diff --git a/client/tests/spew/control b/client/tests/spew/control
index 48f0480..f7452e2 100644
--- a/client/tests/spew/control
+++ b/client/tests/spew/control
@@ -1,6 +1,5 @@
 NAME='Spew'
 AUTHOR='Martin Bligh <mbligh@google.com>'
-EXPERIMENTAL='True'
 TEST_TYPE='client'
 TEST_CATEGORY='Benchmark'
 TEST_CLASS='Hardware'
diff --git a/client/tests/stress/control b/client/tests/stress/control
index 75272b2..d8bbea6 100644
--- a/client/tests/stress/control
+++ b/client/tests/stress/control
@@ -1,6 +1,5 @@
 NAME='Stress'
 AUTHOR='Yi Yang <yang.y.yi@gmail.com>'
-EXPERIMENTAL='True'
 TEST_TYPE='client'
 TIME='MEDIUM'
 TEST_CATEGORY='Functional'
diff --git a/client/tests/sysbench/control b/client/tests/sysbench/control
index 9d5913d..05eb3de 100644
--- a/client/tests/sysbench/control
+++ b/client/tests/sysbench/control
@@ -4,7 +4,6 @@
 TEST_CLASS = 'IO'
 TEST_CATEGORY = 'Benchmark'
 TEST_TYPE = 'client'
-EXPERIMENTAL = 'True'
 
 DOC = """
 The idea is to quickly get an impression about system performance for MySQL
diff --git a/client/tests/xmtest/control b/client/tests/xmtest/control
index e316aed..55393be 100644
--- a/client/tests/xmtest/control
+++ b/client/tests/xmtest/control
@@ -4,7 +4,6 @@
 TEST_CLASS = 'Kernel'
 TEST_CATEGORY = 'Functional'
 TEST_TYPE = 'client'
-EXPERIMENTAL = 'True'
 
 DOC = """
 This suite provides a framework for testing the Xen userspace tools.
diff --git a/server/site_tests/bluetooth_RegressionServer/control b/server/site_tests/bluetooth_RegressionServer/control
index adc1174..80dcab3 100644
--- a/server/site_tests/bluetooth_RegressionServer/control
+++ b/server/site_tests/bluetooth_RegressionServer/control
@@ -11,7 +11,6 @@
 TEST_CATEGORY = "General"
 TEST_CLASS = "bluetooth"
 TEST_TYPE = "server"
-EXPERIMENTAL = "True"
 
 DOC = """
 Server side of Bluetooth Semi-Automated Regression tests.
diff --git a/server/site_tests/chromeperf_PGOPageCycler/control b/server/site_tests/chromeperf_PGOPageCycler/control
index 2089d5d..dccefd9 100644
--- a/server/site_tests/chromeperf_PGOPageCycler/control
+++ b/server/site_tests/chromeperf_PGOPageCycler/control
@@ -6,7 +6,6 @@
 NAME = "chromeperf_PGOPageCycler"
 PURPOSE = "Produce profile of normal browsing for optimization."
 SUITE = "PGO_record"
-EXPERIMENTAL = "True"
 TIME = "LONG"
 TEST_CATEGORY = "Benchmark"
 TEST_CLASS = "pgo"
diff --git a/server/site_tests/desktopui_CrashyRebootServer/control b/server/site_tests/desktopui_CrashyRebootServer/control
index 929aef4..3043b02 100644
--- a/server/site_tests/desktopui_CrashyRebootServer/control
+++ b/server/site_tests/desktopui_CrashyRebootServer/control
@@ -7,7 +7,6 @@
 SUITE = "gpu_hang"
 TIME = "MEDIUM"
 TEST_TYPE = "server"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test verifies that the logic we put in place to reboot the device in the
diff --git a/server/site_tests/dummy_PassServer/control b/server/site_tests/dummy_PassServer/control
index ccd91e9..f8b45a9 100644
--- a/server/site_tests/dummy_PassServer/control
+++ b/server/site_tests/dummy_PassServer/control
@@ -6,7 +6,6 @@
 NAME = "dummy_PassServer"
 PURPOSE = "Demonstrate success methods of autotests."
 CRITERIA = "This test will always succeed."
-EXPERIMENTAL = "True"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "dummy"
diff --git a/server/site_tests/dummy_RepeatArgs/control b/server/site_tests/dummy_RepeatArgs/control
index 2957329..a39706d 100644
--- a/server/site_tests/dummy_RepeatArgs/control
+++ b/server/site_tests/dummy_RepeatArgs/control
@@ -6,7 +6,6 @@
 NAME = "dummy_RepeatArgs"
 PURPOSE = "Log the control file args."
 CRITERIA = "This test will always succeed."
-EXPERIMENTAL = "True"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "dummy"
diff --git a/server/site_tests/p2p_EndToEndTest/control b/server/site_tests/p2p_EndToEndTest/control
index c22155c..2dd5253 100644
--- a/server/site_tests/p2p_EndToEndTest/control
+++ b/server/site_tests/p2p_EndToEndTest/control
@@ -15,7 +15,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
 TEST_TYPE = "server"
-EXPERIMENTAL = "True"
 
 DOC = """
 End-to-end test of the peer-to-peer (p2p) file sharing system.
diff --git a/server/site_tests/platform_BootPerfServer/control b/server/site_tests/platform_BootPerfServer/control
index 5a9cf0c..28c1ae6 100644
--- a/server/site_tests/platform_BootPerfServer/control
+++ b/server/site_tests/platform_BootPerfServer/control
@@ -5,7 +5,6 @@
 NAME = "BootPerfServer"
 AUTHOR = "Chrome OS Team"
 SUITE = "kernel_per-build_benchmarks"
-EXPERIMENTAL = "True"
 TIME = "SHORT"
 TEST_CATEGORY = "Benchmark"
 TEST_CLASS = "platform"
diff --git a/server/site_tests/platform_CorruptRootfs/control b/server/site_tests/platform_CorruptRootfs/control
index 79c3db9..bca4dc6 100644
--- a/server/site_tests/platform_CorruptRootfs/control
+++ b/server/site_tests/platform_CorruptRootfs/control
@@ -5,7 +5,6 @@
 NAME = "platform_CorruptRootfs"
 AUTHOR = "chromeos-kernel,taysom"
 SUITE = ""  # Removed from kernel_per-build_benchmarks
-EXPERIMENTAL = "True"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/server/site_tests/platform_CorruptRootfs/control.regression b/server/site_tests/platform_CorruptRootfs/control.regression
index ce4308f..60a225e 100644
--- a/server/site_tests/platform_CorruptRootfs/control.regression
+++ b/server/site_tests/platform_CorruptRootfs/control.regression
@@ -6,7 +6,6 @@
 AUTHOR = "chromeos-kernel,taysom"
 SUITE = "kernel_daily_regression"
 DEPENDENCIES = "servo"
-EXPERIMENTAL = "True"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/server/site_tests/platform_CrashStateful/control b/server/site_tests/platform_CrashStateful/control
index 91e4bd3..57f6f31 100644
--- a/server/site_tests/platform_CrashStateful/control
+++ b/server/site_tests/platform_CrashStateful/control
@@ -5,7 +5,6 @@
 NAME = "platform_CrashStateful"
 AUTHOR = "chromeos-kernel,taysom"
 SUITE = "" # none for now "kernel_per-build_benchmarks"
-EXPERIMENTAL = "True"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/server/site_tests/platform_CrashStateful/control.regression b/server/site_tests/platform_CrashStateful/control.regression
index 12ec2ea..b28eb98 100644
--- a/server/site_tests/platform_CrashStateful/control.regression
+++ b/server/site_tests/platform_CrashStateful/control.regression
@@ -6,7 +6,6 @@
 AUTHOR = "chromeos-kernel,taysom"
 SUITE = "kernel_daily_regression"
 DEPENDENCIES = "servo"
-EXPERIMENTAL = "True"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/server/site_tests/platform_SyncCrash/control b/server/site_tests/platform_SyncCrash/control
index 8bfcbb7..658a3c9 100644
--- a/server/site_tests/platform_SyncCrash/control
+++ b/server/site_tests/platform_SyncCrash/control
@@ -5,7 +5,6 @@
 NAME = "platform_SyncCrash"
 AUTHOR = "chromeos-kernel,taysom"
 SUITE = "" # none for now "kernel_per-build_benchmarks"
-EXPERIMENTAL = "True"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/server/site_tests/platform_SyncCrash/control.regression b/server/site_tests/platform_SyncCrash/control.regression
index ef3bfd2..ab2bac2 100644
--- a/server/site_tests/platform_SyncCrash/control.regression
+++ b/server/site_tests/platform_SyncCrash/control.regression
@@ -6,7 +6,6 @@
 AUTHOR = "chromeos-kernel,taysom"
 SUITE = "kernel_daily_regression"
 DEPENDENCIES = "servo"
-EXPERIMENTAL = "True"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/server/site_tests/power_DarkResumeShutdownServer/control b/server/site_tests/power_DarkResumeShutdownServer/control
index d74adfa..e16fe01 100644
--- a/server/site_tests/power_DarkResumeShutdownServer/control
+++ b/server/site_tests/power_DarkResumeShutdownServer/control
@@ -14,7 +14,6 @@
 TEST_CLASS = "power"
 TEST_TYPE = "server"
 DEPENDENCIES = "servo"
-EXPERIMENTAL = "True"
 
 DOC = """
 Test that dark resume will result in a shutdown when it resumes without the
diff --git a/server/site_tests/power_SuspendShutdown/control b/server/site_tests/power_SuspendShutdown/control
index 07f66ab..617a157 100644
--- a/server/site_tests/power_SuspendShutdown/control
+++ b/server/site_tests/power_SuspendShutdown/control
@@ -14,7 +14,6 @@
 TEST_CLASS = "power"
 TEST_TYPE = "server"
 DEPENDENCIES = "servo"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test simulates a system that is unable to suspend, and verifies
diff --git a/server/site_tests/power_USBHotplugInSuspend/control b/server/site_tests/power_USBHotplugInSuspend/control
index 90838ab..853d7b6 100644
--- a/server/site_tests/power_USBHotplugInSuspend/control
+++ b/server/site_tests/power_USBHotplugInSuspend/control
@@ -13,7 +13,6 @@
 TEST_CLASS = "power"
 TEST_TYPE = "server"
 DEPENDENCIES = "servo"
-EXPERIMENTAL = "True"
 
 DOC = """
 This tests both hotplug insertion and removal of a USB device while the DUT
diff --git a/server/site_tests/sonic_AppTest/control b/server/site_tests/sonic_AppTest/control
index b5f662b..2da73ed 100644
--- a/server/site_tests/sonic_AppTest/control
+++ b/server/site_tests/sonic_AppTest/control
@@ -14,7 +14,6 @@
 NAME = "sonic_AppTest"
 PURPOSE = "Demonstrate the ability to start the chromecast app."
 CRITERIA = "This test will fail if the app fails to start."
-EXPERIMENTAL = "True"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "sonic"
diff --git a/server/site_tests/sonic_AppTest/control.netflix b/server/site_tests/sonic_AppTest/control.netflix
index 2c66c3c..c7bf193 100644
--- a/server/site_tests/sonic_AppTest/control.netflix
+++ b/server/site_tests/sonic_AppTest/control.netflix
@@ -9,7 +9,6 @@
 NAME = "sonic_AppTest_netflix"
 PURPOSE = "Demonstrate the ability to start a sonic app."
 CRITERIA = "This test will fail if the app fails to start."
-EXPERIMENTAL = "True"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "sonic"
diff --git a/server/site_tests/telemetry_AFDOGenerate/control b/server/site_tests/telemetry_AFDOGenerate/control
index b3baf5ba..d2b9664 100644
--- a/server/site_tests/telemetry_AFDOGenerate/control
+++ b/server/site_tests/telemetry_AFDOGenerate/control
@@ -8,7 +8,6 @@
 NAME = "telemetry_AFDOGenerate"
 PURPOSE = "Produce profile (AFDO format) of normal browsing for optimization."
 SUITE = "AFDO_record"
-EXPERIMENTAL = "True"
 TIME = "LONG"
 TEST_CATEGORY = "Benchmark"
 TEST_CLASS = "telemetry"
diff --git a/server/site_tests/telemetry_Benchmarks/control.Media b/server/site_tests/telemetry_Benchmarks/control.Media
index cc98c70..1f6bf7d 100644
--- a/server/site_tests/telemetry_Benchmarks/control.Media
+++ b/server/site_tests/telemetry_Benchmarks/control.Media
@@ -9,7 +9,6 @@
 TEST_CATEGORY = "Benchmark"
 TEST_CLASS = "performance"
 TEST_TYPE = "server"
-EXPERIMENTAL = "True"
 
 DOC = """
 This server side test suite executes the Telemetry Media Benchmark for ChromeOS.
diff --git a/server/site_tests/telemetry_Benchmarks/control.Media4k b/server/site_tests/telemetry_Benchmarks/control.Media4k
index ba811bd..065aed5 100644
--- a/server/site_tests/telemetry_Benchmarks/control.Media4k
+++ b/server/site_tests/telemetry_Benchmarks/control.Media4k
@@ -9,7 +9,6 @@
 TEST_CATEGORY = "Benchmark"
 TEST_CLASS = "performance"
 TEST_TYPE = "server"
-EXPERIMENTAL = "True"
 DEPENDENCIES = "4k_video"
 
 DOC = """
diff --git a/server/site_tests/telemetry_Benchmarks/control.Memory b/server/site_tests/telemetry_Benchmarks/control.Memory
index 93be024..52060e4 100644
--- a/server/site_tests/telemetry_Benchmarks/control.Memory
+++ b/server/site_tests/telemetry_Benchmarks/control.Memory
@@ -8,7 +8,6 @@
 TEST_CATEGORY = "Benchmark"
 TEST_CLASS = "performance"
 TEST_TYPE = "server"
-EXPERIMENTAL = "True"
 
 DOC = """
 This server side test suite executes the Telemetry Memory Benchmark.
diff --git a/server/site_tests/telemetry_Benchmarks/control.Smoothness b/server/site_tests/telemetry_Benchmarks/control.Smoothness
index 7d4bf2e..3736efc 100644
--- a/server/site_tests/telemetry_Benchmarks/control.Smoothness
+++ b/server/site_tests/telemetry_Benchmarks/control.Smoothness
@@ -9,7 +9,6 @@
 TEST_CATEGORY = "Benchmark"
 TEST_CLASS = "performance"
 TEST_TYPE = "server"
-EXPERIMENTAL = "True"
 
 DOC = """
 This server side test suite executes the Telemetry Smoothness Measurement.
diff --git a/server/site_tests/telemetry_GpuTests/control.webgl_conformance b/server/site_tests/telemetry_GpuTests/control.webgl_conformance
index 30f851b..c766ec1 100644
--- a/server/site_tests/telemetry_GpuTests/control.webgl_conformance
+++ b/server/site_tests/telemetry_GpuTests/control.webgl_conformance
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 AUTHOR = 'chromeos-gfx'
-EXPERIMENTAL = 'True'
 NAME = 'GPU WebGL Conformance Test'
 SUITE = 'graphics, perf_v2'
 TIME = 'LONG'
diff --git a/server/tests/barriertest_2client/control.srv b/server/tests/barriertest_2client/control.srv
index d6a70bb..c796c77 100644
--- a/server/tests/barriertest_2client/control.srv
+++ b/server/tests/barriertest_2client/control.srv
@@ -4,7 +4,6 @@
 TEST_CATEGORY = "Functional"
 TEST_CLASS = 'Network'
 TEST_TYPE = "Server"
-EXPERIMENTAL = True  # This is functional a test of autotest itself.
 SYNC_COUNT = 2
 DOC = """
 A functional test of autotest's Barrier mechanisms for synchronizing