diff --git a/client/site_tests/audio_WebRtcAudioLoopback/control b/client/site_tests/audio_WebRtcAudioLoopback/control
index f8b6d7f..7c52a77 100644
--- a/client/site_tests/audio_WebRtcAudioLoopback/control
+++ b/client/site_tests/audio_WebRtcAudioLoopback/control
@@ -6,7 +6,7 @@
 NAME = "audio_WebRtcAudioLoopback"
 PURPOSE = "Measures the RMS score for a local audio loopback call"
 CRITERIA = "This test will fail if can't compute an RMS score."
-ATTRIBUTES = "suite:hotrod"
+ATTRIBUTES = ""
 TIME = "MEDIUM"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "audio"
diff --git a/client/site_tests/cfm_AutotestSmokeTest/control b/client/site_tests/cfm_AutotestSmokeTest/control
index 3bb914e..d2e23df 100644
--- a/client/site_tests/cfm_AutotestSmokeTest/control
+++ b/client/site_tests/cfm_AutotestSmokeTest/control
@@ -7,7 +7,7 @@
 PURPOSE = ("Smoke test used for tracking the stability of the Autotest "
         "framework.")
 CRITERIA = "Fails if the Autotest framework doesn't work as expected."
-ATTRIBUTES = "suite:hotrod, suite:bluestreak-pre-cq"
+ATTRIBUTES = "suite:bluestreak-pre-cq"
 TIME = "MEDIUM"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "client"
diff --git a/client/site_tests/video_WebRtcMainFeedSwitching/control b/client/site_tests/video_WebRtcMainFeedSwitching/control
index fc3ded8..d1abdb6 100644
--- a/client/site_tests/video_WebRtcMainFeedSwitching/control
+++ b/client/site_tests/video_WebRtcMainFeedSwitching/control
@@ -6,7 +6,7 @@
 NAME = "video_WebRtcMainFeedSwitching"
 PURPOSE = "Stress WebRTC and Chrome by frequent switches of the source video"
 CRITERIA = "Fails if Chrome crashes"
-ATTRIBUTES = "suite:hotrod"
+ATTRIBUTES = ""
 TIME = "SHORT"
 TEST_CATEGORY = "Stress"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_WebRtcMainFeedSwitching/control.perf b/client/site_tests/video_WebRtcMainFeedSwitching/control.perf
index 1e0430b..870ee37 100644
--- a/client/site_tests/video_WebRtcMainFeedSwitching/control.perf
+++ b/client/site_tests/video_WebRtcMainFeedSwitching/control.perf
@@ -7,7 +7,7 @@
 PURPOSE = """Measure performance when srcObject of video tags are frequently
 swapped"""
 CRITERIA = "Fails if Chrome crashes"
-ATTRIBUTES = "suite:hotrod"
+ATTRIBUTES = ""
 TIME = "MEDIUM"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_WebRtcResolutionSwitching/control b/client/site_tests/video_WebRtcResolutionSwitching/control
index 6a439ac..59ae3c9 100644
--- a/client/site_tests/video_WebRtcResolutionSwitching/control
+++ b/client/site_tests/video_WebRtcResolutionSwitching/control
@@ -6,7 +6,7 @@
 NAME = "video_WebRtcResolutionSwitching"
 PURPOSE = "Stress WebRTC by frequently switching between different resolutions"
 CRITERIA = "Fails if any video element gets a lower resolution than requested"
-ATTRIBUTES = "suite:hotrod"
+ATTRIBUTES = ""
 TIME = "SHORT"
 TEST_CATEGORY = "Stress"
 TEST_CLASS = "video"
diff --git a/client/site_tests/video_WebRtcResolutionSwitching/control.perf b/client/site_tests/video_WebRtcResolutionSwitching/control.perf
index 087c6fd..ec287d3 100644
--- a/client/site_tests/video_WebRtcResolutionSwitching/control.perf
+++ b/client/site_tests/video_WebRtcResolutionSwitching/control.perf
@@ -6,7 +6,7 @@
 NAME = "video_WebRtcResolutionSwitching.perf"
 PURPOSE = "Test WebRTC by frequently switching between different resolutions"
 CRITERIA = "Fails if any video element gets a lower resolution than requested"
-ATTRIBUTES = "suite:hotrod"
+ATTRIBUTES = ""
 TIME = "MEDIUM"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "video"
diff --git a/client/site_tests/webrtc_PausePlayPeerConnections/control.audio b/client/site_tests/webrtc_PausePlayPeerConnections/control.audio
index 4ad1113..4b60609 100644
--- a/client/site_tests/webrtc_PausePlayPeerConnections/control.audio
+++ b/client/site_tests/webrtc_PausePlayPeerConnections/control.audio
@@ -6,7 +6,7 @@
 NAME = "webrtc_PausePlayPeerConnections.audio"
 PURPOSE = "Ensures frequent pause and plays of peer connection streams work"
 CRITERIA = "Fails if the tab freezes during the test"
-ATTRIBUTES = "suite:hotrod, suite:bluestreak-pre-cq"
+ATTRIBUTES = "suite:bluestreak-pre-cq"
 TIME = "SHORT"
 TEST_CATEGORY = "Stress"
 TEST_CLASS = "audio"
diff --git a/client/site_tests/webrtc_PausePlayPeerConnections/control.audio_perf b/client/site_tests/webrtc_PausePlayPeerConnections/control.audio_perf
index 8b7a095..438cde6 100644
--- a/client/site_tests/webrtc_PausePlayPeerConnections/control.audio_perf
+++ b/client/site_tests/webrtc_PausePlayPeerConnections/control.audio_perf
@@ -6,7 +6,7 @@
 NAME = "webrtc_PausePlayPeerConnections.audio_perf"
 PURPOSE = "Performance test of frequent pause and plays of peer connections"
 CRITERIA = "Fails if the tab freezes during the test"
-ATTRIBUTES = "suite:hotrod"
+ATTRIBUTES = ""
 TIME = "MEDIUM"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "audio"
diff --git a/client/site_tests/webrtc_PausePlayPeerConnections/control.video b/client/site_tests/webrtc_PausePlayPeerConnections/control.video
index 80b31bd..5ce878c 100644
--- a/client/site_tests/webrtc_PausePlayPeerConnections/control.video
+++ b/client/site_tests/webrtc_PausePlayPeerConnections/control.video
@@ -6,7 +6,7 @@
 NAME = "webrtc_PausePlayPeerConnections.video"
 PURPOSE = "Ensures frequent pause and plays of peer connection streams work"
 CRITERIA = "Fails if the tab freezes during the test"
-ATTRIBUTES = "suite:hotrod, suite:bluestreak-pre-cq"
+ATTRIBUTES = "suite:bluestreak-pre-cq"
 TIME = "SHORT"
 TEST_CATEGORY = "Stress"
 TEST_CLASS = "video"
diff --git a/client/site_tests/webrtc_PausePlayPeerConnections/control.video_perf b/client/site_tests/webrtc_PausePlayPeerConnections/control.video_perf
index 4357d14..ce4634a 100644
--- a/client/site_tests/webrtc_PausePlayPeerConnections/control.video_perf
+++ b/client/site_tests/webrtc_PausePlayPeerConnections/control.video_perf
@@ -6,7 +6,7 @@
 NAME = "webrtc_PausePlayPeerConnections.video_perf"
 PURPOSE = "Performance test of frequent pause and plays of peer connections"
 CRITERIA = "Fails if the tab freezes during the test"
-ATTRIBUTES = "suite:hotrod"
+ATTRIBUTES = ""
 TIME = "MEDIUM"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "video"
diff --git a/server/site_tests/enterprise_CFM_AutotestSmokeTest/control b/server/site_tests/enterprise_CFM_AutotestSmokeTest/control
index 0ce9665..a6df5a3 100644
--- a/server/site_tests/enterprise_CFM_AutotestSmokeTest/control
+++ b/server/site_tests/enterprise_CFM_AutotestSmokeTest/control
@@ -9,7 +9,7 @@
 PURPOSE = ("Server-side smoke test used for tracking the stability of the "
            "Autotest framework on CFM platforms.")
 CRITERIA = "Fails if the Autotest framework doesn't work as expected."
-ATTRIBUTES = "suite:hotrod,suite:bluestreak-pre-cq"
+ATTRIBUTES = "suite:bluestreak-pre-cq"
 TIME = "SHORT"
 TEST_CATEGORY = "Functional"
 TEST_TYPE = "server"