diff --git a/libs/sofia-sip/tests/Makefile.am b/libs/sofia-sip/tests/Makefile.am
index d305a66e5a..6562301701 100644
--- a/libs/sofia-sip/tests/Makefile.am
+++ b/libs/sofia-sip/tests/Makefile.am
@@ -5,7 +5,8 @@
 EXTRA_DIST = check_sofia.h check_sofia.c suite_for_nua.c
 
 TESTS =
-check_PROGRAMS =
+tests_PROGRAMS =
+testsdir := ${libdir}/tests/libsofia-sip-ua-tests
 
 include $(top_srcdir)/rules/sofia.am
 
@@ -14,20 +15,21 @@ INCLUDES = ${INTERNAL_INCLUDES}
 AM_CFLAGS += @CHECK_CFLAGS@
 
 if HAVE_CHECK
+
 TESTS += check_sofia
-check_PROGRAMS += check_sofia
+tests_PROGRAMS += check_sofia
 
 check_sofia_SOURCES = check_sofia.c check_sofia.h \
 	suite_for_nua.c
 
-${sofiabuilddir}/nua/libtestnua.la \
+CHECKLIBS = ${sofiabuilddir}/nua/libtestnua.la \
 	${sofiabuilddir}/nua/libtestproxy.la \
-	${sofiabuilddir}/nua/libtestnat.la:
+	${sofiabuilddir}/nua/libtestnat.la
+
+$(CHECKLIBS):
 	cd ${sofiabuilddir}/nua && make checklib
 
 check_sofia_LDADD = \
-	${sofiabuilddir}/nua/libtestnua.la \
-	${sofiabuilddir}/nua/libtestproxy.la \
-	${sofiabuilddir}/nua/libtestnat.la \
-	${sofiabuilddir}/libsofia-sip-ua.la @CHECK_LIBS@
+	$(CHECKLIBS) ${sofiabuilddir}/libsofia-sip-ua.la \
+	@CHECK_LIBS@
 endif