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)