diff --git a/sflphone-client-gnome/VERSION b/sflphone-client-gnome/VERSION
index 85b7c695b805b3d4efe1214d858c5dbe7c18ef2c..06fa200552505d51e9a42251eb6ed4432c78ce90 100644
--- a/sflphone-client-gnome/VERSION
+++ b/sflphone-client-gnome/VERSION
@@ -1 +1 @@
-0.9.6
+0.9.7~beta
diff --git a/sflphone-common/Makefile.am b/sflphone-common/Makefile.am
index 6d464df1bf37e8d39e06d4e3e91f6ecc220143b6..26a6525095085b0328f5c3cf2d19e7f79ce10249 100644
--- a/sflphone-common/Makefile.am
+++ b/sflphone-common/Makefile.am
@@ -26,6 +26,6 @@ indent:
 
 
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libs src ringtones man $(TESTS_DIR)
+SUBDIRS = libs src ringtones man #$(TESTS_DIR)
 EXTRA_DIST = m4/*.m4 tools/*.sh platform/* images/* README.gentoo
 
diff --git a/sflphone-common/VERSION b/sflphone-common/VERSION
index 85b7c695b805b3d4efe1214d858c5dbe7c18ef2c..06fa200552505d51e9a42251eb6ed4432c78ce90 100644
--- a/sflphone-common/VERSION
+++ b/sflphone-common/VERSION
@@ -1 +1 @@
-0.9.6
+0.9.7~beta
diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac
index 4bcdbcf8a0ac894e2e5430df87bc32a65f4cf529..2d98685bfafad38d1155a70094accaca500796bc 100644
--- a/sflphone-common/configure.ac
+++ b/sflphone-common/configure.ac
@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
 dnl
 	dnl Process this file with autoconf to produce a configure script.
 	AC_PREREQ(2.59)
-	AC_INIT([SFLphone],[0.9.6~rc1],[sflphoneteam@savoirfairelinux.com],[sflphone])
+	AC_INIT([SFLphone],[0.9.7~beta],[sflphoneteam@savoirfairelinux.com],[sflphone])
 	AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004-2009]])
 AC_REVISION([$Revision$])
 
diff --git a/sflphone-common/test/Makefile.am b/sflphone-common/test/Makefile.am
index bd6654596bf6cf0ed9ba584eba5b5bb208a7bec6..1cbcaf8a5d0589e44a9b8b8de0f6192950452c83 100644
--- a/sflphone-common/test/Makefile.am
+++ b/sflphone-common/test/Makefile.am
@@ -6,20 +6,20 @@ OBJECT_FILES= \
 	../src/sflphoned-managerimpl.o \
 	../src/sflphoned-accountcreator.o \
 	../src/sflphoned-call.o \
-	../src/sflphoned-sipcall.o \
-	../src/sflphoned-iaxcall.o \
+	../src/sip/sipcall.o \
+	../src/iax/libiaxlink_la-iaxcall.o \
 	../src/sflphoned-voiplink.o \
-	../src/sflphoned-sipvoiplink.o \
-	../src/sflphoned-iaxvoiplink.o \
+	../src/sip/sipvoiplink.o \
+	../src/iax/libiaxlink_la-iaxvoiplink.o \
 	../src/sflphoned-account.o \
-	../src/sflphoned-sipaccount.o \
-	../src/sflphoned-iaxaccount.o \
+	../src/sip/sipaccount.o \
+	../src/iax/libiaxlink_la-iaxaccount.o \
 	../src/sflphoned-eventthread.o \
 	../src/plug-in/pluginmanager.o \
 	../src/plug-in/audiorecorder/audiorecord.o \
-	../src/sflphoned-samplerateconverter.o \
-	../src/sflphoned-sdp.o \
-	../src/sflphoned-sdpmedia.o \
+	../src/audio/samplerateconverter.o \
+	../src/sip/sdp.o \
+	../src/sip/sdpmedia.o \
 	../src/sflphoned-numbercleaner.o \
     ../src/history/historymanager.o
 
@@ -38,6 +38,8 @@ numbercleanerTester_LDADD = \
 		@CCGNU2_LIBS@ \
 		@CCRTP_LIBS@ \
 		@SAMPLERATE_LIBS@ \
+		@ZRTPCPP_LIBS@ \
+		@libssl_LIBS@ \
 		$(PJSIP_LIBS) \
 		-luuid \
 		$(OBJECT_FILES)