diff --git a/tests/Makefile.in b/tests/Makefile.in
index 21bc028b..1ea4560d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -89,7 +89,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/include
 noinst_PROGRAMS_common = 
 
 @REMOTE_ONLY_TRUE@noinst_PROGRAMS = $(noinst_PROGRAMS_common)
-@REMOTE_ONLY_FALSE@noinst_PROGRAMS = $(noinst_PROGRAMS_common) $(noinst_PROGRAMS_arch) bt exc
+@REMOTE_ONLY_FALSE@noinst_PROGRAMS = $(noinst_PROGRAMS_common) $(noinst_PROGRAMS_arch) bt exc \
+@REMOTE_ONLY_FALSE@	test-init test-varargs
+
 @ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@noinst_PROGRAMS_arch = sig
 
 LDADD = ../src/libunwind-$(arch).la
@@ -99,10 +101,14 @@ CONFIG_HEADER = $(top_builddir)/include/config.h
 CONFIG_CLEAN_FILES =
 @ARCH_IA64_FALSE@@REMOTE_ONLY_TRUE@noinst_PROGRAMS =
 @ARCH_IA64_FALSE@@REMOTE_ONLY_FALSE@noinst_PROGRAMS = bt$(EXEEXT) \
-@ARCH_IA64_FALSE@@REMOTE_ONLY_FALSE@	exc$(EXEEXT)
+@ARCH_IA64_FALSE@@REMOTE_ONLY_FALSE@	exc$(EXEEXT) \
+@ARCH_IA64_FALSE@@REMOTE_ONLY_FALSE@	test-init$(EXEEXT) \
+@ARCH_IA64_FALSE@@REMOTE_ONLY_FALSE@	test-varargs$(EXEEXT)
 @ARCH_IA64_TRUE@@REMOTE_ONLY_TRUE@noinst_PROGRAMS =
 @ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@noinst_PROGRAMS = sig$(EXEEXT) \
-@ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@	bt$(EXEEXT) exc$(EXEEXT)
+@ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@	bt$(EXEEXT) exc$(EXEEXT) \
+@ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@	test-init$(EXEEXT) \
+@ARCH_IA64_TRUE@@REMOTE_ONLY_FALSE@	test-varargs$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
 
 bt_SOURCES = bt.c
@@ -120,6 +126,16 @@ sig_OBJECTS = sig.$(OBJEXT)
 sig_LDADD = $(LDADD)
 sig_DEPENDENCIES = ../src/libunwind-$(arch).la
 sig_LDFLAGS =
+test_init_SOURCES = test-init.c
+test_init_OBJECTS = test-init.$(OBJEXT)
+test_init_LDADD = $(LDADD)
+test_init_DEPENDENCIES = ../src/libunwind-$(arch).la
+test_init_LDFLAGS =
+test_varargs_SOURCES = test-varargs.c
+test_varargs_OBJECTS = test-varargs.$(OBJEXT)
+test_varargs_LDADD = $(LDADD)
+test_varargs_DEPENDENCIES = ../src/libunwind-$(arch).la
+test_varargs_LDFLAGS =
 
 DEFS = @DEFS@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/include
@@ -128,7 +144,8 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/aux/depcomp
 @AMDEP_TRUE@DEP_FILES = $(DEPDIR)/bt.Po $(DEPDIR)/exc.Po \
-@AMDEP_TRUE@	$(DEPDIR)/sig.Po
+@AMDEP_TRUE@	$(DEPDIR)/sig.Po $(DEPDIR)/test-init.Po \
+@AMDEP_TRUE@	$(DEPDIR)/test-varargs.Po
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -137,9 +154,9 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 CFLAGS = @CFLAGS@
-DIST_SOURCES = bt.c exc.c sig.c
+DIST_SOURCES = bt.c exc.c sig.c test-init.c test-varargs.c
 DIST_COMMON = Makefile.am Makefile.in
-SOURCES = bt.c exc.c sig.c
+SOURCES = bt.c exc.c sig.c test-init.c test-varargs.c
 
 all: all-am
 
@@ -173,6 +190,12 @@ exc$(EXEEXT): $(exc_OBJECTS) $(exc_DEPENDENCIES)
 sig$(EXEEXT): $(sig_OBJECTS) $(sig_DEPENDENCIES) 
 	@rm -f sig$(EXEEXT)
 	$(LINK) $(sig_LDFLAGS) $(sig_OBJECTS) $(sig_LDADD) $(LIBS)
+test-init$(EXEEXT): $(test_init_OBJECTS) $(test_init_DEPENDENCIES) 
+	@rm -f test-init$(EXEEXT)
+	$(LINK) $(test_init_LDFLAGS) $(test_init_OBJECTS) $(test_init_LDADD) $(LIBS)
+test-varargs$(EXEEXT): $(test_varargs_OBJECTS) $(test_varargs_DEPENDENCIES) 
+	@rm -f test-varargs$(EXEEXT)
+	$(LINK) $(test_varargs_LDFLAGS) $(test_varargs_OBJECTS) $(test_varargs_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT) core *.core
@@ -183,6 +206,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/bt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/exc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/sig.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/test-init.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/test-varargs.Po@am__quote@
 
 distclean-depend:
 	-rm -rf $(DEPDIR)