Index: build/unittest.sh
===================================================================
diff -u -rda002bda7f668f9bca3e959d7cdd4f8498a1a1e9 -r79e61ee53092eb822da1cb54c0eb2b2702a95ba9
--- build/unittest.sh	(.../unittest.sh)	(revision da002bda7f668f9bca3e959d7cdd4f8498a1a1e9)
+++ build/unittest.sh	(.../unittest.sh)	(revision 79e61ee53092eb822da1cb54c0eb2b2702a95ba9)
@@ -188,32 +188,23 @@
     echo "start_xvfb: Display: $1"
 
     xvfb-run --server-num=$1 --server-args="-ac -screen 0 1280x1024x24" dbus-run-session xfwm4 &
-    PID=$!
-    echo "PID: $PID"
-
-    XFWM4PID=`pstree -T -p $PID | grep xfwm4 | sed 's/^.*xfwm4.*(\([0-9]\+\))/\1/'`
-    echo $XFWM4PID > $HOME/.xvfb_xfwm4_$1.pid
-    echo "XFWM4PID: $XFWM4PID"
-    return 0
+    XVFB_PID=$!
+    echo "XVFB_PID: $XVFB_PID"
 }
 
 function stop_xvfb() {
-    # Stops the specified virtual display
-    echo "stop_xvfb: Display: $1"
-
-    if [ $# -eq 0 ]
-    then
-        echo "Usage: $0 new_display_number"
-        return 1
+    if [[ ! -z $XVFB_PID ]]; then
+        kill -9 $XVFB_PID       
     fi
-
-    kill `cat $HOME/.xvfb_xfwm4_$1.pid`
-    rm $HOME/.xvfb_xfwm4_$1.pid
-    return 0
+    # in case it was left running with an unknown PID
+    killall run-xvfb
+    killall Xvfb
+    sleep 2
 }
 
 function start_SquishServer() {
     echo " ------------------------------ Starting the Squish Server"
+    stop_xvfb
     start_xvfb $DISPLAY
 
     $SQUISH_DIR/bin/squishserver            \