diff --git a/testing/web-platform/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html b/testing/web-platform/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html
index fd8987cad1b94..a464c12fde470 100644
--- a/testing/web-platform/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html
+++ b/testing/web-platform/tests/content-security-policy/embedded-enforcement/subsumption_algorithm-general.html
@@ -1014,17 +1014,14 @@
 "
 :
 "
-Iframe
-should
-block
-if
+Removed
 plugin
 -
 types
 directive
-is
-not
-subsumed
+should
+be
+ignored
 .
 "
 "
@@ -1050,7 +1047,7 @@
 :
 IframeLoad
 .
-EXPECT_BLOCK
+EXPECT_LOAD
 }
 {
 "
@@ -1058,16 +1055,15 @@
 "
 :
 "
-Iframe
-should
-load
-if
+Removed
 plugin
 -
 types
 directive
-is
-subsumed
+should
+be
+ignored
+2
 .
 "
 "
@@ -1109,6 +1105,55 @@
 .
 EXPECT_LOAD
 }
+{
+"
+name
+"
+:
+"
+Removed
+plugin
+-
+types
+directive
+should
+be
+ignored
+3
+.
+"
+"
+required_csp
+"
+:
+"
+style
+-
+src
+'
+none
+'
+;
+plugin
+-
+types
+application
+/
+pdf
+"
+"
+returned_csp
+"
+:
+null
+"
+expected
+"
+:
+IframeLoad
+.
+EXPECT_BLOCK
+}
 ]
 ;
 tests
diff --git a/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-empty.sub.html b/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-empty.sub.html
deleted file mode 100644
index c0844a5c6673c..0000000000000
--- a/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-empty.sub.html
+++ /dev/null
@@ -1,187 +0,0 @@
-<
-!
-DOCTYPE
-html
->
-<
-html
->
-<
-head
->
-<
-meta
-http
--
-equiv
-=
-"
-Content
--
-Security
--
-Policy
-"
-content
-=
-"
-plugin
--
-types
-;
-"
->
-<
-script
-src
-=
-"
-/
-resources
-/
-testharness
-.
-js
-"
->
-<
-/
-script
->
-<
-script
-src
-=
-"
-/
-resources
-/
-testharnessreport
-.
-js
-"
->
-<
-/
-script
->
-<
-/
-head
->
-<
-body
->
-<
-script
->
-var
-t
-=
-async_test
-(
-'
-Should
-not
-load
-the
-object
-because
-plugin
--
-types
-allows
-no
-plugins
-'
-)
-;
-window
-.
-addEventListener
-(
-'
-securitypolicyviolation
-'
-t
-.
-step_func_done
-(
-function
-(
-e
-)
-{
-assert_equals
-(
-e
-.
-violatedDirective
-"
-plugin
--
-types
-"
-)
-;
-assert_equals
-(
-e
-.
-blockedURI
-"
-"
-)
-;
-}
-)
-)
-;
-<
-/
-script
->
-<
-object
-type
-=
-"
-application
-/
-x
--
-shockwave
--
-flash
-"
-data
-=
-"
-/
-content
--
-security
--
-policy
-/
-support
-/
-media
-/
-flash
-.
-swf
-"
->
-<
-/
-object
->
-<
-/
-body
->
-<
-/
-html
->
diff --git a/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-mismatched-data.html b/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-mismatched-data.html
deleted file mode 100644
index fa7c3d9dff2e9..0000000000000
--- a/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-mismatched-data.html
+++ /dev/null
@@ -1,185 +0,0 @@
-<
-!
-DOCTYPE
-html
->
-<
-html
->
-<
-head
->
-<
-meta
-http
--
-equiv
-=
-"
-Content
--
-Security
--
-Policy
-"
-content
-=
-"
-plugin
--
-types
-application
-/
-pdf
-;
-"
->
-<
-script
-src
-=
-"
-/
-resources
-/
-testharness
-.
-js
-"
->
-<
-/
-script
->
-<
-script
-src
-=
-"
-/
-resources
-/
-testharnessreport
-.
-js
-"
->
-<
-/
-script
->
-<
-/
-head
->
-<
-body
->
-<
-script
->
-var
-t
-=
-async_test
-(
-'
-Should
-not
-load
-the
-object
-because
-its
-declared
-type
-does
-not
-match
-its
-actual
-type
-'
-)
-;
-window
-.
-addEventListener
-(
-'
-securitypolicyviolation
-'
-t
-.
-step_func_done
-(
-function
-(
-e
-)
-{
-assert_equals
-(
-e
-.
-violatedDirective
-"
-plugin
--
-types
-"
-)
-;
-assert_equals
-(
-e
-.
-blockedURI
-"
-"
-)
-;
-}
-)
-)
-;
-<
-/
-script
->
-<
-object
-type
-=
-"
-application
-/
-pdf
-"
-data
-=
-"
-data
-:
-application
-/
-x
--
-shockwave
--
-flash
-asdf
-"
->
-<
-/
-object
->
-<
-/
-body
->
-<
-/
-html
->
diff --git a/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-mismatched-url.html b/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-mismatched-url.html
deleted file mode 100644
index e85a5e90281f0..0000000000000
--- a/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-mismatched-url.html
+++ /dev/null
@@ -1,189 +0,0 @@
-<
-!
-DOCTYPE
-html
->
-<
-html
->
-<
-head
->
-<
-meta
-http
--
-equiv
-=
-"
-Content
--
-Security
--
-Policy
-"
-content
-=
-"
-plugin
--
-types
-application
-/
-pdf
-;
-"
->
-<
-script
-src
-=
-"
-/
-resources
-/
-testharness
-.
-js
-"
->
-<
-/
-script
->
-<
-script
-src
-=
-"
-/
-resources
-/
-testharnessreport
-.
-js
-"
->
-<
-/
-script
->
-<
-/
-head
->
-<
-body
->
-<
-script
->
-var
-t
-=
-async_test
-(
-'
-Should
-not
-load
-the
-object
-because
-its
-declared
-type
-does
-not
-match
-its
-actual
-type
-'
-)
-;
-window
-.
-addEventListener
-(
-'
-securitypolicyviolation
-'
-t
-.
-step_func_done
-(
-function
-(
-e
-)
-{
-assert_equals
-(
-e
-.
-violatedDirective
-"
-plugin
--
-types
-"
-)
-;
-assert_equals
-(
-e
-.
-blockedURI
-"
-"
-)
-;
-}
-)
-)
-;
-<
-/
-script
->
-<
-object
-type
-=
-"
-application
-/
-pdf
-"
-data
-=
-"
-/
-content
--
-security
--
-policy
-/
-support
-/
-media
-/
-flash
-.
-swf
-"
->
-<
-/
-object
->
-<
-/
-body
->
-<
-/
-html
->
diff --git a/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-notype-data.html b/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-notype-data.html
deleted file mode 100644
index efc8bce30d26a..0000000000000
--- a/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-notype-data.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<
-!
-DOCTYPE
-html
->
-<
-html
->
-<
-head
->
-<
-meta
-http
--
-equiv
-=
-"
-Content
--
-Security
--
-Policy
-"
-content
-=
-"
-plugin
--
-types
-application
-/
-pdf
-;
-"
->
-<
-script
-src
-=
-"
-/
-resources
-/
-testharness
-.
-js
-"
->
-<
-/
-script
->
-<
-script
-src
-=
-"
-/
-resources
-/
-testharnessreport
-.
-js
-"
->
-<
-/
-script
->
-<
-/
-head
->
-<
-body
->
-<
-script
->
-var
-t
-=
-async_test
-(
-'
-Should
-not
-load
-the
-object
-because
-it
-does
-not
-have
-a
-declared
-type
-'
-)
-;
-window
-.
-addEventListener
-(
-'
-securitypolicyviolation
-'
-t
-.
-step_func_done
-(
-function
-(
-e
-)
-{
-assert_equals
-(
-e
-.
-violatedDirective
-"
-plugin
--
-types
-"
-)
-;
-assert_equals
-(
-e
-.
-blockedURI
-"
-"
-)
-;
-}
-)
-)
-;
-<
-/
-script
->
-<
-!
--
--
-Objects
-need
-to
-declare
-an
-explicit
-type
--
--
->
-<
-object
-data
-=
-"
-data
-:
-application
-/
-x
--
-shockwave
--
-flash
-asdf
-"
->
-<
-/
-object
->
-<
-/
-body
->
-<
-/
-html
->
diff --git a/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-notype-url.html b/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-notype-url.html
deleted file mode 100644
index 5f18ced5e06d2..0000000000000
--- a/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-notype-url.html
+++ /dev/null
@@ -1,194 +0,0 @@
-<
-!
-DOCTYPE
-html
->
-<
-html
->
-<
-head
->
-<
-meta
-http
--
-equiv
-=
-"
-Content
--
-Security
--
-Policy
-"
-content
-=
-"
-plugin
--
-types
-application
-/
-pdf
-;
-"
->
-<
-script
-src
-=
-"
-/
-resources
-/
-testharness
-.
-js
-"
->
-<
-/
-script
->
-<
-script
-src
-=
-"
-/
-resources
-/
-testharnessreport
-.
-js
-"
->
-<
-/
-script
->
-<
-/
-head
->
-<
-body
->
-<
-script
->
-var
-t
-=
-async_test
-(
-'
-Should
-not
-load
-the
-object
-because
-it
-does
-not
-have
-a
-declared
-type
-'
-)
-;
-window
-.
-addEventListener
-(
-'
-securitypolicyviolation
-'
-t
-.
-step_func_done
-(
-function
-(
-e
-)
-{
-assert_equals
-(
-e
-.
-violatedDirective
-"
-plugin
--
-types
-"
-)
-;
-assert_equals
-(
-e
-.
-blockedURI
-"
-"
-)
-;
-}
-)
-)
-;
-<
-/
-script
->
-<
-!
--
--
-Objects
-need
-to
-declare
-an
-explicit
-type
--
--
->
-<
-object
-data
-=
-"
-/
-content
--
-security
--
-policy
-/
-support
-/
-media
-/
-flash
-.
-swf
-"
->
-<
-/
-object
->
-<
-/
-body
->
-<
-/
-html
->
diff --git a/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.html b/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.html
deleted file mode 100644
index 1a5441a856279..0000000000000
--- a/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.html
+++ /dev/null
@@ -1,141 +0,0 @@
-<
-!
-DOCTYPE
-html
->
-<
-html
->
-<
-head
->
-<
-script
-src
-=
-"
-/
-resources
-/
-testharness
-.
-js
-"
->
-<
-/
-script
->
-<
-script
-src
-=
-"
-/
-resources
-/
-testharnessreport
-.
-js
-"
->
-<
-/
-script
->
-<
-/
-head
->
-<
-body
->
-<
-object
-type
-=
-"
-application
-/
-x
--
-shockwave
--
-flash
-"
->
-<
-/
-object
->
-<
-!
--
--
-we
-rely
-on
-the
-report
-because
-we
-can
-'
-t
-rely
-on
-the
-onload
-event
-for
-"
-allowed
-"
-tests
-as
-it
-is
-not
-fired
-for
-object
-and
-embed
--
--
->
-<
-script
-async
-defer
-src
-=
-'
-.
-.
-/
-support
-/
-checkReport
-.
-sub
-.
-js
-?
-reportExists
-=
-false
-'
->
-<
-/
-script
->
-<
-/
-body
->
-<
-/
-html
->
diff --git a/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.html.sub.headers b/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.html.sub.headers
deleted file mode 100644
index 702466bd52d75..0000000000000
--- a/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-nourl-allowed.html.sub.headers
+++ /dev/null
@@ -1,73 +0,0 @@
-Set
--
-Cookie
-:
-plugintypes
--
-nourl
--
-allowed
-=
-{
-{
-id
-:
-uuid
-(
-)
-}
-}
-;
-Path
-=
-/
-content
--
-security
--
-policy
-/
-plugin
--
-types
-/
-Content
--
-Security
--
-Policy
-:
-plugin
--
-types
-application
-/
-x
--
-shockwave
--
-flash
-;
-report
--
-uri
-/
-reporting
-/
-resources
-/
-report
-.
-py
-?
-op
-=
-put
-&
-reportID
-=
-{
-{
-id
-}
-}
diff --git a/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-nourl-blocked.html b/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-nourl-blocked.html
deleted file mode 100644
index c775b05421fda..0000000000000
--- a/testing/web-platform/tests/content-security-policy/plugin-types/plugintypes-nourl-blocked.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<
-!
-DOCTYPE
-html
->
-<
-html
->
-<
-head
->
-<
-meta
-http
--
-equiv
-=
-"
-Content
--
-Security
--
-Policy
-"
-content
-=
-"
-plugin
--
-types
-application
-/
-pdf
-;
-"
->
-<
-script
-src
-=
-"
-/
-resources
-/
-testharness
-.
-js
-"
->
-<
-/
-script
->
-<
-script
-src
-=
-"
-/
-resources
-/
-testharnessreport
-.
-js
-"
->
-<
-/
-script
->
-<
-/
-head
->
-<
-body
->
-<
-script
->
-var
-t
-=
-async_test
-(
-'
-Should
-not
-load
-the
-object
-because
-it
-does
-not
-match
-plugin
--
-types
-'
-)
-;
-window
-.
-addEventListener
-(
-'
-securitypolicyviolation
-'
-t
-.
-step_func_done
-(
-function
-(
-e
-)
-{
-assert_equals
-(
-e
-.
-violatedDirective
-"
-plugin
--
-types
-"
-)
-;
-assert_equals
-(
-e
-.
-blockedURI
-"
-"
-)
-;
-}
-)
-)
-;
-<
-/
-script
->
-<
-object
-type
-=
-"
-application
-/
-x
--
-shockwave
--
-flash
-"
->
-<
-/
-object
->
-<
-/
-body
->
-<
-/
-html
->