diff --git a/Makefile.am b/Makefile.am
index 7528dcd0a..98eec0bed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -114,19 +114,6 @@ EXTRA_DIST = \
   libtorrent-rasterbar-cmake.pc  \
   parse_dht_log.py \
   parse_session_stats.py \
-  test/test_torrents/base.torrent \
-  test/test_torrents/empty_path.torrent \
-  test/test_torrents/parent_path.torrent \
-  test/test_torrents/hidden_parent_path.torrent \
-  test/test_torrents/single_multi_file.torrent \
-  test/test_torrents/slash_path.torrent \
-  test/test_torrents/backslash_path.torrent \
-  test/test_torrents/url_list.torrent \
-  test/test_torrents/url_list2.torrent \ 
-  test/test_torrents/url_list3.torrent \
-  test/test_torrents/httpseed.torrent \
-  test/test_torrents/empty_httpseed.torrent \
-  test/test_torrents/long_name.torrent \
   $(DOCS_PAGES) \
   $(DOCS_IMAGES)
 
diff --git a/build_dist.sh b/build_dist.sh
index 9a5260746..bf4900180 100755
--- a/build_dist.sh
+++ b/build_dist.sh
@@ -10,12 +10,12 @@ rm -fr autom4te.cache build-aux
 rm -f Makefile Makefile.in
 rm -f src/Makefile src/Makefile.in
 rm -f include/libtorrent/Makefile include/libtorrent/Makefile.in
-rm -f examples/Makefile examples/Makefile.in
-rm -f test/Makefile test/Makefile.in
-rm -f bindings/Makefile bindings/Makefile.in
+rm -f examples/Makefile examples/Makefile.in examples/.dep examples/.libs
+rm -rf test/Makefile test/Makefile.in test/.dep test/.lib
+rm -rf bindings/Makefile bindings/Makefile.in bindings/.dep bindings/.libs
 rm -f bindings/python/Makefile bindings/python/Makefile.in
 chmod a-x docs/*.rst docs/*.htm* src/*.cpp include/libtorrent/*.hpp
 
 ./autotool.sh
-./configure --enable-python-binding --enable-examples=yes --enable-tests=yes --with-boost-system=mt --with-boost-python=mt 
+./configure --enable-python-binding --enable-examples=yes --enable-tests=yes --with-boost-system=mt --with-boost-python=mt --enable-tests
 make V=1 -j8 dist check
diff --git a/test/Makefile.am b/test/Makefile.am
index 0b85a6ed9..230fa2570 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -38,7 +38,21 @@ endif
 
 TESTS = $(check_PROGRAMS)
 
-EXTRA_DIST = Jamfile
+EXTRA_DIST = Jamfile \
+  test_torrents/base.torrent \
+  test_torrents/empty_path.torrent \
+  test_torrents/parent_path.torrent \
+  test_torrents/hidden_parent_path.torrent \
+  test_torrents/single_multi_file.torrent \
+  test_torrents/slash_path.torrent \
+  test_torrents/backslash_path.torrent \
+  test_torrents/url_list.torrent \
+  test_torrents/url_list2.torrent \ 
+  test_torrents/url_list3.torrent \
+  test_torrents/httpseed.torrent \
+  test_torrents/empty_httpseed.torrent \
+  test_torrents/long_name.torrent
+
 EXTRA_PROGRAMS = $(test_programs)
 
 noinst_HEADERS = test.hpp setup_transfer.hpp
@@ -70,6 +84,7 @@ 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_torrent_parse_SOURCES = test_torrent_parse.cpp
 test_trackers_extension_SOURCES = test_trackers_extension.cpp
 test_transfer_SOURCES = test_transfer.cpp
 test_upnp_SOURCES = test_upnp.cpp