diff --git a/test/test_ip_filter.cpp b/test/test_ip_filter.cpp
index ce2792f24..f7d009e37 100644
--- a/test/test_ip_filter.cpp
+++ b/test/test_ip_filter.cpp
@@ -101,7 +101,11 @@ int test_main()
 		f.add_rule(IP("1.0.0.0"), IP("2.0.0.0"), ip_filter::blocked);
 		f.add_rule(IP("2.0.0.1"), IP("3.0.0.0"), ip_filter::blocked);
 
+#if TORRENT_USE_IPV6
 		range = boost::get<0>(f.export_filter());
+#else
+		range = f.export_filter();
+#endif
 		test_rules_invariant(range, f);
 
 		TEST_CHECK(range.size() == 3);
@@ -116,7 +120,11 @@ int test_main()
 		f.add_rule(IP("2.0.0.1"), IP("3.0.0.0"), ip_filter::blocked);
 		f.add_rule(IP("1.0.0.0"), IP("2.0.0.0"), ip_filter::blocked);
 
+#if TORRENT_USE_IPV6
 		range = boost::get<0>(f.export_filter());
+#else
+		range = f.export_filter();
+#endif
 		test_rules_invariant(range, f);
 
 		TEST_CHECK(range.size() == 3);
@@ -132,7 +140,11 @@ int test_main()
 		f.add_rule(IP("2.0.0.1"), IP("3.0.0.0"), ip_filter::blocked);
 		f.add_rule(IP("1.0.0.0"), IP("2.4.0.0"), ip_filter::blocked);
 
+#if TORRENT_USE_IPV6
 		range = boost::get<0>(f.export_filter());
+#else
+		range = f.export_filter();
+#endif
 		test_rules_invariant(range, f);
 
 		TEST_CHECK(range.size() == 3);
@@ -148,7 +160,11 @@ int test_main()
 		f.add_rule(IP("1.0.0.0"), IP("2.4.0.0"), ip_filter::blocked);
 		f.add_rule(IP("2.0.0.1"), IP("3.0.0.0"), ip_filter::blocked);
 
+#if TORRENT_USE_IPV6
 		range = boost::get<0>(f.export_filter());
+#else
+		range = f.export_filter();
+#endif
 		test_rules_invariant(range, f);
 
 		TEST_CHECK(range.size() == 3);
@@ -168,7 +184,11 @@ int test_main()
 
 		f.add_rule(IP("1.0.1.0"), IP("9.0.0.0"), ip_filter::blocked);
 		
+#if TORRENT_USE_IPV6
 		range = boost::get<0>(f.export_filter());
+#else
+		range = f.export_filter();
+#endif
 		test_rules_invariant(range, f);
 
 		TEST_CHECK(range.size() == 3);
@@ -194,7 +214,11 @@ int test_main()
 
 		f.add_rule(IP("0.0.1.0"), IP("7.0.4.0"), ip_filter::blocked);
 
+#if TORRENT_USE_IPV6
 		range = boost::get<0>(f.export_filter());
+#else
+		range = f.export_filter();
+#endif
 		test_rules_invariant(range, f);
 
 		TEST_CHECK(range.size() == 3);
diff --git a/test/test_primitives.cpp b/test/test_primitives.cpp
index 61b51a7f6..0a39a1ebb 100644
--- a/test/test_primitives.cpp
+++ b/test/test_primitives.cpp
@@ -860,11 +860,13 @@ int test_main()
 	TEST_CHECK(is_local(address::from_string("10.1.1.56", ec)));
 	TEST_CHECK(!is_local(address::from_string("14.14.251.63", ec)));
 	TEST_CHECK(is_loopback(address::from_string("127.0.0.1", ec)));
+#if TORRENT_USE_IPV6
 	if (supports_ipv6())
 	{
 		TEST_CHECK(is_loopback(address::from_string("::1", ec)));
 		TEST_CHECK(is_any(address_v6::any()));
 	}
+#endif
 	TEST_CHECK(is_any(address_v4::any()));
 	TEST_CHECK(!is_any(address::from_string("31.53.21.64", ec)));