diff --git a/test/Jamfile b/test/Jamfile
index 16ba55180..b6a12e9b1 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -145,7 +145,8 @@ test-suite libtorrent :
 		test_fence.cpp
 		test_dos_blocker.cpp
 		test_stat_cache.cpp
-		test_file_progress.cpp ]
+		test_file_progress.cpp
+		test_direct_dht.cpp ]
 
 	[ run test_storage.cpp ]
 	[ run test_session.cpp ]
diff --git a/test/test_direct_dht.cpp b/test/test_direct_dht.cpp
new file mode 100644
index 000000000..c187a5f08
--- /dev/null
+++ b/test/test_direct_dht.cpp
@@ -0,0 +1,126 @@
+/*
+
+Copyright (c) 2015, Steven Siloti
+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 "libtorrent/config.hpp"
+#include "libtorrent/session.hpp"
+#include "libtorrent/extensions.hpp"
+#include "libtorrent/alert_types.hpp"
+#include "test.hpp"
+
+using namespace libtorrent;
+
+namespace
+{
+
+struct test_plugin : plugin
+{
+	virtual void register_dht_extensions(dht_extensions_t& ext)
+	{
+		ext.push_back(std::make_pair("test_good", &good_response));
+	}
+
+	static bool good_response(udp::endpoint const& source
+		, bdecode_node const& request, entry& response)
+	{
+		if (request.dict_find_string_value("q") == "test_good")
+		{
+			response["r"]["good"] = 1;
+			return true;
+		}
+		return false;
+	}
+};
+
+dht_direct_response_alert* get_direct_response(session& ses)
+{
+	for (;;)
+	{
+		alert* a = ses.wait_for_alert(seconds(20));
+		// it shouldn't take more than 20 seconds to get a response
+		// so fail the test and bail out if we don't get an alert in that time
+		TEST_CHECK(a);
+		if (!a) return NULL;
+		std::vector<alert*> alerts;
+		ses.pop_alerts(&alerts);
+		for (std::vector<alert*>::iterator i = alerts.begin(); i != alerts.end(); ++i)
+		{
+			if ((*i)->type() == dht_direct_response_alert::alert_type)
+				return static_cast<dht_direct_response_alert*>(&**i);
+		}
+	}
+}
+
+}
+
+TORRENT_TEST(direct_dht_request)
+{
+	settings_pack sp;
+	sp.set_str(settings_pack::listen_interfaces, "127.0.0.1:42434");
+	session responder(sp, 0);
+	sp.set_str(settings_pack::listen_interfaces, "127.0.0.1:42435");
+	session requester(sp, 0);
+
+	responder.add_extension(boost::static_pointer_cast<plugin>(boost::make_shared<test_plugin>()));
+
+	// successful request
+
+	entry r;
+	r["q"] = "test_good";
+	requester.dht_direct_request(udp::endpoint(address::from_string("127.0.0.1"), 42434)
+		, r, (void*)12345);
+
+	dht_direct_response_alert* ra = get_direct_response(requester);
+	TEST_CHECK(ra);
+	if (ra)
+	{
+		bdecode_node response = ra->response();
+		TEST_EQUAL(ra->addr.address(), address::from_string("127.0.0.1"));
+		TEST_EQUAL(ra->addr.port(), 42434);
+		TEST_EQUAL(response.dict_find_dict("r").dict_find_int_value("good"), 1);
+		TEST_EQUAL(ra->userdata, (void*)12345);
+	}
+
+	// failed request
+
+	requester.dht_direct_request(udp::endpoint(address::from_string("127.0.0.1"), 53545)
+		, r, (void*)123456);
+
+	ra = get_direct_response(requester);
+	TEST_CHECK(ra);
+	if (ra)
+	{
+		TEST_EQUAL(ra->addr.address(), address::from_string("127.0.0.1"));
+		TEST_EQUAL(ra->addr.port(), 53545);
+		TEST_EQUAL(ra->response().type(), bdecode_node::none_t);
+		TEST_EQUAL(ra->userdata, (void*)123456);
+	}
+}