diff --git a/include/libtorrent/Makefile.am b/include/libtorrent/Makefile.am
index 4109e1a58..fea92be1c 100644
--- a/include/libtorrent/Makefile.am
+++ b/include/libtorrent/Makefile.am
@@ -99,7 +99,7 @@ nobase_include_HEADERS = \
   stat.hpp                     \
   storage.hpp                  \
   storage_defs.hpp             \
-  sruct_debug.hpp              \
+  struct_debug.hpp             \
   thread.hpp                   \
   time.hpp                     \
   timestamp_history.hpp        \
diff --git a/test/Makefile.am b/test/Makefile.am
index 8e8aed2ba..7aa0dc22a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,12 +16,15 @@ test_programs = \
   test_pex                   \
   test_piece_picker          \
   test_primitives            \
+  test_rss                   \
   test_storage               \
   test_swarm                 \
+  test_threads               \
   test_torrent               \
   test_trackers_extension    \
   test_transfer              \
   test_upnp                  \
+  test_utp                   \
   test_web_seed
 
 if ENABLE_TESTS
@@ -57,10 +60,13 @@ test_piece_picker_SOURCES = test_piece_picker.cpp
 test_primitives_SOURCES = test_primitives.cpp
 test_storage_SOURCES = test_storage.cpp
 test_swarm_SOURCES = test_swarm.cpp
+test_rss_SOURCES = test_rss.cpp
+test_threads_SOURCES = test_threads.cpp
 test_torrent_SOURCES = test_torrent.cpp
 test_trackers_extension_SOURCES = test_trackers_extension.cpp
 test_transfer_SOURCES = test_transfer.cpp
 test_upnp_SOURCES = test_upnp.cpp
+test_utp_SOURCES = test_utp.cpp
 test_web_seed_SOURCES = test_web_seed.cpp
 
 LDADD = $(top_builddir)/src/libtorrent-rasterbar.la libtest.la
diff --git a/test/main.cpp b/test/main.cpp
index 310923eb8..d0b0734bf 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -45,7 +45,14 @@ extern bool tests_failure;
 void sig_handler(int sig)
 {
 	char stack_text[10000];
+
+#if defined TORRENT_DEBUG || TORRENT_RELEASE_ASSERTS
 	print_backtrace(stack_text, sizeof(stack_text), 30);
+#elif defined __FUNCTION__
+	strcat(stack_text, __FUNCTION__);
+#else
+	stack_text[0] = 0;
+#endif
 	char const* sig_name = 0;
 	switch (sig)
 	{