diff --git a/src/tests/kits/net/service/Jamfile b/src/tests/kits/net/service/Jamfile
index 3ab1c87bf3..567e717b65 100644
--- a/src/tests/kits/net/service/Jamfile
+++ b/src/tests/kits/net/service/Jamfile
@@ -7,7 +7,6 @@ UnitTestLib servicekittest.so :
 
 	CookieTest.cpp
 	DataTest.cpp
-	GeolocationTest.cpp
 	HttpTest.cpp
 	UrlTest.cpp
 
diff --git a/src/tests/kits/net/service/ServiceKitTestAddon.cpp b/src/tests/kits/net/service/ServiceKitTestAddon.cpp
index d25f2150e5..d79c8d5f89 100644
--- a/src/tests/kits/net/service/ServiceKitTestAddon.cpp
+++ b/src/tests/kits/net/service/ServiceKitTestAddon.cpp
@@ -9,7 +9,6 @@
 
 #include "CookieTest.h"
 #include "DataTest.h"
-#include "GeolocationTest.h"
 #include "HttpTest.h"
 #include "UrlTest.h"
 
@@ -23,7 +22,6 @@ getTestSuite()
 	UrlTest::AddTests(*suite);
 	HttpTest::AddTests(*suite);
 	DataTest::AddTests(*suite);
-	GeolocationTest::AddTests(*suite);
 
 	return suite;
 }
diff --git a/src/tests/kits/net/service/GeolocationTest.cpp b/src/tests/kits/shared/GeolocationTest.cpp
similarity index 96%
rename from src/tests/kits/net/service/GeolocationTest.cpp
rename to src/tests/kits/shared/GeolocationTest.cpp
index a7907f42a0..adcc5e7571 100644
--- a/src/tests/kits/net/service/GeolocationTest.cpp
+++ b/src/tests/kits/shared/GeolocationTest.cpp
@@ -12,6 +12,9 @@
 #include <cppunit/TestSuite.h>
 
 
+using namespace BPrivate;
+
+
 GeolocationTest::GeolocationTest()
 {
 }
diff --git a/src/tests/kits/net/service/GeolocationTest.h b/src/tests/kits/shared/GeolocationTest.h
similarity index 100%
rename from src/tests/kits/net/service/GeolocationTest.h
rename to src/tests/kits/shared/GeolocationTest.h
diff --git a/src/tests/kits/shared/Jamfile b/src/tests/kits/shared/Jamfile
index 04098c8500..209fffb3ef 100644
--- a/src/tests/kits/shared/Jamfile
+++ b/src/tests/kits/shared/Jamfile
@@ -9,9 +9,10 @@ UnitTestLib libsharedtest.so :
 	SharedTestAddon.cpp
 
 	CalendarViewTest.cpp
+	GeolocationTest.cpp
 	NaturalCompareTest.cpp
 
-	: be libshared.a [ TargetLibstdc++ ] [ TargetLibsupc++ ]
+	: be libshared.a bnetapi [ TargetLibstdc++ ] [ TargetLibsupc++ ]
 ;
 
 SubInclude HAIKU_TOP src tests kits shared shake_filter ;
diff --git a/src/tests/kits/shared/SharedTestAddon.cpp b/src/tests/kits/shared/SharedTestAddon.cpp
index ac3c9375af..00090521e9 100644
--- a/src/tests/kits/shared/SharedTestAddon.cpp
+++ b/src/tests/kits/shared/SharedTestAddon.cpp
@@ -8,6 +8,7 @@
 #include <TestSuiteAddon.h>
 
 #include "CalendarViewTest.h"
+#include "GeolocationTest.h"
 #include "NaturalCompareTest.h"
 
 
@@ -17,6 +18,7 @@ getTestSuite()
 	BTestSuite* suite = new BTestSuite("Shared");
 
 	CalendarViewTest::AddTests(*suite);
+	GeolocationTest::AddTests(*suite);
 	NaturalCompareTest::AddTests(*suite);
 
 	return suite;