diff --git a/sflphone-common/Makefile.am b/sflphone-common/Makefile.am
index f774bdf57cdde3095aa6082adb35b7f09a5c383c..ffd473d7d1fb1878fcc9cc46d7505db095930206 100644
--- a/sflphone-common/Makefile.am
+++ b/sflphone-common/Makefile.am
@@ -1,14 +1,21 @@
 # Makefile.am
 
+if BUILD_TEST
+TESTS_DIR=test
 unittest:
 	@(cd test; make)
 	@echo ""
 	@echo "NOTICE: Unitary tests successfully build"
 	@echo "Go in the test directory to run them"
 	@echo ""
+else
+unittest:
+	@echo "SFLphone WARNING:"
+	@echo " -- You need the cppunit devel package to compile the unitary tests."
+endif
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = libs src ringtones po man test
+SUBDIRS = libs src ringtones po man $(TESTS_DIR)
 EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/* README.gentoo
 
diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac
index f46555b486de00e632af13b36312bd5c0ec7f286..69f2bcf1ff60155866443a426b88423595a9df18 100644
--- a/sflphone-common/configure.ac
+++ b/sflphone-common/configure.ac
@@ -267,11 +267,9 @@ AC_ARG_WITH(build-libdbus-cxx,
 )
 AC_SUBST(BUILD_LIBDBUS_CXX_DIR)
 
-
-
 dnl Check for libcppunit-dev
 CPPUNIT_MIN_VERSION=1.12
-PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION})
+PKG_CHECK_MODULES(CPPUNIT, cppunit >= ${CPPUNIT_MIN_VERSION}, AM_CONDITIONAL(BUILD_TEST, test 1 = 1 ), AM_CONDITIONAL(BUILD_TEST, test 0 = 1 ))
 AC_SUBST(CPPUNIT_LIBS)
 
 # check for libgsm1 (doesn't use pkg-config)
diff --git a/sflphone-common/debian/control.hardy b/sflphone-common/debian/control.hardy
index e82bee0f7e5e4cbf905812e6d1c828c461691f63..e14674d170b6caa6f4bac6d1118e5d1a336a88f6 100644
--- a/sflphone-common/debian/control.hardy
+++ b/sflphone-common/debian/control.hardy
@@ -2,7 +2,7 @@ Source: sflphone-common
 Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
 Section: gnome
 Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1, autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, uuid-dev, libexpat1-dev
+Build-Depends: debhelper (>= 5), libgcc1, autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, uuid-dev, libexpat1-dev
 Standards-Version: 3.7.3
 
 Package: sflphone-common
diff --git a/sflphone-common/debian/control.intrepid b/sflphone-common/debian/control.intrepid
index 00ce49356b4f660729c54be1131db4faa80432cb..270e67811229719df9e000fd3a0871e30b9c675a 100644
--- a/sflphone-common/debian/control.intrepid
+++ b/sflphone-common/debian/control.intrepid
@@ -2,7 +2,7 @@ Source: sflphone-common
 Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
 Section: gnome
 Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1 , autoconf, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev
+Build-Depends: debhelper (>= 5), libgcc1 , autoconf, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev
 Standards-Version: 3.8.0
 
 Package: sflphone-common
diff --git a/sflphone-common/debian/control.jaunty b/sflphone-common/debian/control.jaunty
index 281a9da2a99c6efa3d955e8a8d4c69c4d35911e0..f871e07e758e0ce60d07488c106de092517de54e 100644
--- a/sflphone-common/debian/control.jaunty
+++ b/sflphone-common/debian/control.jaunty
@@ -2,7 +2,7 @@ Source: sflphone-common
 Maintainer: SavoirFaireLinux Inc <emmanuel.milou@savoirfairelinux.com>
 Section: gnome
 Priority: optional
-Build-Depends: debhelper (>= 5), libgcc1 , autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev
+Build-Depends: debhelper (>= 5), libgcc1 , autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, libgsm1-dev, libspeex-dev, libtool, libdbus-1-dev, libasound2-dev, libspeexdsp-dev, uuid-dev, libexpat1-dev
 Standards-Version: 3.7.3
 
 Package: sflphone-common