new file mode 100644
--- /dev/null
+++ b/services/sync/tests/tps/addons/api/test-webext@quality.mozilla.org.json
@@ -0,0 +1,21 @@
+{
+  "next": null,
+  "results": [
+    {
+      "name": "Tet Webext XPI",
+      "type": "extension",
+      "guid": "test-webext@quality.mozilla.org",
+      "current_version": {
+        "version": "1.0",
+        "files": [
+          {
+            "platform": "all",
+            "size": 3412,
+            "url": "http://127.0.0.1:4567/addons/webextension.xpi"
+          }
+        ]
+      },
+      "last_updated": "2018-04-17T18:24:42Z"
+    }
+  ]
+}
\ No newline at end of file

deleted file mode 100644
--- a/services/sync/tests/tps/addons/api/unsigned-xpi@tests.mozilla.org.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "next": null,
-  "results": [
-    {
-      "name": "Unsigned Test XPI",
-      "type": "extension",
-      "guid": "unsigned-xpi@tests.mozilla.org",
-      "current_version": {
-        "version": "1.0",
-        "files": [
-          {
-            "platform": "all",
-            "size": 452,
-            "url": "http://127.0.0.1:4567/addons/unsigned.xpi"
-          }
-        ]
-      },
-      "last_updated": "2011-09-05T20:42:09Z"
-    }
-  ]
-}
\ No newline at end of file

deleted file mode 100644
index 51b00475a9641ea9d608874a3ab7679da3a4374b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001

new file mode 100644
index 0000000000000000000000000000000000000000..0ed64f79ac9e2d0ea2459fc6d6f9f95d593e8b3b
GIT binary patch
literal 3412
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
bfZtUH+Em##ND$jb8kljZG0qBtY(#$p+lgxr

--- a/services/sync/tests/tps/all_tests.json
+++ b/services/sync/tests/tps/all_tests.json
@@ -17,17 +17,17 @@
     "test_bug546807.js",
     "test_history_collision.js",
     "test_privbrw_passwords.js",
     "test_privbrw_tabs.js",
     "test_bookmarks_in_same_named_folder.js",
     "test_client_wipe.js",
     "test_special_tabs.js",
     "test_addon_restartless_xpi.js",
-    "test_addon_nonrestartless_xpi.js",
+    "test_addon_webext_xpi.js",
     "test_addon_reconciling.js",
     "test_addon_wipe.js",
     "test_existing_bookmarks.js",
     "test_addresses.js",
     "test_creditcards.js"
   ]
 }
 

deleted file mode 100644
--- a/services/sync/tests/tps/test_addon_nonrestartless_xpi.js
+++ /dev/null
@@ -1,121 +0,0 @@
-
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// This test verifies that install of extensions that require restart
-// syncs between profiles.
-EnableEngines(["addons"]);
-
-var phases = {
-  "phase01": "profile1",
-  "phase02": "profile1",
-  "phase03": "profile2",
-  "phase04": "profile2",
-  "phase05": "profile1",
-  "phase06": "profile1",
-  "phase07": "profile2",
-  "phase08": "profile2",
-  "phase09": "profile1",
-  "phase10": "profile1",
-  "phase11": "profile2",
-  "phase12": "profile2",
-  "phase13": "profile1",
-  "phase14": "profile1",
-  "phase15": "profile2",
-  "phase16": "profile2"
-};
-
-const id = "unsigned-xpi@tests.mozilla.org";
-
-Phase("phase01", [
-  [Addons.verifyNot, [id]],
-  [Addons.install, [id]],
-  [Sync],
-  [Addons.skipValidation] // Validation disabled due to bug 1427835
-]);
-Phase("phase02", [
-  [Addons.verify, [id], STATE_ENABLED],
-  [Sync],
-  [Addons.skipValidation] // Validation disabled due to bug 1427835
-]);
-Phase("phase03", [
-  [Addons.verifyNot, [id]],
-  [Sync],
-  [Addons.skipValidation] // Validation disabled due to bug 1427835
-]);
-Phase("phase04", [
-  [Addons.verify, [id], STATE_ENABLED],
-  [Sync],
-  [Addons.skipValidation] // Validation disabled due to bug 1427835
-]);
-
-// Now we disable the add-on
-Phase("phase05", [
-  [EnsureTracking],
-  [Addons.setEnabled, [id], STATE_DISABLED],
-  [Sync],
-  [Addons.skipValidation] // Validation disabled due to bug 1380472
-]);
-Phase("phase06", [
-  [Addons.verify, [id], STATE_DISABLED],
-  [Sync],
-  [Addons.skipValidation] // Validation disabled due to bug 1380472
-]);
-Phase("phase07", [
-  [Addons.verify, [id], STATE_ENABLED],
-  [Sync],
-  [Addons.skipValidation] // Validation disabled due to bug 1380472
-]);
-Phase("phase08", [
-  [Addons.verify, [id], STATE_DISABLED],
-  [Sync],
-  [Addons.skipValidation] // Validation disabled due to bug 1380472
-]);
-
-// Now we re-enable it again.
-Phase("phase09", [
-  [EnsureTracking],
-  [Addons.setEnabled, [id], STATE_ENABLED],
-  [Sync],
-  [Addons.skipValidation] // Validation disabled due to bug 1427835
-]);
-Phase("phase10", [
-  [Addons.verify, [id], STATE_ENABLED],
-  [Sync],
-  [Addons.skipValidation] // Validation disabled due to bug 1427835
-]);
-Phase("phase11", [
-  [Addons.verify, [id], STATE_DISABLED],
-  [Sync],
-  [Addons.skipValidation] // Validation disabled due to bug 1427835
-]);
-Phase("phase12", [
-  [Addons.verify, [id], STATE_ENABLED],
-  [Sync],
-  [Addons.skipValidation] // Validation disabled due to bug 1427835
-]);
-
-// And we uninstall it
-
-Phase("phase13", [
-  [EnsureTracking],
-  [Addons.verify, [id], STATE_ENABLED],
-  [Addons.uninstall, [id]],
-  [Sync],
-  [Addons.skipValidation] // Validation disabled due to bug 1427835
-]);
-Phase("phase14", [
-  [Addons.verifyNot, [id]],
-  [Sync],
-  [Addons.skipValidation] // Validation disabled due to bug 1427835
-]);
-Phase("phase15", [
-  [Addons.verify, [id], STATE_ENABLED],
-  [Sync],
-  [Addons.skipValidation] // Validation disabled due to bug 1427835
-]);
-Phase("phase16", [
-  [Addons.verifyNot, [id]],
-  [Sync],
-  [Addons.skipValidation] // Validation disabled due to bug 1427835
-]);

new file mode 100644
--- /dev/null
+++ b/services/sync/tests/tps/test_addon_webext_xpi.js
@@ -0,0 +1,71 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// This test verifies that install of web extensions sync to other profiles.
+// It's more or less copied from test_addon_restartless_xpi with a different id.
+
+EnableEngines(["addons"]);
+
+var phases = {
+  "phase01": "profile1",
+  "phase02": "profile2",
+  "phase03": "profile1",
+  "phase04": "profile2",
+  "phase05": "profile1",
+  "phase06": "profile2",
+  "phase07": "profile1",
+  "phase08": "profile2"
+};
+
+const id = "test-webext@quality.mozilla.org";
+
+// Verify install is synced
+Phase("phase01", [
+  [Addons.verifyNot, [id]],
+  [Addons.install, [id]],
+  [Addons.verify, [id], STATE_ENABLED],
+  [Sync]
+]);
+Phase("phase02", [
+  [Addons.verifyNot, [id]],
+  [Sync],
+  [Addons.verify, [id], STATE_ENABLED]
+]);
+
+// Now disable and see that is is synced.
+Phase("phase03", [
+  [EnsureTracking],
+  [Addons.setEnabled, [id], STATE_DISABLED],
+  [Addons.verify, [id], STATE_DISABLED],
+  [Sync]
+]);
+Phase("phase04", [
+  [Sync],
+  [Addons.verify, [id], STATE_DISABLED]
+]);
+
+// Enable and see it is synced.
+Phase("phase05", [
+  [EnsureTracking],
+  [Addons.setEnabled, [id], STATE_ENABLED],
+  [Addons.verify, [id], STATE_ENABLED],
+  [Sync]
+]);
+Phase("phase06", [
+  [Sync],
+  [Addons.verify, [id], STATE_ENABLED]
+]);
+
+// Uninstall and see it is synced.
+Phase("phase07", [
+  [EnsureTracking],
+  [Addons.verify, [id], STATE_ENABLED],
+  [Addons.uninstall, [id]],
+  [Addons.verifyNot, [id]],
+  [Sync]
+]);
+Phase("phase08", [
+  [Addons.verify, [id], STATE_ENABLED],
+  [Sync],
+  [Addons.verifyNot, [id]]
+]);

--- a/services/sync/tests/tps/test_addon_wipe.js
+++ b/services/sync/tests/tps/test_addon_wipe.js
@@ -10,17 +10,17 @@ EnableEngines(["addons"]);
 
 var phases = {
   "phase01": "profile1",
   "phase02": "profile1",
   "phase03": "profile1"
 };
 
 const id1 = "restartless-xpi@tests.mozilla.org";
-const id2 = "unsigned-xpi@tests.mozilla.org";
+const id2 = "test-webext@quality.mozilla.org";
 
 Phase("phase01", [
   [Addons.install, [id1]],
   [Addons.install, [id2]],
   [Sync]
 ]);
 Phase("phase02", [
   [Addons.verify, [id1], STATE_ENABLED],