diff --git a/webcrypto/tests/wpt-patches/WebCryptoAPI__encrypt_decrypt__aes.js.patch b/webcrypto/tests/wpt-patches/WebCryptoAPI__encrypt_decrypt__aes.js.patch
deleted file mode 100644
index 773d7b8..0000000
--- a/webcrypto/tests/wpt-patches/WebCryptoAPI__encrypt_decrypt__aes.js.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/WebCryptoAPI/encrypt_decrypt/aes.js b/WebCryptoAPI/encrypt_decrypt/aes.js
-index fdeb7963f..b2257a320 100644
---- a/WebCryptoAPI/encrypt_decrypt/aes.js
-+++ b/WebCryptoAPI/encrypt_decrypt/aes.js
-@@ -267,12 +267,6 @@ function run_test() {
-         all_promises.push(promise);
-     });
- 
--    promise_test(function() {
--        return Promise.all(all_promises)
--            .then(function() {done();})
--            .catch(function() {done();})
--    }, "setup");
--
-     // A test vector has all needed fields for encryption, EXCEPT that the
-     // key field may be null. This function replaces that null with the Correct
-     // CryptoKey object.
diff --git a/webcrypto/tests/wpt-patches/WebCryptoAPI__encrypt_decrypt__rsa.js.patch b/webcrypto/tests/wpt-patches/WebCryptoAPI__encrypt_decrypt__rsa.js.patch
deleted file mode 100644
index 839913a..0000000
--- a/webcrypto/tests/wpt-patches/WebCryptoAPI__encrypt_decrypt__rsa.js.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/WebCryptoAPI/encrypt_decrypt/rsa.js b/WebCryptoAPI/encrypt_decrypt/rsa.js
-index 5eae06e47..819878cf4 100644
---- a/WebCryptoAPI/encrypt_decrypt/rsa.js
-+++ b/WebCryptoAPI/encrypt_decrypt/rsa.js
-@@ -291,13 +291,7 @@ function run_test() {
-         });
- 
-         all_promises.push(promise);
--    });
--
--    promise_test(function() {
--        return Promise.all(all_promises)
--            .then(function() {done();})
--            .catch(function() {done();})
--    }, "setup");
-+    });    
- 
-     // A test vector has all needed fields for encryption, EXCEPT that the
-     // key field may be null. This function replaces that null with the Correct
diff --git a/webcrypto/tests/wpt-patches/WebCryptoAPI__generateKey__failures.js.patch b/webcrypto/tests/wpt-patches/WebCryptoAPI__generateKey__failures.js.patch
index 87c6f47..201d5f9 100644
--- a/webcrypto/tests/wpt-patches/WebCryptoAPI__generateKey__failures.js.patch
+++ b/webcrypto/tests/wpt-patches/WebCryptoAPI__generateKey__failures.js.patch
@@ -1,16 +1,8 @@
 diff --git a/WebCryptoAPI/generateKey/failures.js b/WebCryptoAPI/generateKey/failures.js
-index e0f0279a6..eaab20068 100644
+index e0f0279a6..61495ca75 100644
 --- a/WebCryptoAPI/generateKey/failures.js
 +++ b/WebCryptoAPI/generateKey/failures.js
-@@ -25,17 +25,17 @@ function run_test(algorithmNames) {
-         {name: "AES-CTR",  resultType: CryptoKey, usages: ["encrypt", "decrypt", "wrapKey", "unwrapKey"], mandatoryUsages: []},
-         {name: "AES-CBC",  resultType: CryptoKey, usages: ["encrypt", "decrypt", "wrapKey", "unwrapKey"], mandatoryUsages: []},
-         {name: "AES-GCM",  resultType: CryptoKey, usages: ["encrypt", "decrypt", "wrapKey", "unwrapKey"], mandatoryUsages: []},
--        {name: "AES-KW",   resultType: CryptoKey, usages: ["wrapKey", "unwrapKey"], mandatoryUsages: []},
-+        // {name: "AES-KW",   resultType: CryptoKey, usages: ["wrapKey", "unwrapKey"], mandatoryUsages: []},
-         {name: "HMAC",     resultType: CryptoKey, usages: ["sign", "verify"], mandatoryUsages: []},
-         {name: "RSASSA-PKCS1-v1_5", resultType: "CryptoKeyPair", usages: ["sign", "verify"], mandatoryUsages: ["sign"]},
-         {name: "RSA-PSS",  resultType: "CryptoKeyPair", usages: ["sign", "verify"], mandatoryUsages: ["sign"]},
+@@ -32,10 +32,10 @@ function run_test(algorithmNames) {
          {name: "RSA-OAEP", resultType: "CryptoKeyPair", usages: ["encrypt", "decrypt", "wrapKey", "unwrapKey"], mandatoryUsages: ["decrypt", "unwrapKey"]},
          {name: "ECDSA",    resultType: "CryptoKeyPair", usages: ["sign", "verify"], mandatoryUsages: ["sign"]},
          {name: "ECDH",     resultType: "CryptoKeyPair", usages: ["deriveKey", "deriveBits"], mandatoryUsages: ["deriveKey", "deriveBits"]},
diff --git a/webcrypto/tests/wpt-patches/WebCryptoAPI__sign_verify__ecdsa.js.patch b/webcrypto/tests/wpt-patches/WebCryptoAPI__sign_verify__ecdsa.js.patch
deleted file mode 100644
index 8a5ef7f..0000000
--- a/webcrypto/tests/wpt-patches/WebCryptoAPI__sign_verify__ecdsa.js.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/WebCryptoAPI/sign_verify/ecdsa.js b/WebCryptoAPI/sign_verify/ecdsa.js
-index 6bf662adc..dcda1a1b1 100644
---- a/WebCryptoAPI/sign_verify/ecdsa.js
-+++ b/WebCryptoAPI/sign_verify/ecdsa.js
-@@ -435,12 +435,6 @@ function run_test() {
-         all_promises.push(promise);
-     });
- 
--    promise_test(function() {
--        return Promise.all(all_promises)
--            .then(function() {done();})
--            .catch(function() {done();})
--    }, "setup");
--
-     // A test vector has all needed fields for signing and verifying, EXCEPT that the
-     // key field may be null. This function replaces that null with the Correct
-     // CryptoKey object.
diff --git a/webcrypto/tests/wpt-patches/WebCryptoAPI__sign_verify__hmac.js.patch b/webcrypto/tests/wpt-patches/WebCryptoAPI__sign_verify__hmac.js.patch
deleted file mode 100644
index 8b14c6a..0000000
--- a/webcrypto/tests/wpt-patches/WebCryptoAPI__sign_verify__hmac.js.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/WebCryptoAPI/sign_verify/hmac.js b/WebCryptoAPI/sign_verify/hmac.js
-index f5e2ad276..fcdf65a78 100644
---- a/WebCryptoAPI/sign_verify/hmac.js
-+++ b/WebCryptoAPI/sign_verify/hmac.js
-@@ -292,13 +292,6 @@ function run_test() {
-     });
- 
- 
--
--    promise_test(function() {
--        return Promise.all(all_promises)
--            .then(function() {done();})
--            .catch(function() {done();})
--    }, "setup");
--
-     // A test vector has all needed fields for signing and verifying, EXCEPT that the
-     // key field may be null. This function replaces that null with the Correct
-     // CryptoKey object.
diff --git a/webcrypto/tests/wpt-patches/WebCryptoAPI__sign_verify__rsa.js.patch b/webcrypto/tests/wpt-patches/WebCryptoAPI__sign_verify__rsa.js.patch
index 0ebbb5e..7c20fed 100644
--- a/webcrypto/tests/wpt-patches/WebCryptoAPI__sign_verify__rsa.js.patch
+++ b/webcrypto/tests/wpt-patches/WebCryptoAPI__sign_verify__rsa.js.patch
@@ -1,5 +1,5 @@
 diff --git a/WebCryptoAPI/sign_verify/rsa.js b/WebCryptoAPI/sign_verify/rsa.js
-index 5abadd3d4..494b707ee 100644
+index 5abadd3d4..6076bd7de 100644
 --- a/WebCryptoAPI/sign_verify/rsa.js
 +++ b/WebCryptoAPI/sign_verify/rsa.js
 @@ -156,7 +156,9 @@ function run_test() {
@@ -13,16 +13,3 @@ index 5abadd3d4..494b707ee 100644
          var promise = importVectorKeys(vector, ["verify"], ["sign"])
          .then(function(vectors) {
              promise_test(function(test) {
-@@ -364,12 +366,6 @@ function run_test() {
-     });
- 
- 
--    promise_test(function() {
--        return Promise.all(all_promises)
--            .then(function() {done();})
--            .catch(function() {done();})
--    }, "setup");
--
-     // A test vector has all needed fields for signing and verifying, EXCEPT that the
-     // key field may be null. This function replaces that null with the Correct
-     // CryptoKey object.