diff --git a/ChangeLog b/ChangeLog
index d0cb087..8009164 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2015-11-03 21:54  marc
+
+	* debian/control.in: updated dependencies
+
+2015-11-03 14:30  marc
+
+	* ChangeLog, ax_check_qt.m4, ax_init_standard_project.m4,
+	  bootstrap.sh, resolve-debbuilddeps.sh, src/commands.hxx,
+	  src/testgui.hxx, src/testgui.ui: prepared for build in a docker
+	  instance on jenkins
+
 2015-11-02 08:00  marc
 
 	* ChangeLog, debian/control.in: test requires xvfb-run
diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index c02825e..eef210e 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -265,14 +265,8 @@ maintainer-clean-cxx-targets:
 EOF
 ])
 
-# use this in configure.ac to support CppUnit for C++ unit tests
-AC_DEFUN([AX_USE_CPPUNIT], [
-  AM_PATH_CPPUNIT([1.0.0], [have_cppunit="yes"], [have_cppunit="no"])
-  # infos and warnings
-  if test "$have_cppunit" = "no"; then
-    AC_MSG_WARN([Missing cppunit development library!
-     - you cannot check the library using "make check"
-     - everything else works perfectly]); fi
+# use this in configure.ac to support tests without CppUnit
+AC_DEFUN([AX_BUILD_TEST], [
   AC_CONFIG_FILES([test/makefile])
   AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-test-targets], [test/makefile.in])
   test -f test/makefile.in && cat >> test/makefile.in <<EOF
@@ -283,6 +277,17 @@ maintainer-clean-test-targets:
 EOF
 ])
 
+# use this in configure.ac to support CppUnit for C++ unit tests
+AC_DEFUN([AX_USE_CPPUNIT], [
+  AM_PATH_CPPUNIT([1.0.0], [have_cppunit="yes"], [have_cppunit="no"])
+  # infos and warnings
+  if test "$have_cppunit" = "no"; then
+    AC_MSG_WARN([Missing cppunit development library!
+     - you cannot check the project using "make check"
+     - everything else works perfectly]); fi
+  AX_BUILD_TEST
+])
+
 # use this in configure.ac to support C++ examples
 AC_DEFUN([AX_BUILD_EXAMPLES], [
   AC_CONFIG_FILES([examples/makefile])
diff --git a/bootstrap.sh b/bootstrap.sh
index 2c7c4c3..4feef2d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -119,7 +119,7 @@ GENERATED FILES
     * scripts/makefile.in - if you enabled AX_USE_SCRIPTS
     * doc/makefile.am - if you enabled AX_USE_DOXYGEN
     * doc/doxyfile.in - if you enabled AX_USE_DOXYGEN
-    * test/makefile.am - if you enabled AX_USE_CPPUNIT
+    * test/makefile.am - if you enabled AX_BUILD_TEST or AX_USE_CPPUNIT
     * examples/makefile.am - if you enabled AX_BUILD_EXAMPLES
     * debian/changelog.in - if you enabled AX_USE_DEBIAN_PACKAGING
     * debian/control.in - if you enabled AX_USE_DEBIAN_PACKAGING
@@ -170,7 +170,7 @@ FILE DEPENDENCIES
     * test/makefile.am depends on AX_USE_LIBTOOL
     * html/makefile.am depends on AX_BUILD_HTML
     * doc/doxyfile.in depends on AX_BUILD_EXAMPLES
-    * debian/control.in depends on AX_USE_DOXYGEN, AX_USE_CPPUNIT,
+    * debian/control.in depends on AX_USE_DOXYGEN, AX_USE_CPPUNIT
       AX_CXX_QT, AX_CHECK_QT, AX_REQUIRE_QT, AX_USE_LIBTOOL
     * debian/${DEFAULT_PROJECT_NAME}.install depends on AX_USE_LIBTOOL
     * debian/${DEFAULT_PROJECT_NAME}.dirs depends on AX_USE_LIBTOOL
@@ -207,6 +207,7 @@ FILES
       * Enable Debian packaging by calling "make deb": AX_USE_DEBIAN_PACKAGING
       * Enable RPM packaging by calling "make rpm": AX_USE_RPM_PACKAGING
       * Enable C++ testing using CppUnit: AX_USE_CPPUNIT
+      * Enable other tests: AX_BUILD_TEST
       * Enable C++ examples, i.e. for libraries: AX_BUILD_EXAMPLES
       * Check for C++11 support: AX_CXX_COMPILE_STDCXX_11 (see ax_cxx_compile_stdcxx_11.m4)
       * Require a QT module: AX_REQUIRE_QT (see ax_check_qt.m4)
@@ -439,6 +440,7 @@ AX_INIT_STANDARD_PROJECT
 #AX_USE_DEBIAN_PACKAGING
 #AX_USE_RPM_PACKAGING
 #AX_USE_CPPUNIT
+#AX_BUILD_TEST
 #AX_BUILD_EXAMPLES
 #AX_BUILD_HTML
 
@@ -458,8 +460,8 @@ IFS="$SAVEIFS"
 PackageName=${PackageName[*]^}
 PackageName=${PackageName// /}
 
-if ! testtag "AX_CHECK_QT" configure.ac && \
-   ! testtag "AX_REQUIRE_QT" configure.ac; then
+if ! testtag AX_CHECK_QT && \
+   ! testtag AX_REQUIRE_QT; then
     echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | \
         to --condition AX_USE_CXX src/makefile.am
 elif ! test -e src/makefile.am; then
@@ -695,10 +697,20 @@ namespace NAMESPACE {
 EOF
 echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_SCRIPTS scripts/makefile.am
 echo "${HEADER}MAINTAINERCLEANFILES = makefile.in" | to --condition AX_USE_DOXYGEN doc/makefile.am
-to --condition AX_USE_CPPUNIT test/makefile.am <<EOF
-${HEADER}AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src
+to --condition 'AX_BUILD_TEST|AX_USE_CPPUNIT' test/makefile.am <<EOF
+${HEADER}$(if testtag AX_USE_CXX; then
+cat <<EOF2
+AM_CPPFLAGS = -I\${top_srcdir}/src -I\${top_builddir}/src
 AM_LDFLAGS = -L\${abs_top_builddir}/src/.libs
+$(if testtag AX_USE_LIBTOOL; then
+cat <<EOF3
 LDADD = -l${PACKAGE_NAME#lib}
+EOF3
+fi)
+EOF2
+fi)
+
+TESTS =
 
 MAINTAINERCLEANFILES = makefile.in
 EOF
@@ -761,7 +773,7 @@ if testtag AX_USE_DOXYGEN; then
         if testtag AX_BUILD_HTML; then
             doxyadd INPUT "@top_srcdir@/html"
         fi
-        if testtag AX_USE_CPPUNIT; then
+        if testtag AX_BUILD_TEST AX_USE_CPPUNIT; then
             doxyadd INPUT "@top_srcdir@/test"
         fi
         doxyreplace FILE_PATTERNS '*.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.idl *.ddl *.odl *.h *.hh *.hxx *.hpp *.h++ *.cs *.d *.php *.php4 *.php5 *.phtml *.inc *.m *.markdown *.md *.mm *.dox *.py *.f90 *.f *.for *.tcl *.vhd *.vhdl *.ucf *.qsf *.as *.js *.wt'
@@ -802,11 +814,12 @@ if testtag AX_USE_DEBIAN_PACKAGING; then
 
  -- @AUTHOR@  @BUILD_DATE@
 EOF
+    BUILD_DEPENDS="debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | qt4-default | qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)"
     to debian/control.in <<EOF
 Source: @PACKAGE_NAME@
 Priority: extra
 Maintainer: @AUTHOR@
-Build-Depends: debhelper, subversion, pkg-config, autotools-dev, lsb-release $(if testtag AX_USE_DOXYGEN; then echo -n ", doxygen, graphviz, mscgen"; fi; if testtag AX_USE_CPPUNIT; then echo -n ", libcppunit-dev"; fi; if testtag AX_CXX_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n ", qt5-default | qt4-default | qt5-qmake | qt4-qmake, qtbase5-dev | libqt4-dev, qtbase5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools, qttools5-dev-tools | qt4-dev-tools"; fi)
+Build-Depends: ${BUILD-DEPENDS}
 
 Package: @PACKAGE_NAME@
 Section: $(if testtag AX_USE_LIBTOOL; then echo  "libs"; fi)
@@ -820,7 +833,7 @@ $(      if testtag AX_USE_LIBTOOL; then
 Package: @PACKAGE_NAME@-dev
 Section: libdevel
 Architecture: any
-Depends: @PACKAGE_NAME@ (= \${binary:Version})
+Depends: @PACKAGE_NAME@ (= \${binary:Version}), ${BUILD-DEPENDS}
 Description: @DESCRIPTION@ - Development Package
 @README_DEB@
 EOF2
diff --git a/configure.ac b/configure.ac
index 3e59df3..b36534f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,8 @@ AX_USE_DOXYGEN
 AX_USE_DEBIAN_PACKAGING
 #AX_USE_RPM_PACKAGING
 #AX_USE_CPPUNIT
-AX_BUILD_EXAMPLES
+AX_BUILD_TEST
+#AX_BUILD_EXAMPLES
 
 # qt features
 AX_REQUIRE_QT([QT], [QtCore QtGui QtNetwork QtWebKit],
diff --git a/examples/makefile.am b/examples/makefile.am
index cad4d30..a8bfab3 100644
--- a/examples/makefile.am
+++ b/examples/makefile.am
@@ -1,8 +1,10 @@
 ## @id $Id$
-#
-# This file has been added by bootstrap.sh on Sat, 10 October 2015 12:52:56 +0200
-# Feel free to change it or even remove and rebuild it, up to your needs
-#
+##
+## This file has been added:
+##  - by bootstrap.sh
+##  -  on Wed, 04 November 2015 08:51:26 +0100
+## Feel free to change it or even remove and rebuild it, up to your needs
+##
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
@@ -10,15 +12,4 @@ AM_CPPFLAGS = -I${top_srcdir}/src -I${top_builddir}/src
 AM_LDFLAGS = -L${abs_top_builddir}/src/.libs
 LDADD = -lwebtester
 
-TESTS = test-commands.wt
-TEST_EXTENSIONS = .wt
-WT_LOG_COMPILER = xvfb-run -a ${top_builddir}/src/webrunner
-AM_WT_LOG_FLAGS = -x test-output.xml -p ${srcdir}
-
-EXTRA_DIST = ${TESTS} ca.pem client.pem client.key
-
-maintainer-clean-local:
-	-rm -r attachments
-
-CLEANFILES = test-output.xml
 MAINTAINERCLEANFILES = makefile.in
diff --git a/makefile.am b/makefile.am
index 11e4fe7..b9c8338 100644
--- a/makefile.am
+++ b/makefile.am
@@ -6,4 +6,4 @@
 ##       1         2         3         4         5         6         7         8
 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890
 
-SUBDIRS = src scripts doc examples
+SUBDIRS = src scripts doc test
diff --git a/examples/ca.pem b/test/ca.pem
similarity index 100%
rename from examples/ca.pem
rename to test/ca.pem
diff --git a/examples/client.key b/test/client.key
similarity index 100%
rename from examples/client.key
rename to test/client.key
diff --git a/examples/client.pem b/test/client.pem
similarity index 100%
rename from examples/client.pem
rename to test/client.pem
diff --git a/test/makefile.am b/test/makefile.am
new file mode 100644
index 0000000..aa09cc2
--- /dev/null
+++ b/test/makefile.am
@@ -0,0 +1,20 @@
+## @id $Id$
+#
+# This file has been added by bootstrap.sh on Sat, 10 October 2015 12:52:56 +0200
+# Feel free to change it or even remove and rebuild it, up to your needs
+#
+##       1         2         3         4         5         6         7         8
+## 45678901234567890123456789012345678901234567890123456789012345678901234567890
+
+TESTS = test-commands.wt
+TEST_EXTENSIONS = .wt
+WT_LOG_COMPILER = xvfb-run -a ${top_builddir}/src/webrunner
+AM_WT_LOG_FLAGS = -x test-output.xml -p ${srcdir}
+
+EXTRA_DIST = ${TESTS} ca.pem client.pem client.key
+
+maintainer-clean-local:
+	-rm -r attachments
+
+CLEANFILES = test-output.xml
+MAINTAINERCLEANFILES = makefile.in
diff --git a/examples/test-commands.wt b/test/test-commands.wt
similarity index 100%
rename from examples/test-commands.wt
rename to test/test-commands.wt