diff --git a/test/Jamfile b/test/Jamfile
index b1afb39d8..8a63ed687 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -135,6 +135,8 @@ test-suite libtorrent :
 	[ run test_web_seed_socks5_pw.cpp ]
 	[ run test_web_seed_http.cpp ]
 	[ run test_web_seed_http_pw.cpp ]
+	[ run test_web_seed_chunked.cpp ]
+	[ run test_web_seed_ban.cpp ]
 	[ run test_bdecode_performance.cpp ]
 	[ run test_pe_crypto.cpp ]
 
diff --git a/test/test_web_seed.cpp b/test/test_web_seed.cpp
index 9c07fa17c..03eedb6f1 100644
--- a/test/test_web_seed.cpp
+++ b/test/test_web_seed.cpp
@@ -43,16 +43,10 @@ int test_main()
 	int ret = 0;
 	for (int url_seed = 0; url_seed < 2; ++url_seed)
 	{
-		for (int chunked = 0; chunked < 2; ++chunked)
-		{
-			for (int ban = 0; ban < 2; ++ban)
-			{
 #ifdef TORRENT_USE_OPENSSL
-				run_http_suite(proxy, "https", url_seed, chunked, ban);
+		run_http_suite(proxy, "https", url_seed);
 #endif
-				run_http_suite(proxy, "http", url_seed, chunked, ban);
-			}
-		}
+		run_http_suite(proxy, "http", url_seed);
 	}
 	return ret;
 }
diff --git a/test/test_web_seed_ban.cpp b/test/test_web_seed_ban.cpp
new file mode 100644
index 000000000..7d987c38b
--- /dev/null
+++ b/test/test_web_seed_ban.cpp
@@ -0,0 +1,53 @@
+/*
+
+Copyright (c) 2008, Arvid Norberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the distribution.
+    * Neither the name of the author nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "test.hpp"
+#include "setup_transfer.hpp"
+#include "web_seed_suite.hpp"
+
+using namespace libtorrent;
+
+const int proxy = libtorrent::proxy_settings::none;
+
+int test_main()
+{
+	int ret = 0;
+	for (int url_seed = 0; url_seed < 2; ++url_seed)
+	{
+#ifdef TORRENT_USE_OPENSSL
+		run_http_suite(proxy, "https", url_seed, 0, 1);
+#endif
+		run_http_suite(proxy, "http", url_seed, 0, 1);
+	}
+	return ret;
+}
+
diff --git a/test/test_web_seed_chunked.cpp b/test/test_web_seed_chunked.cpp
new file mode 100644
index 000000000..0df5c28c9
--- /dev/null
+++ b/test/test_web_seed_chunked.cpp
@@ -0,0 +1,56 @@
+/*
+
+Copyright (c) 2008, Arvid Norberg
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in
+      the documentation and/or other materials provided with the distribution.
+    * Neither the name of the author nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#include "test.hpp"
+#include "setup_transfer.hpp"
+#include "web_seed_suite.hpp"
+
+using namespace libtorrent;
+
+const int proxy = libtorrent::proxy_settings::none;
+
+int test_main()
+{
+	int ret = 0;
+	for (int url_seed = 0; url_seed < 2; ++url_seed)
+	{
+		for (int ban = 0; ban < 2; ++ban)
+		{
+#ifdef TORRENT_USE_OPENSSL
+			run_http_suite(proxy, "https", url_seed, 1, ban);
+#endif
+			run_http_suite(proxy, "http", url_seed, 1, ban);
+		}
+	}
+	return ret;
+}
+
diff --git a/test/test_web_seed_http.cpp b/test/test_web_seed_http.cpp
index df42bb6eb..9915ddd33 100644
--- a/test/test_web_seed_http.cpp
+++ b/test/test_web_seed_http.cpp
@@ -43,16 +43,10 @@ int test_main()
 	int ret = 0;
 	for (int url_seed = 0; url_seed < 2; ++url_seed)
 	{
-		for (int chunked = 0; chunked < 2; ++chunked)
-		{
-			for (int ban = 0; ban < 2; ++ban)
-			{
 #ifdef TORRENT_USE_OPENSSL
-				run_http_suite(proxy, "https", url_seed, chunked, ban);
+		run_http_suite(proxy, "https", url_seed);
 #endif
-				run_http_suite(proxy, "http", url_seed, chunked, ban);
-			}
-		}
+		run_http_suite(proxy, "http", url_seed);
 	}
 	return ret;
 }
diff --git a/test/test_web_seed_http_pw.cpp b/test/test_web_seed_http_pw.cpp
index 389c39a88..f9e241d4c 100644
--- a/test/test_web_seed_http_pw.cpp
+++ b/test/test_web_seed_http_pw.cpp
@@ -43,16 +43,10 @@ int test_main()
 	int ret = 0;
 	for (int url_seed = 0; url_seed < 2; ++url_seed)
 	{
-		for (int chunked = 0; chunked < 2; ++chunked)
-		{
-			for (int ban = 0; ban < 2; ++ban)
-			{
 #ifdef TORRENT_USE_OPENSSL
-				run_http_suite(proxy, "https", url_seed, chunked, ban);
+		run_http_suite(proxy, "https", url_seed);
 #endif
-				run_http_suite(proxy, "http", url_seed, chunked, ban);
-			}
-		}
+		run_http_suite(proxy, "http", url_seed);
 	}
 	return ret;
 }
diff --git a/test/test_web_seed_socks4.cpp b/test/test_web_seed_socks4.cpp
index 0e008411f..9d3f9264a 100644
--- a/test/test_web_seed_socks4.cpp
+++ b/test/test_web_seed_socks4.cpp
@@ -43,16 +43,10 @@ int test_main()
 	int ret = 0;
 	for (int url_seed = 0; url_seed < 2; ++url_seed)
 	{
-		for (int chunked = 0; chunked < 2; ++chunked)
-		{
-			for (int ban = 0; ban < 2; ++ban)
-			{
 #ifdef TORRENT_USE_OPENSSL
-				run_http_suite(proxy, "https", url_seed, chunked, ban);
+		run_http_suite(proxy, "https", url_seed);
 #endif
-				run_http_suite(proxy, "http", url_seed, chunked, ban);
-			}
-		}
+		run_http_suite(proxy, "http", url_seed);
 	}
 	return ret;
 }
diff --git a/test/test_web_seed_socks5.cpp b/test/test_web_seed_socks5.cpp
index f4181b197..d78b2f8a9 100644
--- a/test/test_web_seed_socks5.cpp
+++ b/test/test_web_seed_socks5.cpp
@@ -43,16 +43,10 @@ int test_main()
 	int ret = 0;
 	for (int url_seed = 0; url_seed < 2; ++url_seed)
 	{
-		for (int chunked = 0; chunked < 2; ++chunked)
-		{
-			for (int ban = 0; ban < 2; ++ban)
-			{
 #ifdef TORRENT_USE_OPENSSL
-				run_http_suite(proxy, "https", url_seed, chunked, ban);
+		run_http_suite(proxy, "https", url_seed);
 #endif
-				run_http_suite(proxy, "http", url_seed, chunked, ban);
-			}
-		}
+		run_http_suite(proxy, "http", url_seed);
 	}
 	return ret;
 }
diff --git a/test/test_web_seed_socks5_pw.cpp b/test/test_web_seed_socks5_pw.cpp
index d29e73ce4..da8a429b0 100644
--- a/test/test_web_seed_socks5_pw.cpp
+++ b/test/test_web_seed_socks5_pw.cpp
@@ -43,16 +43,10 @@ int test_main()
 	int ret = 0;
 	for (int url_seed = 0; url_seed < 2; ++url_seed)
 	{
-		for (int chunked = 0; chunked < 2; ++chunked)
-		{
-			for (int ban = 0; ban < 2; ++ban)
-			{
 #ifdef TORRENT_USE_OPENSSL
-				run_http_suite(proxy, "https", url_seed, chunked, ban);
+		run_http_suite(proxy, "https", url_seed);
 #endif
-				run_http_suite(proxy, "http", url_seed, chunked, ban);
-			}
-		}
+		run_http_suite(proxy, "http", url_seed);
 	}
 	return ret;
 }
diff --git a/test/web_seed_suite.hpp b/test/web_seed_suite.hpp
index 405ee8c76..d73d4716c 100644
--- a/test/web_seed_suite.hpp
+++ b/test/web_seed_suite.hpp
@@ -32,5 +32,5 @@ POSSIBILITY OF SUCH DAMAGE.
 #include "test.hpp"
 
 int EXPORT run_http_suite(int proxy, char const* protocol
-	, bool test_url_seed, bool chunked_encoding, bool test_ban);
+	, bool test_url_seed, bool chunked_encoding = false, bool test_ban = false);