diff --git a/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-both.ini b/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-both.ini
new file mode 100644
index 000000000000..a91348360e3a
--- /dev/null
+++ b/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-both.ini
@@ -0,0 +1,16 @@
+[DEFAULT]
+qemu = false
+browser = false
+b2g = true
+skip = false
+
+oop = both
+
+[test_success_both2.js]
+; oop unspecified
+[test_success_in_non_oop.js]
+oop = false
+[test_success_in_oop.js]
+oop = true
+[test_success_both.js]
+oop = both
diff --git a/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-false.ini b/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-false.ini
new file mode 100644
index 000000000000..1e9a1c0f0147
--- /dev/null
+++ b/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-false.ini
@@ -0,0 +1,16 @@
+[DEFAULT]
+qemu = false
+browser = false
+b2g = true
+skip = false
+
+oop = false
+
+[test_success_in_non_oop2.js]
+; oop unspecified
+[test_success_in_non_oop.js]
+oop = false
+[test_success_in_oop.js]
+oop = true
+[test_success_both.js]
+oop = both
diff --git a/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-true.ini b/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-true.ini
new file mode 100644
index 000000000000..498289cb0df2
--- /dev/null
+++ b/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-true.ini
@@ -0,0 +1,16 @@
+[DEFAULT]
+qemu = false
+browser = false
+b2g = true
+skip = false
+
+oop = true
+
+[test_success_in_oop2.js]
+; oop unspecified
+[test_success_in_non_oop.js]
+oop = false
+[test_success_in_oop.js]
+oop = true
+[test_success_both.js]
+oop = both
diff --git a/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-unspecified.ini b/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-unspecified.ini
new file mode 100644
index 000000000000..642c9c7d3669
--- /dev/null
+++ b/testing/marionette/client/marionette/tests/unit/oop/manifest-oop-unspecified.ini
@@ -0,0 +1,14 @@
+[DEFAULT]
+qemu = false
+browser = false
+b2g = true
+skip = false
+
+[test_success_in_non_oop2.js]
+; oop unspecified
+[test_success_in_non_oop.js]
+oop = false
+[test_success_in_oop.js]
+oop = true
+[test_success_both.js]
+oop = both
diff --git a/testing/marionette/client/marionette/tests/unit/oop/manifest.ini b/testing/marionette/client/marionette/tests/unit/oop/manifest.ini
new file mode 100644
index 000000000000..4bc5b6d6bf2c
--- /dev/null
+++ b/testing/marionette/client/marionette/tests/unit/oop/manifest.ini
@@ -0,0 +1,10 @@
+[DEFAULT]
+qemu = false
+browser = false
+b2g = true
+skip = false
+
+[include:manifest-oop-unspecified.ini]
+[include:manifest-oop-both.ini]
+[include:manifest-oop-true.ini]
+[include:manifest-oop-false.ini]
diff --git a/testing/marionette/client/marionette/tests/unit/oop/test_success_both.js b/testing/marionette/client/marionette/tests/unit/oop/test_success_both.js
new file mode 100644
index 000000000000..697cc70fefcf
--- /dev/null
+++ b/testing/marionette/client/marionette/tests/unit/oop/test_success_both.js
@@ -0,0 +1,3 @@
+MARIONETTE_TIMEOUT = 60000;
+ok(true, "Always success");
+finish();
diff --git a/testing/marionette/client/marionette/tests/unit/oop/test_success_both2.js b/testing/marionette/client/marionette/tests/unit/oop/test_success_both2.js
new file mode 100644
index 000000000000..697cc70fefcf
--- /dev/null
+++ b/testing/marionette/client/marionette/tests/unit/oop/test_success_both2.js
@@ -0,0 +1,3 @@
+MARIONETTE_TIMEOUT = 60000;
+ok(true, "Always success");
+finish();
diff --git a/testing/marionette/client/marionette/tests/unit/oop/test_success_in_non_oop.js b/testing/marionette/client/marionette/tests/unit/oop/test_success_in_non_oop.js
new file mode 100644
index 000000000000..9131cc077359
--- /dev/null
+++ b/testing/marionette/client/marionette/tests/unit/oop/test_success_in_non_oop.js
@@ -0,0 +1,3 @@
+MARIONETTE_TIMEOUT = 60000;
+ok(SpecialPowers.isMainProcess(), "SpecialPowers.isMainProcess()");
+finish();
diff --git a/testing/marionette/client/marionette/tests/unit/oop/test_success_in_non_oop2.js b/testing/marionette/client/marionette/tests/unit/oop/test_success_in_non_oop2.js
new file mode 100644
index 000000000000..9131cc077359
--- /dev/null
+++ b/testing/marionette/client/marionette/tests/unit/oop/test_success_in_non_oop2.js
@@ -0,0 +1,3 @@
+MARIONETTE_TIMEOUT = 60000;
+ok(SpecialPowers.isMainProcess(), "SpecialPowers.isMainProcess()");
+finish();
diff --git a/testing/marionette/client/marionette/tests/unit/oop/test_success_in_oop.js b/testing/marionette/client/marionette/tests/unit/oop/test_success_in_oop.js
new file mode 100644
index 000000000000..e14306a9b3c4
--- /dev/null
+++ b/testing/marionette/client/marionette/tests/unit/oop/test_success_in_oop.js
@@ -0,0 +1,3 @@
+MARIONETTE_TIMEOUT = 60000;
+ok(!SpecialPowers.isMainProcess(), "SpecialPowers.isMainProcess()");
+finish();
diff --git a/testing/marionette/client/marionette/tests/unit/oop/test_success_in_oop2.js b/testing/marionette/client/marionette/tests/unit/oop/test_success_in_oop2.js
new file mode 100644
index 000000000000..e14306a9b3c4
--- /dev/null
+++ b/testing/marionette/client/marionette/tests/unit/oop/test_success_in_oop2.js
@@ -0,0 +1,3 @@
+MARIONETTE_TIMEOUT = 60000;
+ok(!SpecialPowers.isMainProcess(), "SpecialPowers.isMainProcess()");
+finish();
diff --git a/testing/marionette/client/marionette/tests/unit/unit-tests.ini b/testing/marionette/client/marionette/tests/unit/unit-tests.ini
index 9f43328a6108..cc360bae3a8f 100644
--- a/testing/marionette/client/marionette/tests/unit/unit-tests.ini
+++ b/testing/marionette/client/marionette/tests/unit/unit-tests.ini
@@ -104,3 +104,5 @@ disabled = "Bug 925688"
 [test_screen_orientation.py]
 browser = false
 [test_errors.py]
+
+[include:oop/manifest.ini]