diff --git a/src/tests/kits/net/libnetapi/Jamfile b/src/tests/kits/net/libnetapi/Jamfile
index 5283c93a31..3b623d19ff 100644
--- a/src/tests/kits/net/libnetapi/Jamfile
+++ b/src/tests/kits/net/libnetapi/Jamfile
@@ -6,5 +6,5 @@ UnitTestLib libnetapitest.so :
 	NetworkAddressTest.cpp
 	NetworkInterfaceTest.cpp
 
-	: bnetapi $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++)
+	: bnetapi network $(TARGET_LIBSTDC++) $(TARGET_LIBSUPC++)
 ;
diff --git a/src/tests/kits/net/libnetapi/NetworkAddressTest.cpp b/src/tests/kits/net/libnetapi/NetworkAddressTest.cpp
index d5e499630d..2d157a9744 100644
--- a/src/tests/kits/net/libnetapi/NetworkAddressTest.cpp
+++ b/src/tests/kits/net/libnetapi/NetworkAddressTest.cpp
@@ -1,11 +1,13 @@
 /*
- * Copyright 2010, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2010-2011, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 
 
 #include "NetworkAddressTest.h"
 
+#include <netinet6/in6.h>
+
 #include <NetworkAddress.h>
 #include <TypeConstants.h>
 
@@ -40,6 +42,26 @@ NetworkAddressTest::TestUnset()
 }
 
 
+void
+NetworkAddressTest::TestSetTo()
+{
+	BNetworkAddress address;
+
+	CPPUNIT_ASSERT(address.SetTo("127.0.0.1") == B_OK);
+	CPPUNIT_ASSERT(address.Family() == AF_INET);
+	CPPUNIT_ASSERT(address == BNetworkAddress(INADDR_LOOPBACK));
+
+	CPPUNIT_ASSERT(address.SetTo("::1") == B_OK);
+	CPPUNIT_ASSERT(address.Family() == AF_INET6);
+	CPPUNIT_ASSERT(address == BNetworkAddress(in6addr_loopback));
+
+	CPPUNIT_ASSERT(address.SetTo(AF_INET, "::1") != B_OK);
+	CPPUNIT_ASSERT(address.SetTo(AF_INET6, "127.0.0.1") != B_OK);
+	CPPUNIT_ASSERT(address.SetTo(AF_INET, "127.0.0.1") == B_OK);
+	CPPUNIT_ASSERT(address.SetTo(AF_INET6, "::1") == B_OK);
+}
+
+
 void
 NetworkAddressTest::TestWildcard()
 {
@@ -101,6 +123,8 @@ NetworkAddressTest::AddTests(BTestSuite& parent)
 
 	suite.addTest(new CppUnit::TestCaller<NetworkAddressTest>(
 		"NetworkAddressTest::TestUnset", &NetworkAddressTest::TestUnset));
+	suite.addTest(new CppUnit::TestCaller<NetworkAddressTest>(
+		"NetworkAddressTest::TestSetTo", &NetworkAddressTest::TestSetTo));
 	suite.addTest(new CppUnit::TestCaller<NetworkAddressTest>(
 		"NetworkAddressTest::TestWildcard", &NetworkAddressTest::TestWildcard));
 	suite.addTest(new CppUnit::TestCaller<NetworkAddressTest>(
diff --git a/src/tests/kits/net/libnetapi/NetworkAddressTest.h b/src/tests/kits/net/libnetapi/NetworkAddressTest.h
index e234d9020a..c750d3201c 100644
--- a/src/tests/kits/net/libnetapi/NetworkAddressTest.h
+++ b/src/tests/kits/net/libnetapi/NetworkAddressTest.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010, Axel Dörfler, axeld@pinc-software.de.
+ * Copyright 2010-2011, Axel Dörfler, axeld@pinc-software.de.
  * Distributed under the terms of the MIT License.
  */
 #ifndef NETWORK_ADDRESS_TEST_H
@@ -16,6 +16,7 @@ public:
 	virtual						~NetworkAddressTest();
 
 			void				TestUnset();
+			void				TestSetTo();
 			void				TestWildcard();
 			void				TestIsLocal();
 			void				TestFlatten();