diff --git a/client/site_tests/desktopui_FlashSanityCheck/control b/client/site_tests/desktopui_FlashSanityCheck/control
index b573e26..cab7704 100644
--- a/client/site_tests/desktopui_FlashSanityCheck/control
+++ b/client/site_tests/desktopui_FlashSanityCheck/control
@@ -6,12 +6,11 @@
 NAME = "desktopui_FlashSanityCheck"
 PURPOSE = "Basic sanity check of Flash suppport in Chrome."
 CRITERIA = "This test will fail if flash causes a segfault."
-SUITE = "bvt"
+SUITE = "experimental"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "desktopui"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test logs in, opens a new window, and navigates to a .swf file on a
diff --git a/client/site_tests/desktopui_ScreenLocker/control b/client/site_tests/desktopui_ScreenLocker/control
index 2df2373..71918e2 100644
--- a/client/site_tests/desktopui_ScreenLocker/control
+++ b/client/site_tests/desktopui_ScreenLocker/control
@@ -10,12 +10,11 @@
 autotestPrivate.lockScreen, or cannot be unlocked with the correct password,
 or if the screen is unlocked with an incorrect password.
 """
-SUITE = "bvt"
+SUITE = "experimental"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "desktopui"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test checks if the screen locker can lock and unlock the screen.
diff --git a/client/site_tests/graphics_GLBench/control.bvt b/client/site_tests/graphics_GLBench/control.bvt
index 83b7009..04ffc6e 100644
--- a/client/site_tests/graphics_GLBench/control.bvt
+++ b/client/site_tests/graphics_GLBench/control.bvt
@@ -20,12 +20,11 @@
 Note: it should nearly never be required to remove old versions of good/bad
 images from these directories.
 """
-SUITE = 'bvt'
+SUITE = 'experimental'
 TIME='FAST'
 TEST_CATEGORY = 'Performance'
 TEST_CLASS = "gl"
 TEST_TYPE = 'client'
-EXPERIMENTAL = 'True'
 
 DOC = """
 On bvt we do not upload performance numbers to the chrome dashboard. We run
diff --git a/client/site_tests/hardware_Memtester/control.quick b/client/site_tests/hardware_Memtester/control.quick
index 5816c88..2f609e4 100644
--- a/client/site_tests/hardware_Memtester/control.quick
+++ b/client/site_tests/hardware_Memtester/control.quick
@@ -9,8 +9,7 @@
 TIME='SHORT'
 TEST_CLASS = "hardware"
 TEST_TYPE = 'client'
-SUITE = 'bvt'
-EXPERIMENTAL = 'True'
+SUITE = 'experimental'
 
 DOC = """
 This test uses memtester to find memory subsystem faults. The quick test
diff --git a/client/site_tests/hardware_RamFio/control b/client/site_tests/hardware_RamFio/control
index 4ac3fca..131defa 100644
--- a/client/site_tests/hardware_RamFio/control
+++ b/client/site_tests/hardware_RamFio/control
@@ -8,8 +8,7 @@
 TIME = 'SHORT'
 TEST_CLASS = 'hardware'
 TEST_TYPE = 'client'
-SUITE = 'bvt'
-EXPERIMENTAL = 'True'
+SUITE = 'experimental'
 
 DOC = """
 Create ram disk and use hardware_StorageFio to test for ram throughput
diff --git a/client/site_tests/kernel_fs_Inplace/control b/client/site_tests/kernel_fs_Inplace/control
index 401d044..0075f05 100644
--- a/client/site_tests/kernel_fs_Inplace/control
+++ b/client/site_tests/kernel_fs_Inplace/control
@@ -7,8 +7,7 @@
 DOC = '''
 Does inplace preads and pwrites.
 '''
-SUITE = "bvt"
-EXPERIMENTAL = "True"
+SUITE = "experimental"
 TIME = 'SHORT'
 TEST_CLASS = 'kernel'
 TEST_CATEGORY = 'Performance'
diff --git a/client/site_tests/p2p_ServeFiles/control b/client/site_tests/p2p_ServeFiles/control
index 68deed2..b7ef4af 100644
--- a/client/site_tests/p2p_ServeFiles/control
+++ b/client/site_tests/p2p_ServeFiles/control
@@ -12,9 +12,8 @@
 NAME = 'p2p_ServeFiles'
 PURPOSE = 'Check that p2p-http-server daemon serves files over HTTP.'
 CRITERIA = "Fails if the DUT can't serve a HTTP request from the network."
-SUITE = 'bvt'
+SUITE = 'experimental'
 # See chromium:337726 for ongoing work to remove the experimental tag.
-EXPERIMENTAL = 'True'
 TEST_CLASS = 'platform'
 TEST_CATEGORY = 'Functional'
 TEST_TYPE = 'client'
diff --git a/client/site_tests/platform_CryptohomeChangePassword/control b/client/site_tests/platform_CryptohomeChangePassword/control
index e3eaa4c..18a2ee3 100644
--- a/client/site_tests/platform_CryptohomeChangePassword/control
+++ b/client/site_tests/platform_CryptohomeChangePassword/control
@@ -6,12 +6,11 @@
 NAME = "platform_CryptohomeChangePassword"
 PURPOSE = "Verify that cryptohome can change a password for an ecrypted vault."
 CRITERIA = "This test will fail if cryptohome fails to re-wrap the vault key with the new password."
-SUITE = "bvt"
+SUITE = "experimental"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test checks that cryptohome can change a password for an encrypted vault.
diff --git a/client/site_tests/platform_CryptohomeMount/control b/client/site_tests/platform_CryptohomeMount/control
index 22c122f..0390db2 100644
--- a/client/site_tests/platform_CryptohomeMount/control
+++ b/client/site_tests/platform_CryptohomeMount/control
@@ -6,12 +6,11 @@
 NAME = "platform_CryptohomeMount"
 PURPOSE = "Verify that cryptohome can create and mount an ecrypted vault."
 CRITERIA = "This test will fail if cryptohome is not mounted after a call to mount."
-SUITE = "bvt"
+SUITE = "experimental"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test checks that cryptohome can create and mount an encrypted vault.
diff --git a/client/site_tests/platform_CryptohomeTestAuth/control b/client/site_tests/platform_CryptohomeTestAuth/control
index 919c091..b951dd5 100644
--- a/client/site_tests/platform_CryptohomeTestAuth/control
+++ b/client/site_tests/platform_CryptohomeTestAuth/control
@@ -6,8 +6,7 @@
 NAME = "platform_CryptohomeTestAuth"
 PURPOSE = "Verify that cryptohome can verify credentials."
 CRITERIA = "This test will fail if cryptohome fails to validate credentials."
-SUITE = "bvt"
-EXPERIMENTAL = "true"
+SUITE = "experimental"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_GesturesRegressionTest/control b/client/site_tests/platform_GesturesRegressionTest/control
index 8301701..9b23801 100644
--- a/client/site_tests/platform_GesturesRegressionTest/control
+++ b/client/site_tests/platform_GesturesRegressionTest/control
@@ -5,8 +5,7 @@
 AUTHOR = "Chromium OS Authors"
 NAME = "platform_GesturesRegressionTests"
 PURPOSE = "Regression tests of ChromeOS gestures library."
-SUITE = "bvt"
-EXPERIMENTAL = "True"
+SUITE = "experimental"
 TIME = "SHORT"
 TEST_CATEGORY = "Regression"
 TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_LogDupSuppression/control b/client/site_tests/platform_LogDupSuppression/control
index 3015dca..3ec850c 100644
--- a/client/site_tests/platform_LogDupSuppression/control
+++ b/client/site_tests/platform_LogDupSuppression/control
@@ -3,9 +3,8 @@
 # found in the LICENSE file.
 
 AUTHOR = 'quiche'
-EXPERIMENTAL = 'True'
 NAME = 'platform_LogDupSuppression'
-SUITE = 'bvt'
+SUITE = 'experimental'
 TIME = 'SHORT'
 TEST_TYPE = 'client'
 
diff --git a/client/site_tests/platform_MemCheck/control b/client/site_tests/platform_MemCheck/control
index 455f721..09ea6c3 100644
--- a/client/site_tests/platform_MemCheck/control
+++ b/client/site_tests/platform_MemCheck/control
@@ -13,8 +13,7 @@
 TEST_CATEGORY = 'Functional'
 TEST_CLASS = 'platform'
 TEST_TYPE = 'client'
-SUITE = 'bvt'
-EXPERIMENTAL = 'True'
+SUITE = 'experimental'
 DOC = """
 Verifies that memory levels look sane.
 
diff --git a/client/site_tests/platform_Pkcs11ChangeAuthData/control b/client/site_tests/platform_Pkcs11ChangeAuthData/control
index 4157b26..4f11898 100644
--- a/client/site_tests/platform_Pkcs11ChangeAuthData/control
+++ b/client/site_tests/platform_Pkcs11ChangeAuthData/control
@@ -6,8 +6,7 @@
 NAME = "platform_Pkcs11ChangeAuthData"
 PURPOSE = "Tests changing authorization data for a PKCS #11 token."
 CRITERIA = "Fails if token does not correctly change authorization data."
-EXPERIMENTAL = "True"
-SUITE= "bvt"
+SUITE= "experimental"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_CLASS = "platform"
diff --git a/client/site_tests/platform_Pkcs11Events/control b/client/site_tests/platform_Pkcs11Events/control
index e9d9938..5e10f72 100644
--- a/client/site_tests/platform_Pkcs11Events/control
+++ b/client/site_tests/platform_Pkcs11Events/control
@@ -6,8 +6,7 @@
 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 = "bvt"
+SUITE = "experimental"
 TIME = "SHORT"
 TEST_CATEGORY = "Stress"
 TEST_CLASS = "platform"
diff --git a/client/site_tests/power_Resume/control b/client/site_tests/power_Resume/control
index 5ba1b48..beee4cd 100644
--- a/client/site_tests/power_Resume/control
+++ b/client/site_tests/power_Resume/control
@@ -6,12 +6,11 @@
 NAME = "power_Resume"
 PURPOSE = "Measure the amount of time it takes to resume from suspend."
 CRITERIA = "This test is a benchmark."
-SUITE = "bvt, power_build"
+SUITE = "power_build"
 TIME = "SHORT"
 TEST_CATEGORY = "Logging"
 TEST_CLASS = "power"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test will search /var/log/messages for pertinent strings to determine if
diff --git a/client/site_tests/video_VideoSanity/control.bvt b/client/site_tests/video_VideoSanity/control.bvt
index d7857d9..b7a2d12 100644
--- a/client/site_tests/video_VideoSanity/control.bvt
+++ b/client/site_tests/video_VideoSanity/control.bvt
@@ -8,12 +8,11 @@
 CRITERIA = """
 This test will fail if Chrome media is not enable or video doesn't play.
 """
-SUITE = "bvt"
+SUITE = "experimental"
 TIME = "SHORT"
 TEST_CATEGORY = "General"
 TEST_CLASS = "video"
 TEST_TYPE = "client"
-EXPERIMENTAL = "True"
 
 DOC = """
 This test verify the media elements and video sanity.
diff --git a/server/site_tests/hardware_MemoryIntegrity/control.quick b/server/site_tests/hardware_MemoryIntegrity/control.quick
index 312430d..17d85d4 100644
--- a/server/site_tests/hardware_MemoryIntegrity/control.quick
+++ b/server/site_tests/hardware_MemoryIntegrity/control.quick
@@ -8,8 +8,7 @@
 TIME = 'FAST'
 TEST_CLASS = 'hardware'
 TEST_TYPE = 'server'
-SUITE = 'bvt'
-EXPERIMENTAL = 'True'
+SUITE = 'experimental'
 
 DOC = """
 This test call hardware_StorageFio to write data once to the ramfs and
diff --git a/server/site_tests/kernel_MemoryRamoop/control b/server/site_tests/kernel_MemoryRamoop/control
index 23a301f..1a05809 100644
--- a/server/site_tests/kernel_MemoryRamoop/control
+++ b/server/site_tests/kernel_MemoryRamoop/control
@@ -8,8 +8,7 @@
 TIME = 'SHORT'
 TEST_CLASS = 'kernel'
 TEST_TYPE = 'server'
-SUITE = 'bvt'
-EXPERIMENTAL = 'True'
+SUITE = 'experimental'
 
 DOC = """
 This test verify that /dev/pstore/console-ramoops is preserved correctly
diff --git a/server/site_tests/platform_RebootAfterUpdate/control b/server/site_tests/platform_RebootAfterUpdate/control
index eea060f..670dd5d 100644
--- a/server/site_tests/platform_RebootAfterUpdate/control
+++ b/server/site_tests/platform_RebootAfterUpdate/control
@@ -10,8 +10,7 @@
 TEST_CATEGORY = "Benchmark"
 TEST_CLASS = "platform"
 TEST_TYPE = "server"
-SUITE = "bvt"
-EXPERIMENTAL = "True"
+SUITE = "experimental"
 
 DOC = """
 This test checks the behavior of reboot after update. It specifically tests