diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/pkgs/development/python-modules/browsermob-proxy/default.nix
new file mode 100644
index 000000000000..67dd0c8c9d73
--- /dev/null
+++ b/pkgs/development/python-modules/browsermob-proxy/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "browsermob-proxy";
+  version = "0.8.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1bxvmghm834gsfz3pm69772wzhh15p8ci526b25dpk3z4315nd7v";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  meta = {
+    description = "A library for interacting with Browsermob Proxy";
+    homepage = "http://oss.theautomatedtester.co.uk/browsermob-proxy-py";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix
new file mode 100644
index 000000000000..8e8af34fcdc6
--- /dev/null
+++ b/pkgs/development/python-modules/marionette-harness/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, mozprofile
+, mozversion
+, moztest
+, manifestparser
+, marionette_driver
+, browsermob-proxy
+, wptserve
+}:
+
+buildPythonPackage rec {
+  pname = "marionette-harness";
+  version = "4.0.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0726zm09nwh4kkd4xirva4596svlifkkpbaywlmq2yb6ayk7d4vl";
+  };
+
+  propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest 
+    wptserve manifestparser marionette_driver ]; 
+
+  meta = {
+    description = "Mozilla Marionette protocol test automation harness";
+    homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix
new file mode 100644
index 000000000000..9a3fe07680d9
--- /dev/null
+++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix
@@ -0,0 +1,25 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "manifestparser";
+  version = "1.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "06cnj682ynacwpi63k1427vbf7ydnwh3dchc4b11yw8ii25wbc5d";
+  };
+
+  propagatedBuildInputs = [ ];
+
+  meta = {
+    description = "Mozilla test manifest handling";
+    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
new file mode 100644
index 000000000000..ea72c0d0d18d
--- /dev/null
+++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix
@@ -0,0 +1,27 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, mozversion
+, mozrunner
+}:
+
+buildPythonPackage rec {
+  pname = "marionette_driver";
+  version = "2.2.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0phlb4r6xf3yv1z23kn6paxkq6fvfywj2h4gcbavg4w6jd63vd5z";
+  };
+
+  propagatedBuildInputs = [ mozversion mozrunner ]; 
+
+  meta = {
+    description = "Mozilla Marionette driver";
+    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Marionette";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/pkgs/development/python-modules/marionette-harness/mozcrash.nix
new file mode 100644
index 000000000000..d47cdd83976b
--- /dev/null
+++ b/pkgs/development/python-modules/marionette-harness/mozcrash.nix
@@ -0,0 +1,27 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, mozfile
+, mozlog
+}:
+
+buildPythonPackage rec {
+  pname = "mozcrash";
+  version = "1.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "02101v6v2jqlv6cbrmmggj12asz9vz6m50b6mk9mq17b1dr1zik3";
+  };
+
+  propagatedBuildInputs = [ mozfile mozlog ];
+
+  meta = {
+    description = "Minidump stack trace extractor";
+    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
new file mode 100644
index 000000000000..2dc0e9b860aa
--- /dev/null
+++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix
@@ -0,0 +1,27 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, moznetwork
+, mozprocess
+}:
+
+buildPythonPackage rec {
+  pname = "mozdevice";
+  version = "0.50";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0cfxzhfxdphlzj80vkd3h7m0mg5w7zhb8h6f5lmybliqdiv9vz20";
+  };
+
+  propagatedBuildInputs = [ moznetwork mozprocess ];
+
+  meta = {
+    description = "Mozilla-authored device management";
+    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix
new file mode 100644
index 000000000000..eb627dcf243c
--- /dev/null
+++ b/pkgs/development/python-modules/marionette-harness/mozfile.nix
@@ -0,0 +1,28 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "mozfile";
+  version = "1.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0mz941np62mg0zncy74d8fbq9fafsxjsxlwdsydl92badhrhzc6k";
+  };
+
+  propagatedBuildInputs = [ ];
+
+  # mozhttpd -> moznetwork -> mozinfo -> mozfile
+  doCheck = false;
+
+  meta = {
+    description = "File utilities for Mozilla testing";
+    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
new file mode 100644
index 000000000000..32580d7f7726
--- /dev/null
+++ b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix
@@ -0,0 +1,26 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, moznetwork
+}:
+
+buildPythonPackage rec {
+  pname = "mozhttpd";
+  version = "0.7";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "10y1cr933ajx9ni701ayb7r361pak9wrzr7pdpyx81kkbjddq7qa";
+  };
+
+  propagatedBuildInputs = [ moznetwork ]; 
+
+  meta = {
+    description = "Webserver for Mozilla testing";
+    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix
new file mode 100644
index 000000000000..556706930948
--- /dev/null
+++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix
@@ -0,0 +1,26 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, mozfile
+}:
+
+buildPythonPackage rec {
+  pname = "mozinfo";
+  version = "0.9";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1jwhnhbj7xipwh33wf7m12pw5g662dpr1chkp6p2fmy0mwpn2y4z";
+  };
+
+  propagatedBuildInputs = [ mozfile ]; 
+
+  meta = {
+    description = "System information utilities for Mozilla testing";
+    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix
new file mode 100644
index 000000000000..34a1fbf3aa0b
--- /dev/null
+++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix
@@ -0,0 +1,27 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, blessings
+, mozfile
+}:
+
+buildPythonPackage rec {
+  pname = "mozlog";
+  version = "3.4";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1m4d9i1kzcmkhipfd5czv05f2s84j1byx3cv4y2irjmwq5v6cyiq";
+  };
+
+  propagatedBuildInputs = [ blessings mozfile ]; 
+
+  meta = {
+    description = "Mozilla logging library";
+    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix
new file mode 100644
index 000000000000..6a42ad0d872d
--- /dev/null
+++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix
@@ -0,0 +1,27 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, mozlog
+, mozinfo
+}:
+
+buildPythonPackage rec {
+  pname = "moznetwork";
+  version = "0.27";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09ypx5wif0mly6fk3491nlzg8whg6qw24x7h9w70hykdqindbh2s";
+  };
+
+  propagatedBuildInputs = [ mozlog mozinfo ]; 
+
+  meta = {
+    description = "Network utilities for Mozilla testing";
+    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix
new file mode 100644
index 000000000000..db3c713acad4
--- /dev/null
+++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix
@@ -0,0 +1,26 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, mozinfo
+}:
+
+buildPythonPackage rec {
+  pname = "mozprocess";
+  version = "0.25";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0lfflwjkwvc8bqvsgdib3b78w2pms8nharh3sc3zgsrmqb1mbzks";
+  };
+
+  propagatedBuildInputs = [ mozinfo ];
+
+  meta = {
+    description = "Mozilla-authored process handling";
+    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix
new file mode 100644
index 000000000000..3639d63e5484
--- /dev/null
+++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix
@@ -0,0 +1,28 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, mozlog
+, mozfile
+, mozhttpd
+}:
+
+buildPythonPackage rec {
+  pname = "mozprofile";
+  version = "0.28";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15xsdhrpbg7hlr6nvb3k3ci33h786hrv12az8j2k7aa9gzjcf8nh";
+  };
+
+  propagatedBuildInputs = [ mozlog mozfile mozhttpd ]; 
+
+  meta = {
+    description = "Mozilla application profile handling library";
+    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
new file mode 100644
index 000000000000..20942955c4c7
--- /dev/null
+++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix
@@ -0,0 +1,33 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, mozdevice
+, mozfile
+, mozinfo
+, mozlog
+, mozprocess
+, mozprofile
+, mozcrash
+}:
+
+buildPythonPackage rec {
+  pname = "mozrunner";
+  version = "6.13";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1d5k3a0w1iyyk6l28l65j47grq87zd207h369x4vahq02nrx2g6l";
+  };
+
+  propagatedBuildInputs = [ mozdevice mozfile mozinfo mozlog mozprocess
+    mozprofile mozcrash ];
+
+  meta = {
+    description = "Mozilla application start/stop helpers";
+    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/development/python-modules/marionette-harness/moztest.nix b/pkgs/development/python-modules/marionette-harness/moztest.nix
new file mode 100644
index 000000000000..0ac697ce35f1
--- /dev/null
+++ b/pkgs/development/python-modules/marionette-harness/moztest.nix
@@ -0,0 +1,26 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, mozinfo
+}:
+
+buildPythonPackage rec {
+  pname = "moztest";
+  version = "0.8";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1pg9pqq4xnn14k1jqbyqg81zag2v66y725537v6hixi41yiqkdas";
+  };
+
+  propagatedBuildInputs = [ mozinfo ];
+
+  meta = {
+    description = "Mozilla test result storage and output";
+    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix
new file mode 100644
index 000000000000..7d01767490cb
--- /dev/null
+++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix
@@ -0,0 +1,27 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+, mozlog
+, mozdevice
+}:
+
+buildPythonPackage rec {
+  pname = "mozversion";
+  version = "1.4";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15ipddn6bpqxl590cy37fj52vgpa4faw2dax1mwvdxj7b18s3pwh";
+  };
+
+  propagatedBuildInputs = [ mozlog mozdevice ];
+
+  meta = {
+    description = "Application version information library";
+    homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix
new file mode 100644
index 000000000000..1d454fc4a628
--- /dev/null
+++ b/pkgs/development/python-modules/wptserve/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "wptserve";
+  version = "1.4.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0rkq4dpl41hx64m3ad0bwn0r5i7sf8qpgazgkq905j3wgk5aaspg";
+  };
+
+  propagatedBuildInputs = [ ];
+
+  meta = {
+    description = "A webserver intended for web browser testing";
+    homepage = " http://wptserve.readthedocs.org/";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a1eed6bb3d5b..c0b63fb4b412 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -159,6 +159,8 @@ in {
 
   breathe = callPackage ../development/python-modules/breathe { };
 
+  browsermob-proxy = callPackage ../development/python-modules/browsermob-proxy {};
+
   bugseverywhere = callPackage ../applications/version-management/bugseverywhere {};
 
   dbf = callPackage ../development/python-modules/dbf { };
@@ -13764,6 +13766,21 @@ in {
     };
   };
 
+  manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix {};
+  marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix {};
+  mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix {};
+  mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix {};
+  mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix {};
+  mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix {};
+  mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix {};
+  mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix {};
+  moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix {};
+  mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix {};
+  mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix {};
+  mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix {};
+  moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix {};
+  mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix {};
+  marionette-harness = callPackage ../development/python-modules/marionette-harness {};
 
   markupsafe = buildPythonPackage rec {
     name = "markupsafe-${version}";
@@ -31200,6 +31217,8 @@ EOF
     };
   };
 
+  wptserve = callPackage ../development/python-modules/wptserve {};
+
   yenc = callPackage ../development/python-modules/yenc {
   };