diff --git a/lib/js/test/build.xml b/lib/js/test/build.xml
old mode 100644
new mode 100755
index 32316a1..c052e64
--- a/lib/js/test/build.xml
+++ b/lib/js/test/build.xml
@@ -86,6 +86,7 @@
     <tstamp />
     <mkdir dir="${build}"/>
     <mkdir dir="${build}/lib"/>
+    <mkdir dir="${build}/log"/>
   </target>
 
   <target name="compile" description="compile the test suite" depends="init, generate, resolve">
@@ -93,7 +94,7 @@
     <javac srcdir="${src}" destdir="${build}" classpathref="libs.classpath" />
   </target>
 
-  <target name="jstest" description="" depends="compile, lint">
+  <target name="jstest" description="create the test suite jar file" depends="compile">
     <jar jarfile="${jar.file}" basedir="${build}"/>
   </target>
 
@@ -104,6 +105,40 @@
     </java>
   </target>
 
+  <target name="xvfb">
+    <echo>check if Xvfb is available:</echo>
+    <exec executable="Xvfb" failifexecutionfails="no" resultproperty="xvfb.present" failonerror="false" output="${build}/log/xvfb.log">
+      <arg line="--version"/>
+    </exec>
+  </target>
+
+  <target name="phantomjs" depends="xvfb" if="xvfb.present">
+    <echo>check if phantomjs is available:</echo>
+    <exec executable="phantomjs" failifexecutionfails="no" resultproperty="phantomjs.present" failonerror="false" output="${build}/log/phantomjs.log">
+      <arg line="--version"/>
+    </exec>
+  </target>
+
+  <target name="unittest" description="do unit tests with headless browser phantomjs" depends="phantomjs, jstest" if="phantomjs.present">
+    <parallel>
+      <exec executable="Xvfb" spawn="true" failonerror="false">
+        <arg line=":99" />
+      </exec>
+      <java classname="test.Httpd" fork="true" timeout="5000"
+        classpathref="test.classpath" failonerror="false" output="${build}/log/unittest.log">
+        <arg value="../" />
+      </java>
+      <sequential>
+        <sleep seconds="2"/>
+        <echo>Running Unit Tests with headless browser!</echo>
+        <exec executable="phantomjs" failonerror="true">
+          <env key="DISPLAY" value=":99"/>
+          <arg line="phantomjs-qunit.js http://localhost:8088/test/test.html" />
+        </exec>
+      </sequential>
+    </parallel>
+  </target>
+
   <target name="generate">
     <exec executable="${thrift.compiler}" failonerror="true">
       <arg line="--gen java ${thrift.dir}/test/ThriftTest.thrift" />
@@ -113,8 +148,7 @@
     </exec>
   </target>
 
-  <!-- @TODO QUnit tests as part of the testsuite-->
-  <target name="test" description="run test suite" depends="init, generate, resolve, lint"/>
+  <target name="test" description="run test suite" depends="init, generate, resolve, lint, jstest, unittest"/>
 
   <target name="lint" description="code quality checks" depends="generate, gjslint, jslint"/>