diff --git a/containers/base/php-base-dev/Dockerfile b/containers/base/php-base-dev/Dockerfile
index f8431ed..fadd69e 100644
--- a/containers/base/php-base-dev/Dockerfile
+++ b/containers/base/php-base-dev/Dockerfile
@@ -56,7 +56,6 @@ RUN apt-get clean && apt-get update && \
     make \
     mysql-client \
     ncurses-dev \
-    phantomjs \
     php5-dev \
     postgresql-client \
     postgresql-client-common \
@@ -66,11 +65,26 @@ RUN apt-get clean && apt-get update && \
     sudo \
     unixODBC-dev \
     unzip \
-    sqlite3 && \
-   apt-get clean && apt-get autoremove -y && \
+    sqlite3 \
+    libicu52 \
+    libjpeg8 \
+    libfontconfig \
+    libwebp5 \
+    unzip && \
+    apt-get clean && apt-get autoremove -y && \
     rm /etc/cron.d/php5
 
 ##
+# PhantomJS
+##
+RUN curl -L https://github.com/bprodoehl/phantomjs/releases/download/v2.0.0-20150528/phantomjs-2.0.0-20150528-u1404-x86_64.zip -o ~/phantomjs-2.0.zip && \
+    unzip -j ~/phantomjs-2.0.zip -d ~/phantomjs && \
+    mv ~/phantomjs/phantomjs /usr/bin/phantomjs && \
+    rm -f ~/phantomjs-2.0.zip && \
+    rm -rf ~/phantomjs && \
+    chmod 755 /usr/bin/phantomjs
+
+##
 # PHPENV.
 ##
 
diff --git a/containers/base/php-base/Dockerfile b/containers/base/php-base/Dockerfile
index 799fd83..a494c5c 100644
--- a/containers/base/php-base/Dockerfile
+++ b/containers/base/php-base/Dockerfile
@@ -56,7 +56,6 @@ RUN apt-get clean && apt-get update && \
     make \
     mysql-client \
     ncurses-dev \
-    phantomjs \
     php5-dev \
     postgresql-client \
     postgresql-client-common \
@@ -66,11 +65,26 @@ RUN apt-get clean && apt-get update && \
     sudo \
     unixODBC-dev \
     unzip \
-    sqlite3 && \
-   apt-get clean && apt-get autoremove -y && \
+    sqlite3 \
+    libicu52 \
+    libjpeg8 \
+    libfontconfig \
+    libwebp5 \
+    unzip && \
+    apt-get clean && apt-get autoremove -y && \
     rm /etc/cron.d/php5
 
 ##
+# PhantomJS
+##
+RUN curl -L https://github.com/bprodoehl/phantomjs/releases/download/v2.0.0-20150528/phantomjs-2.0.0-20150528-u1404-x86_64.zip -o ~/phantomjs-2.0.zip && \
+    unzip -j ~/phantomjs-2.0.zip -d ~/phantomjs && \
+    mv ~/phantomjs/phantomjs /usr/bin/phantomjs && \
+    rm -f ~/phantomjs-2.0.zip && \
+    rm -rf ~/phantomjs && \
+    chmod 755 /usr/bin/phantomjs
+
+##
 # PHPENV.
 ##
 
diff --git a/src/DrupalCI/Plugin/JobTypes/simpletest/drupalci.yml b/src/DrupalCI/Plugin/JobTypes/simpletest/drupalci.yml
index ed8c5c7..6b276c4 100644
--- a/src/DrupalCI/Plugin/JobTypes/simpletest/drupalci.yml
+++ b/src/DrupalCI/Plugin/JobTypes/simpletest/drupalci.yml
@@ -32,9 +32,6 @@ setup:
 install:
 execute:
   command:
-    - apt-get install -y daemon
-    - daemon -- nohup phantomjs --ssl-protocol=any --ignore-ssl-errors=true /var/www/html/vendor/jcalderonzumba/gastonjs/src/Client/main.js 8510 1024 768
-    - sleep 5
     - php -v
     - php %DCI_RunScript% --list --php /opt/phpenv/shims/php > /var/www/html/artifacts/testgroups.txt
   testcommand:
diff --git a/src/DrupalCI/Plugin/JobTypes/simpletest_javascript/SimpletestJavascriptJob.php b/src/DrupalCI/Plugin/JobTypes/simpletest_javascript/SimpletestJavascriptJob.php
new file mode 100644
index 0000000..8b0a04a
--- /dev/null
+++ b/src/DrupalCI/Plugin/JobTypes/simpletest_javascript/SimpletestJavascriptJob.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace DrupalCI\Plugin\JobTypes\simpletest;
+
+/**
+ * @PluginID("simpletest_javascript")
+ */
+class SimpletestJavascriptJob extends SimpletestJob {
+
+  /**
+   * @var string
+   */
+  public $jobType = 'simpletest_javascript';
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getDefaultArguments() {
+    $default_arguments = parent::getDefaultArguments();
+    $default_arguments['DCI_Concurrency'] = 1;
+
+    return $default_arguments;
+  }
+
+}
diff --git a/src/DrupalCI/Plugin/JobTypes/simpletest/drupalci.yml b/src/DrupalCI/Plugin/JobTypes/simpletest_javascript/drupalci.yml
similarity index 85%
copy from src/DrupalCI/Plugin/JobTypes/simpletest/drupalci.yml
copy to src/DrupalCI/Plugin/JobTypes/simpletest_javascript/drupalci.yml
index ed8c5c7..1b4a0b4 100644
--- a/src/DrupalCI/Plugin/JobTypes/simpletest/drupalci.yml
+++ b/src/DrupalCI/Plugin/JobTypes/simpletest_javascript/drupalci.yml
@@ -32,13 +32,12 @@ setup:
 install:
 execute:
   command:
-    - apt-get install -y daemon
-    - daemon -- nohup phantomjs --ssl-protocol=any --ignore-ssl-errors=true /var/www/html/vendor/jcalderonzumba/gastonjs/src/Client/main.js 8510 1024 768
+    - daemon -- nohup /usr/bin/phantomjs --ssl-protocol=any --ignore-ssl-errors=true /var/www/html/vendor/jcalderonzumba/gastonjs/src/Client/main.js 8510 1024 768
     - sleep 5
     - php -v
     - php %DCI_RunScript% --list --php /opt/phpenv/shims/php > /var/www/html/artifacts/testgroups.txt
   testcommand:
-    - cd /var/www/html && sudo -u www-data php %DCI_RunScript% --url http://localhost/checkout --dburl %DCI_DBurl% %DCI_RunOptions% %DCI_TestGroups%
+    - cd /var/www/html && sudo -u www-data php %DCI_RunScript% --javascript --url http://localhost/checkout --dburl %DCI_DBurl% %DCI_RunOptions% %DCI_TestGroups%
 publish:
   gather_artifacts: /var/www/html/artifacts
   # archive: /var/www/html/results/artifacts.zip