--- a/testing/docker/tester/VERSION
+++ b/testing/docker/tester/VERSION
@@ -1,1 +1,1 @@
-0.4.7
+0.4.8

deleted file mode 100755
--- a/testing/docker/tester/bin/entrypoint
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/bash -ex
-
-# This file is intended to be used as the "entrypoint" or first command in the
-# docker image. It uses "eval" so it takes place of the usual /bin/bash -c
-# <stuff> conventions you need when running a docker image. Primarily it
-# bootstraps any processes that need to run outside of mozharness (like Xvfb)
-
-# XXX: Note that all tests could be faster at smaller bit depth
-Xvfb :0 -nolisten tcp -screen 0 1600x1200x24 2>/dev/null &
-export DISPLAY=:0
-
-pulseaudio --start
-
-# Download mozharness only when $MOZHARNESS_URL is defined
-if [ ! -z "$MOZHARNESS_URL" ]; then
-  buildbot_step 'Download mozharness' wget -c $MOZHARNESS_URL && \
-    unzip -q mozharness.zip && \
-    rm mozharness.zip
-fi
-
-buildbot_step 'Running tests' $@

deleted file mode 100755
--- a/testing/docker/tester/bin/pull_gaia.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash -vex
-test $GAIA_BASE_REPOSITORY # ex: https://github.com/mozilla-b2g/gaia
-test $GAIA_HEAD_REPOSITORY # ex: https://github.com/mozilla-b2g/gaia
-test $GAIA_REF # ex: master
-test $GAIA_REV # ex: master
-
-tc-vcs \
-  checkout \
-  /home/worker/gaia \
-  $GAIA_BASE_REPOSITORY \
-  $GAIA_HEAD_REPOSITORY \
-  $GAIA_REV \
-  $GAIA_REF \

--- a/testing/docker/tester/bin/test.sh
+++ b/testing/docker/tester/bin/test.sh
@@ -18,14 +18,14 @@ fi
 ####
 # Now get the test-linux.sh script from the given Gecko tree and run it with
 # the same arguments.
 ####
 
 [ -d $WORKSPACE ] || mkdir -p $WORKSPACE
 cd $WORKSPACE
 
-script=testing/taskcluster/scripts/tester/test-mulet.sh
+script=testing/taskcluster/scripts/tester/test-b2g.sh
 url=${GECKO_HEAD_REPOSITORY}/raw-file/${GECKO_HEAD_REV}/${script}
-curl --fail -o ./test-mulet.sh --retry 10 $url
-chmod +x ./test-mulet.sh
-exec ./test-mulet.sh "${@}"
+curl --fail -o ./test-b2g.sh --retry 10 $url
+chmod +x ./test-b2g.sh
+exec ./test-b2g.sh "${@}"
 

rename from testing/taskcluster/scripts/tester/test-mulet.sh
rename to testing/taskcluster/scripts/tester/test-b2g.sh

--- a/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_cpp_unit.yml
@@ -3,26 +3,28 @@
   from: 'tasks/tests/b2g_unittest_base.yml'
 task:
   metadata:
     name: '[TC] CPP Unit Tests'
     description: CPP Unit Tests test run
 
   workerType: b2gtest-emulator
   payload:
+    env:
+      NEED_XVFB: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
+      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
     command:
-      - entrypoint
-      - >
-        python ./mozharness/scripts/b2g_emulator_unittest.py
-        --config-file ./mozharness/configs/b2g/taskcluster_emulator_automation.py
-        --test-suite cppunittest
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --xre-url https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-        --symbols-url {{symbols_url}}
+      - bash
+      - /home/worker/bin/test.sh
+      - --test-suite=cppunittest
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
+      - --symbols-url={{symbols_url}}
     artifacts:
       'public/build':
         type: directory
         path: '/home/worker/artifacts/'
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
     treeherderEnv:

--- a/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_crashtest.yml
@@ -3,29 +3,31 @@
   from: 'tasks/tests/b2g_unittest_base.yml'
 task:
   metadata:
     name: '[TC] Crashtest'
     description: Crashtest test run {{chunk}}
 
   workerType: b2gtest-emulator
   payload:
+    env:
+      NEED_XVFB: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
+      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
     maxRunTime: 3600
     command:
-      - entrypoint
-      - >
-        python ./mozharness/scripts/b2g_emulator_unittest.py
-        --config-file ./mozharness/configs/b2g/taskcluster_emulator_automation.py
-        --test-suite crashtest
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --xre-url https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-        --symbols-url {{symbols_url}}
-        --this-chunk {{chunk}}
-        --total-chunk {{total_chunks}}
+      - bash
+      - /home/worker/bin/test.sh
+      - --test-suite=crashtest
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
+      - --symbols-url={{symbols_url}}
+      - --this-chunk={{chunk}}
+      - --total-chunk={{total_chunks}}
     artifacts:
       'public/build':
         type: directory
         path: '/home/worker/artifacts/'
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
     chunks:

--- a/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_js_reftest.yml
@@ -3,27 +3,29 @@
   from: 'tasks/tests/b2g_unittest_base.yml'
 task:
   metadata:
     name: '[TC] JSReftest'
     description: JSReftest test run {{chunk}}
 
   workerType: b2gtest-emulator
   payload:
+    env:
+      NEED_XVFB: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
+      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
     command:
-      - entrypoint
-      - >
-        python ./mozharness/scripts/b2g_emulator_unittest.py
-        --config-file ./mozharness/configs/b2g/taskcluster_emulator_automation.py
-        --test-suite jsreftest
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --xre-url https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-        --this-chunk {{chunk}}
-        --total-chunk {{total_chunks}}
+      - bash
+      - /home/worker/bin/test.sh
+      - --test-suite=jsreftest
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
+      - --this-chunk={{chunk}}
+      - --total-chunk={{total_chunks}}
     artifacts:
       'public/build':
         type: directory
         path: '/home/worker/artifacts/'
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
     treeherder:

--- a/testing/taskcluster/tasks/tests/b2g_emulator_marionette.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_marionette.yml
@@ -3,26 +3,28 @@
   from: 'tasks/tests/b2g_unittest_base.yml'
 task:
   metadata:
     name: '[TC] Marionette Framework Unit Tests'
     description: Marionette Framework Unit Tests test run
 
   workerType: b2gtest-emulator
   payload:
+    env:
+      NEED_XVFB: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
+      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
     command:
-      - entrypoint
-      - >
-        python ./mozharness/scripts/b2g_emulator_unittest.py
-        --config-file ./mozharness/configs/b2g/taskcluster_emulator_automation.py
-        --test-suite marionette
-        --test-manifest unit-tests.ini
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --xre-url https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
+      - bash
+      - /home/worker/bin/test.sh
+      - --test-suite=marionette
+      - --test-manifest=unit-tests.ini
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
     artifacts:
       'public/build':
         type: directory
         path: '/home/worker/artifacts/'
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
     treeherder:

--- a/testing/taskcluster/tasks/tests/b2g_emulator_marionette_webapi.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_marionette_webapi.yml
@@ -3,26 +3,28 @@
   from: 'tasks/tests/b2g_unittest_base.yml'
 task:
   metadata:
     name: '[TC] Marionette WebAPI Tests'
     description: Marionette WebAPI test run
 
   workerType: b2gtest-emulator
   payload:
+    env:
+      NEED_XVFB: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
+      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
     command:
-      - entrypoint
-      - >
-        python ./mozharness/scripts/b2g_emulator_unittest.py
-        --config-file ./mozharness/configs/b2g/taskcluster_emulator_automation.py
-        --test-suite marionette
-        --test-manifest webapi-tests.ini
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --xre-url https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
+      - bash
+      - /home/worker/bin/test.sh
+      - --test-suite=marionette
+      - --test-manifest=webapi-tests.ini
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
     artifacts:
       'public/build':
         type: directory
         path: '/home/worker/artifacts/'
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
     treeherderEnv:

--- a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest.yml
@@ -3,29 +3,31 @@
   from: 'tasks/tests/b2g_unittest_base.yml'
 task:
   metadata:
     name: '[TC] Mochitest'
     description: Mochitest test run {{chunk}}
 
   workerType: b2gtest-emulator
   payload:
+    env:
+      NEED_XVFB: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
+      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
     maxRunTime: 7200
     command:
-      - entrypoint
-      - >
-        python ./mozharness/scripts/b2g_emulator_unittest.py
-        --config-file ./mozharness/configs/b2g/taskcluster_emulator_automation.py
-        --test-suite mochitest
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --xre-url https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-        --symbols-url {{symbols_url}}
-        --this-chunk {{chunk}}
-        --total-chunk {{total_chunks}}
+      - bash
+      - /home/worker/bin/test.sh
+      - --test-suite=mochitest
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
+      - --symbols-url={{symbols_url}}
+      - --this-chunk={{chunk}}
+      - --total-chunk={{total_chunks}}
     artifacts:
       'public/build':
         type: directory
         path: '/home/worker/artifacts/'
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
     treeherderEnv:

--- a/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_mochitest_media.yml
@@ -3,26 +3,28 @@
   from: 'tasks/tests/b2g_unittest_base.yml'
 task:
   metadata:
     name: '[TC] Mochitest'
     description: Mochitest Media test run
 
   workerType: b2gtest-emulator
   payload:
+    env:
+      NEED_XVFB: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
+      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
     command:
-      - entrypoint
-      - >
-        python ./mozharness/scripts/b2g_emulator_unittest.py
-        --config-file ./mozharness/configs/b2g/taskcluster_emulator_automation.py
-        --test-suite mochitest
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --xre-url https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-        dom/media/tests
+      - bash
+      - /home/worker/bin/test.sh
+      - --test-suite=mochitest
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
+      - dom/media/tests
     artifacts:
       'public/build':
         type: directory
         path: '/home/worker/artifacts/'
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
     treeherder:

--- a/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_reftest.yml
@@ -5,29 +5,30 @@ task:
   metadata:
     name: '[TC] Reftest'
     description: Reftest test run {{chunk}}
 
   workerType: b2gtest-emulator
   payload:
     maxRunTime: 7200
     env:
+      NEED_XVFB: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
+      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
       GALLIUM_DRIVER: 'softpipe'
     command:
-      - entrypoint
-      - >
-        python ./mozharness/scripts/b2g_emulator_unittest.py
-        --config-file ./mozharness/configs/b2g/taskcluster_emulator_automation.py
-        --test-suite reftest
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --xre-url https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-        --symbols-url {{symbols_url}}
-        --this-chunk {{chunk}}
-        --total-chunk {{total_chunks}}
+      - bash
+      - /home/worker/bin/test.sh
+      - --test-suite=reftest
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
+      - --symbols-url={{symbols_url}}
+      - --this-chunk={{chunk}}
+      - --total-chunk={{total_chunks}}
     artifacts:
       'public/build':
         type: directory
         path: '/home/worker/artifacts/'
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
     chunks:

--- a/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml
+++ b/testing/taskcluster/tasks/tests/b2g_emulator_xpcshell_chunked.yml
@@ -3,30 +3,32 @@
   from: 'tasks/tests/b2g_unittest_base.yml'
 task:
   metadata:
     name: '[TC] XPCShell'
     description: XPCShell test run {{chunk}}
 
   workerType: b2gtest-emulator
   payload:
+    env:
+      NEED_XVFB: true
+      MOZHARNESS_SCRIPT: 'mozharness/scripts/b2g_emulator_unittest.py'
+      MOZHARNESS_CONFIG: 'mozharness/configs/b2g/taskcluster_emulator_automation.py'
     maxRunTime: 6000
     command:
-      - entrypoint
-      - >
-        python ./mozharness/scripts/b2g_emulator_unittest.py
-        --config-file ./mozharness/configs/b2g/taskcluster_emulator_automation.py
-        --test-suite xpcshell
-        --installer-url {{build_url}}
-        --test-packages-url {{test_packages_url}}
-        --xre-url https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-        --busybox-url {{busybox_url}}
-        --symbols-url {{symbols_url}}
-        --this-chunk {{chunk}}
-        --total-chunk {{total_chunks}}
+      - bash
+      - /home/worker/bin/test.sh
+      - --test-suite=xpcshell
+      - --installer-url={{build_url}}
+      - --test-packages-url={{test_packages_url}}
+      - --xre-url=https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
+      - --busybox-url={{busybox_url}}
+      - --symbols-url={{symbols_url}}
+      - --this-chunk={{chunk}}
+      - --total-chunk={{total_chunks}}
     artifacts:
       'public/build':
         type: directory
         path: '/home/worker/artifacts/'
         expires: '{{#from_now}}1 year{{/from_now}}'
 
   extra:
     chunks:

deleted file mode 100644
--- a/testing/taskcluster/tasks/tests/b2g_gaia_unit_oop.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-$inherits:
-  from: 'tasks/tests/b2g_unittest_base.yml'
-task:
-  metadata:
-    name: '[TC] Gaia Unit Test OOP'
-    description: Gaia Unit Test OOP
-
-  payload:
-    command:
-      - entrypoint
-      - ./bin/pull_gaia.sh &&
-      - >
-        python ./mozharness/scripts/gaia_unit.py
-        --config-file ./mozharness/configs/b2g/taskcluster_gaia_unit_production.py
-        --browser-arg -oop
-        --installer-url {{build_url}}
-        --test-url {{tests_url}}
-        --gaia-repo https://hg.mozilla.org/integration/gaia-central
-        --gaia-dir /home/worker
-        --xre-url https://api.pub.build.mozilla.org/tooltool/sha512/cefa8c00db04969d3a50e2a5509bd4ea1dc17d256a651a9518cb28dad72e87a1dbbcd3c88ef770be0edf0ab73d2d73925140df93618ffb7fab81b789d312f547
-    artifacts:
-      'public/build':
-        type: directory
-        path: '/home/worker/artifacts/'
-        expires: '{{#from_now}}1 year{{/from_now}}'
-
-  extra:
-    treeherder:
-      symbol: 'Gu-oop'
-      productName: b2g