diff -Nru njplot-2.4/debian/changelog njplot-2.4/debian/changelog
--- njplot-2.4/debian/changelog	2016-11-03 00:27:19.000000000 +0000
+++ njplot-2.4/debian/changelog	2017-01-14 14:22:30.000000000 +0000
@@ -1,3 +1,20 @@
+njplot (2.4-7) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Andreas Tille and Sascha Steinbiss ]
+  * Add xauth to autopkgtest dependencies
+  * Use GLX extension for xvfb
+
+ -- Sascha Steinbiss <satta@debian.org>  Sat, 14 Jan 2017 14:22:30 +0000
+
+njplot (2.4-6) unstable; urgency=medium
+
+  * autopkgtest needs running X server - use xvfb
+  * debhelper 10
+
+ -- Andreas Tille <tille@debian.org>  Sat, 14 Jan 2017 08:57:50 +0100
+
 njplot (2.4-4) unstable; urgency=medium
 
   * Team upload
diff -Nru njplot-2.4/debian/compat njplot-2.4/debian/compat
--- njplot-2.4/debian/compat	2016-11-03 00:27:19.000000000 +0000
+++ njplot-2.4/debian/compat	2017-01-14 13:28:16.000000000 +0000
@@ -1 +1 @@
-9
+10
diff -Nru njplot-2.4/debian/control njplot-2.4/debian/control
--- njplot-2.4/debian/control	2016-11-03 00:27:19.000000000 +0000
+++ njplot-2.4/debian/control	2017-01-14 13:28:16.000000000 +0000
@@ -4,7 +4,7 @@
            Charles Plessy <plessy@debian.org>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
                libvibrant6-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/njplot.git
diff -Nru njplot-2.4/debian/tests/control njplot-2.4/debian/tests/control
--- njplot-2.4/debian/tests/control	2016-11-03 00:27:19.000000000 +0000
+++ njplot-2.4/debian/tests/control	2017-01-14 13:51:55.000000000 +0000
@@ -1,3 +1,3 @@
 Tests: run-unit-test
-Depends: @
+Depends: @, file, xvfb, xauth, mesa-utils, libgl1-mesa-dri
 Restrictions: allow-stderr
diff -Nru njplot-2.4/debian/tests/run-unit-test njplot-2.4/debian/tests/run-unit-test
--- njplot-2.4/debian/tests/run-unit-test	2016-11-03 00:27:19.000000000 +0000
+++ njplot-2.4/debian/tests/run-unit-test	2017-01-14 13:56:12.000000000 +0000
@@ -1,21 +1,26 @@
 #!/bin/bash
 set -e
 
-pkg="njplot"
-
 if [ "$AUTOPKGTEST_TMP" = "" ] ; then
   AUTOPKGTEST_TMP=`mktemp -d /tmp/${pkg}-test.XXXXXX`
 fi
 
-cp -a /usr/share/doc/${pkg}/examples/* $AUTOPKGTEST_TMP
+Xvfb :5 -screen 0 1600x1200x24 -ac +extension GLX +render -noreset -v  -fbdir $AUTOPKGTEST_TMP/ &
+XVFB_PID=$!
+echo $XVFB_PID
+export DISPLAY=:5
+export XAUTHORITY=/dev/null
+trap "kill $XVFB_PID" 0 INT QUIT ABRT PIPE TERM
 
+pkg="njplot"
+
+cp -a /usr/share/doc/${pkg}/examples/* $AUTOPKGTEST_TMP
 cd $AUTOPKGTEST_TMP
 
 gunzip *.gz
 
 echo "TEST START"
 
-echo "/usr/bin/njplot -psonly example.phb"
 /usr/bin/njplot -psonly example.phb
 
 echo "file example.ps"
diff -Nru njplot-2.4/debian/watch njplot-2.4/debian/watch
--- njplot-2.4/debian/watch	2016-11-03 00:27:19.000000000 +0000
+++ njplot-2.4/debian/watch	2017-01-14 13:28:17.000000000 +0000
@@ -1,2 +1,2 @@
-version=3
+version=4
 ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/njplot/njplot-(.*)\.tar.gz