diff --git a/libsofia-sip-ua/nta/Makefile.am b/libsofia-sip-ua/nta/Makefile.am
index 9a084cb..5d0bbef 100644
--- a/libsofia-sip-ua/nta/Makefile.am
+++ b/libsofia-sip-ua/nta/Makefile.am
@@ -60,8 +60,10 @@ LDADD = 		libnta.la \
 			../url/liburl.la \
 			../msg/libmsg.la \
 			../bnf/libbnf.la \
-			../su/libsu.la \
-			${top_builddir}/s2check/libs2.a
+			../su/libsu.la
+if HAVE_CHECK
+LDADD +=        ${top_builddir}/s2check/libs2.a
+endif
 
 test_nta_LDFLAGS = 	-static
 
@@ -76,11 +78,15 @@ check_nta_SOURCES =	check_nta.h \
 			check_nta.c
 
 check_nta_LDADD = 	${LDADD} @CHECK_LIBS@
-
+test_nta_SOURCES = test_nta.c
 else
 check_nta_SOURCES = 	$(top_srcdir)/s2check/exit77.c
+test_nta_SOURCES = test_nta.c \
+			$(top_srcdir)/s2check/s2time.c \
+			$(top_srcdir)/s2check/s2time.h
 endif
 
+
 # ----------------------------------------------------------------------
 # Install and distribution rules
 
diff --git a/libsofia-sip-ua/soa/Makefile.am b/libsofia-sip-ua/soa/Makefile.am
index d37ab88..0a1ba44 100644
--- a/libsofia-sip-ua/soa/Makefile.am
+++ b/libsofia-sip-ua/soa/Makefile.am
@@ -49,10 +49,15 @@ LDADD = 		libsoa.la \
 			../bnf/libbnf.la \
 			../su/libsu.la
 
+if HAVE_CHECK
 test_soa_LDADD = 	$(top_builddir)/s2check/libs2.a \
 			$(LDADD)
 
 test_soa_LDFLAGS = 	-static
+test_soa_SOURCES = test_soa.c
+else
+test_soa_SOURCES = $(top_builddir)/s2check/exit77.c
+endif
 
 # ----------------------------------------------------------------------
 # Install and distribution rules