15 files changed, 14 insertions, 80 deletions

diff --git a/debian/changelog b/debian/changelog
index 372d1a1..c2becca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+plainbox-provider-oem (0.41) xenial; urgency=medium
+
+ * Modify whitelists for removing tests
+
+ Following tests are removed:
+ firmware/fwts_desktop_diagnosis_hwe
+ disk/smart
+ mediacard/mmc* and also after-suspend mmc tests
+ expresscard/verification
+
+ -- Nara Huang <nara.huang@canonical.com> Fri, 30 Jun 2017 16:55:39 +0800
+
 plainbox-provider-oem (0.40) xenial; urgency=medium
 
 * Add Carson tests, whitelist and launcher.
diff --git a/units/carson-full.pxu b/units/carson-full.pxu
index f3f496e..f40bc3e 100644
--- a/units/carson-full.pxu
+++ b/units/carson-full.pxu
@@ -16,5 +16,7 @@ exclude:
 2013.com.canonical.certification::led/mute
 2013.com.canonical.certification::touchscreen/.*
 2013.com.canonical.certification::firmware/fwts_desktop_diagnosis_hwe
+ 2013.com.canonical.certification::mediacard/mmc.*
+ 2013.com.canonical.certification::disk/smart.*
 nested_part:
 2013.com.canonical.certification::client-cert-16-04
diff --git a/units/somerville-BIOS.pxu b/units/somerville-BIOS.pxu
index 56b7f66..0b07c3a 100644
--- a/units/somerville-BIOS.pxu
+++ b/units/somerville-BIOS.pxu
@@ -77,8 +77,6 @@ include:
 2013.com.canonical.certification::esata/insert certification-status=blocker
 2013.com.canonical.certification::esata/storage-test certification-status=blocker
 2013.com.canonical.certification::esata/remove certification-status=blocker
- # 2013.com.canonical.certification::__expresscard__
- 2013.com.canonical.certification::expresscard/verification certification-status=blocker
 # 2013.com.canonical.certification::__firewire__
 2013.com.canonical.certification::firewire/insert certification-status=blocker
 2013.com.canonical.certification::firewire/storage-test certification-status=blocker
@@ -196,9 +194,6 @@ include:
 2013.com.canonical.certification::led/hdd
 2013.com.canonical.certification::led/touchpad
 # 2013.com.canonical.certification::__mediacard__
- 2013.com.canonical.certification::mediacard/mmc-insert certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-storage certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-remove certification-status=non-blocker
 2013.com.canonical.certification::mediacard/sd-insert certification-status=blocker
 2013.com.canonical.certification::mediacard/sd-storage certification-status=blocker
 2013.com.canonical.certification::mediacard/sd-remove certification-status=blocker
@@ -347,9 +342,6 @@ include:
 2013.com.canonical.certification::camera/still_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/pointing-after-suspend_.* certification-status=blocker
 2013.com.canonical.certification::suspend/clicking-after-suspend_.* certification-status=blocker
- 2013.com.canonical.certification::suspend/mmc-insert-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-storage-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-remove-after-suspend certification-status=non-blocker
 2013.com.canonical.certification::suspend/sd-insert-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sd-storage-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sd-remove-after-suspend certification-status=blocker
@@ -441,7 +433,6 @@ include:
 2013.com.canonical.certification::cpu/clocktest
 2013.com.canonical.certification::disk/stats_.*
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::memory/info certification-status=blocker
 2013.com.canonical.certification::memory/check certification-status=blocker
diff --git a/units/somerville-blocker.pxu b/units/somerville-blocker.pxu
index 86a22bd..aa6ca2a 100644
--- a/units/somerville-blocker.pxu
+++ b/units/somerville-blocker.pxu
@@ -67,8 +67,6 @@ include:
 2013.com.canonical.certification::esata/insert certification-status=blocker
 2013.com.canonical.certification::esata/storage-test certification-status=blocker
 2013.com.canonical.certification::esata/remove certification-status=blocker
- # 2013.com.canonical.certification::__expresscard__
- 2013.com.canonical.certification::expresscard/verification certification-status=blocker
 # 2013.com.canonical.certification::__firewire__
 2013.com.canonical.certification::firewire/insert certification-status=blocker
 2013.com.canonical.certification::firewire/storage-test certification-status=blocker
@@ -331,7 +329,6 @@ include:
 2013.com.canonical.certification::cpu/topology certification-status=blocker
 2013.com.canonical.certification::disk/stats_.*
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::memory/info certification-status=blocker
 2013.com.canonical.certification::memory/check certification-status=blocker
diff --git a/units/somerville-cpu.pxu b/units/somerville-cpu.pxu
index 864724f..8fe32b4 100644
--- a/units/somerville-cpu.pxu
+++ b/units/somerville-cpu.pxu
@@ -196,7 +196,6 @@ include:
 2013.com.canonical.certification::cpu/clocktest
 2013.com.canonical.certification::disk/stats_.*
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::memory/info certification-status=blocker
 2013.com.canonical.certification::memory/check certification-status=blocker
diff --git a/units/somerville-full.pxu b/units/somerville-full.pxu
index e247bf5..962a190 100644
--- a/units/somerville-full.pxu
+++ b/units/somerville-full.pxu
@@ -77,8 +77,6 @@ include:
 2013.com.canonical.certification::esata/insert certification-status=blocker
 2013.com.canonical.certification::esata/storage-test certification-status=blocker
 2013.com.canonical.certification::esata/remove certification-status=blocker
- # 2013.com.canonical.certification::__expresscard__
- 2013.com.canonical.certification::expresscard/verification certification-status=blocker
 # 2013.com.canonical.certification::__firewire__
 2013.com.canonical.certification::firewire/insert certification-status=blocker
 2013.com.canonical.certification::firewire/storage-test certification-status=blocker
@@ -196,9 +194,6 @@ include:
 2013.com.canonical.certification::led/hdd
 2013.com.canonical.certification::led/touchpad
 # 2013.com.canonical.certification::__mediacard__
- 2013.com.canonical.certification::mediacard/mmc-insert certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-storage certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-remove certification-status=non-blocker
 2013.com.canonical.certification::mediacard/sd-insert certification-status=blocker
 2013.com.canonical.certification::mediacard/sd-storage certification-status=blocker
 2013.com.canonical.certification::mediacard/sd-remove certification-status=blocker
@@ -347,9 +342,6 @@ include:
 2013.com.canonical.certification::camera/still_after_suspend certification-status=blocker
 2013.com.canonical.certification::suspend/pointing-after-suspend_.* certification-status=blocker
 2013.com.canonical.certification::suspend/clicking-after-suspend_.* certification-status=blocker
- 2013.com.canonical.certification::suspend/mmc-insert-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-storage-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-remove-after-suspend certification-status=non-blocker
 2013.com.canonical.certification::suspend/sd-insert-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sd-storage-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sd-remove-after-suspend certification-status=blocker
@@ -440,7 +432,6 @@ include:
 2013.com.canonical.certification::cpu/clocktest
 2013.com.canonical.certification::disk/stats_.*
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::memory/info certification-status=blocker
 2013.com.canonical.certification::memory/check certification-status=blocker
diff --git a/units/somerville-graphic.pxu b/units/somerville-graphic.pxu
index 275a491..41ca956 100644
--- a/units/somerville-graphic.pxu
+++ b/units/somerville-graphic.pxu
@@ -189,7 +189,6 @@ include:
 2013.com.canonical.certification::benchmarks/graphics/gtkperf
 2013.com.canonical.certification::disk/stats_.*
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::memory/info certification-status=blocker
 2013.com.canonical.certification::memory/check certification-status=blocker
diff --git a/units/somerville-touch-webcam.pxu b/units/somerville-touch-webcam.pxu
index 7a51aaf..a93ff3e 100644
--- a/units/somerville-touch-webcam.pxu
+++ b/units/somerville-touch-webcam.pxu
@@ -122,7 +122,6 @@ include:
 2013.com.canonical.certification::benchmarks/graphics/gtkperf
 2013.com.canonical.certification::disk/stats_.*
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::memory/info certification-status=blocker
 2013.com.canonical.certification::memory/check certification-status=blocker
diff --git a/units/somerville-wireless.pxu b/units/somerville-wireless.pxu
index ef4d815..02a29bd 100644
--- a/units/somerville-wireless.pxu
+++ b/units/somerville-wireless.pxu
@@ -129,7 +129,6 @@ include:
 2013.com.canonical.certification::miscellanea/dmitest_client
 2013.com.canonical.certification::disk/stats_.*
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::memory/info certification-status=blocker
 2013.com.canonical.certification::memory/check certification-status=blocker
diff --git a/units/stella-full-14-04-3.pxu b/units/stella-full-14-04-3.pxu
index 8ff8c42..6cec49a 100644
--- a/units/stella-full-14-04-3.pxu
+++ b/units/stella-full-14-04-3.pxu
@@ -200,9 +200,6 @@ include:
 2013.com.canonical.certification::led/caps-lock certification-status=blocker
 2013.com.canonical.certification::led/touchpad
 #2013.com.canonical.certification::led/wireless
- 2013.com.canonical.certification::mediacard/mmc-insert certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-storage certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-remove certification-status=non-blocker
 2013.com.canonical.certification::mediacard/sd-insert certification-status=blocker
 2013.com.canonical.certification::mediacard/sd-storage certification-status=blocker
 2013.com.canonical.certification::mediacard/sd-remove certification-status=blocker
@@ -348,9 +345,6 @@ include:
 2013.com.canonical.certification::power-management/hibernate-single-log-attach
 2013.com.canonical.certification::keys/sleep certification-status=blocker
 2013.com.canonical.certification::suspend/pointing-after-suspend_.* certification-status=blocker
- 2013.com.canonical.certification::suspend/mmc-insert-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-storage-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-remove-after-suspend certification-status=non-blocker
 2013.com.canonical.certification::suspend/sd-insert-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sd-storage-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sd-remove-after-suspend certification-status=blocker
@@ -460,8 +454,6 @@ include:
 2013.com.canonical.certification::cpu/clocktest
 2013.com.canonical.certification::disk/stats_.* certification-status=blocker
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart certification-status=blocker
- 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::graphics/generator_3d_window_open_close
 2013.com.canonical.certification::graphics/generator_3d_window_move
diff --git a/units/stella-full-14-04.pxu b/units/stella-full-14-04.pxu
index 8022e58..63242ec 100644
--- a/units/stella-full-14-04.pxu
+++ b/units/stella-full-14-04.pxu
@@ -86,8 +86,6 @@ include:
 #esata/insert
 #esata/storage-test
 #esata/remove
- #__expresscard__
- #expresscard/verification
 #__firewire__
 #firewire/insert
 #firewire/storage-test
@@ -229,9 +227,6 @@ include:
 2013.com.canonical.certification::led/touchpad
 #2013.com.canonical.certification::led/wireless
 2013.com.canonical.certification::__mediacard__
- 2013.com.canonical.certification::mediacard/mmc-insert certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-storage certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-remove certification-status=non-blocker
 2013.com.canonical.certification::mediacard/sd-insert certification-status=blocker
 2013.com.canonical.certification::mediacard/sd-storage certification-status=blocker
 2013.com.canonical.certification::mediacard/sd-remove certification-status=blocker
@@ -398,9 +393,6 @@ include:
 2013.com.canonical.certification::keys/sleep certification-status=blocker
 2013.com.canonical.certification::suspend/pointing-after-suspend
 2013.com.canonical.certification::suspend/pointing-after-suspend_.* certification-status=blocker
- 2013.com.canonical.certification::suspend/mmc-insert-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-storage-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-remove-after-suspend certification-status=non-blocker
 2013.com.canonical.certification::suspend/sd-insert-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sd-storage-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sd-remove-after-suspend certification-status=blocker
@@ -515,8 +507,6 @@ include:
 2013.com.canonical.certification::disk/stats_.*
 2013.com.canonical.certification::disk/read_performance certification-status=blocker
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart certification-status=blocker
- 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
 2013.com.canonical.certification::disk/storage_devices
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::graphics/generator_3d_window_open_close
diff --git a/units/stella-full-16-04.pxu b/units/stella-full-16-04.pxu
index 7ea5436..74edf47 100644
--- a/units/stella-full-16-04.pxu
+++ b/units/stella-full-16-04.pxu
@@ -202,9 +202,6 @@ include:
 2013.com.canonical.certification::led/caps-lock certification-status=blocker
 2013.com.canonical.certification::led/touchpad
 #2013.com.canonical.certification::led/wireless
- 2013.com.canonical.certification::mediacard/mmc-insert certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-storage certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-remove certification-status=non-blocker
 2013.com.canonical.certification::mediacard/sd-insert certification-status=blocker
 2013.com.canonical.certification::mediacard/sd-storage certification-status=blocker
 2013.com.canonical.certification::mediacard/sd-remove certification-status=blocker
@@ -350,9 +347,6 @@ include:
 2013.com.canonical.certification::power-management/hibernate-single-log-attach
 2013.com.canonical.certification::keys/sleep certification-status=blocker
 2013.com.canonical.certification::suspend/pointing-after-suspend_.* certification-status=blocker
- 2013.com.canonical.certification::suspend/mmc-insert-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-storage-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-remove-after-suspend certification-status=non-blocker
 2013.com.canonical.certification::suspend/sd-insert-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sd-storage-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sd-remove-after-suspend certification-status=blocker
@@ -463,8 +457,6 @@ include:
 2013.com.canonical.certification::cpu/clocktest
 2013.com.canonical.certification::disk/stats_.* certification-status=blocker
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart 
- 2013.com.canonical.certification::disk/smart_.* 
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::graphics/generator_3d_window_open_close
 2013.com.canonical.certification::graphics/generator_3d_window_move
diff --git a/units/sutton-full-14-04-3.pxu b/units/sutton-full-14-04-3.pxu
index 4539c77..cfafec5 100644
--- a/units/sutton-full-14-04-3.pxu
+++ b/units/sutton-full-14-04-3.pxu
@@ -70,8 +70,6 @@ include:
 #2013.com.canonical.certification::esata/insert certification-status=blocker
 #2013.com.canonical.certification::esata/storage-test certification-status=blocker
 #2013.com.canonical.certification::esata/remove certification-status=blocker
- 2013.com.canonical.certification::__expresscard__
- 2013.com.canonical.certification::expresscard/verification certification-status=blocker
 #2013.com.canonical.certification::__firewire__
 #2013.com.canonical.certification::firewire/insert certification-status=blocker
 #2013.com.canonical.certification::firewire/storage-test certification-status=blocker
@@ -178,9 +176,6 @@ include:
 2013.com.canonical.certification::led/wlan certification-status=non-blocker
 2013.com.canonical.certification::led/wlan-disabled
 2013.com.canonical.certification::__mediacard__
- 2013.com.canonical.certification::mediacard/mmc-insert certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-storage certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-remove certification-status=non-blocker
 2013.com.canonical.certification::mediacard/sd-insert certification-status=blocker
 2013.com.canonical.certification::mediacard/sd-storage certification-status=blocker
 2013.com.canonical.certification::mediacard/sd-remove certification-status=blocker
@@ -339,9 +334,6 @@ include:
 2013.com.canonical.certification::suspend/keys_after_suspend/wireless
 2013.com.canonical.certification::suspend/keys_after_suspend/media-control
 2013.com.canonical.certification::suspend/keys_after_suspend/keyboard-backlight
- 2013.com.canonical.certification::suspend/mmc-insert-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-storage-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-remove-after-suspend certification-status=non-blocker
 2013.com.canonical.certification::suspend/sd-insert-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sd-storage-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sd-remove-after-suspend certification-status=blocker
@@ -401,8 +393,6 @@ include:
 2013.com.canonical.certification::disk/stats_.*
 2013.com.canonical.certification::disk/read_performance certification-status=blocker
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart certification-status=blocker
- 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
 2013.com.canonical.certification::disk/storage_devices
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::memory/info certification-status=blocker
diff --git a/units/sutton-full-14-04.pxu b/units/sutton-full-14-04.pxu
index a5a4af0..deaf82e 100644
--- a/units/sutton-full-14-04.pxu
+++ b/units/sutton-full-14-04.pxu
@@ -70,8 +70,6 @@ include:
 #2013.com.canonical.certification::esata/insert certification-status=blocker
 #2013.com.canonical.certification::esata/storage-test certification-status=blocker
 #2013.com.canonical.certification::esata/remove certification-status=blocker
- 2013.com.canonical.certification::__expresscard__
- 2013.com.canonical.certification::expresscard/verification certification-status=blocker
 #2013.com.canonical.certification::__firewire__
 #2013.com.canonical.certification::firewire/insert certification-status=blocker
 #2013.com.canonical.certification::firewire/storage-test certification-status=blocker
@@ -168,9 +166,6 @@ include:
 2013.com.canonical.certification::led/wlan certification-status=non-blocker
 2013.com.canonical.certification::led/wlan-disabled
 2013.com.canonical.certification::__mediacard__
- 2013.com.canonical.certification::mediacard/mmc-insert certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-storage certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-remove certification-status=non-blocker
 2013.com.canonical.certification::mediacard/sd-insert certification-status=blocker
 2013.com.canonical.certification::mediacard/sd-storage certification-status=blocker
 2013.com.canonical.certification::mediacard/sd-remove certification-status=blocker
@@ -329,9 +324,6 @@ include:
 2013.com.canonical.certification::suspend/keys_after_suspend/wireless
 2013.com.canonical.certification::suspend/keys_after_suspend/media-control
 2013.com.canonical.certification::suspend/keys_after_suspend/keyboard-backlight
- 2013.com.canonical.certification::suspend/mmc-insert-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-storage-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-remove-after-suspend certification-status=non-blocker
 2013.com.canonical.certification::suspend/sd-insert-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sd-storage-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sd-remove-after-suspend certification-status=blocker
@@ -390,8 +382,6 @@ include:
 2013.com.canonical.certification::disk/stats_.*
 2013.com.canonical.certification::disk/read_performance certification-status=blocker
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart certification-status=blocker
- 2013.com.canonical.certification::disk/smart_.* certification-status=blocker
 2013.com.canonical.certification::disk/storage_devices
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::memory/info certification-status=blocker
diff --git a/units/sutton-full-16-04.pxu b/units/sutton-full-16-04.pxu
index e0973c0..fb3cdb4 100644
--- a/units/sutton-full-16-04.pxu
+++ b/units/sutton-full-16-04.pxu
@@ -73,7 +73,6 @@ include:
 # See Automated Tests section at the end of this file
 2013.com.canonical.certification::disk/detect certification-status=blocker
 #2013.com.canonical.certification::disk/hdd-parking
- 2013.com.canonical.certification::expresscard/verification certification-status=blocker
 2013.com.canonical.certification::thunderbolt/insert certification-status=non-blocker
 2013.com.canonical.certification::thunderbolt/storage-test certification-status=non-blocker
 2013.com.canonical.certification::thunderbolt/remove certification-status=non-blocker
@@ -203,9 +202,6 @@ include:
 2013.com.canonical.certification::led/caps-lock certification-status=blocker
 2013.com.canonical.certification::led/touchpad
 #2013.com.canonical.certification::led/wireless
- 2013.com.canonical.certification::mediacard/mmc-insert certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-storage certification-status=non-blocker
- 2013.com.canonical.certification::mediacard/mmc-remove certification-status=non-blocker
 2013.com.canonical.certification::mediacard/sd-insert certification-status=blocker
 2013.com.canonical.certification::mediacard/sd-storage certification-status=blocker
 2013.com.canonical.certification::mediacard/sd-remove certification-status=blocker
@@ -351,9 +347,6 @@ include:
 2013.com.canonical.certification::power-management/hibernate-single-log-attach
 2013.com.canonical.certification::keys/sleep certification-status=blocker
 2013.com.canonical.certification::suspend/pointing-after-suspend_.* certification-status=blocker
- 2013.com.canonical.certification::suspend/mmc-insert-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-storage-after-suspend certification-status=non-blocker
- 2013.com.canonical.certification::suspend/mmc-remove-after-suspend certification-status=non-blocker
 2013.com.canonical.certification::suspend/sd-insert-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sd-storage-after-suspend certification-status=blocker
 2013.com.canonical.certification::suspend/sd-remove-after-suspend certification-status=blocker
@@ -477,8 +470,6 @@ include:
 2013.com.canonical.certification::cpu/clocktest
 2013.com.canonical.certification::disk/stats_.* certification-status=blocker
 2013.com.canonical.certification::disk/read_performance_.* certification-status=blocker
- 2013.com.canonical.certification::disk/smart 
- 2013.com.canonical.certification::disk/smart_.* 
 2013.com.canonical.certification::disk/storage_device_.* certification-status=blocker
 2013.com.canonical.certification::graphics/generator_3d_window_open_close
 2013.com.canonical.certification::graphics/generator_3d_window_move