diff --git a/src/bin/network/Jamfile b/src/bin/network/Jamfile
index 8671640ebf..eac345f241 100644
--- a/src/bin/network/Jamfile
+++ b/src/bin/network/Jamfile
@@ -11,7 +11,6 @@ SubInclude HAIKU_TOP src bin network netstat ;
 SubInclude HAIKU_TOP src bin network ping ;
 SubInclude HAIKU_TOP src bin network route ;
 SubInclude HAIKU_TOP src bin network tcpdump ;
-SubInclude HAIKU_TOP src bin network tcptester ;
 SubInclude HAIKU_TOP src bin network telnet ;
 SubInclude HAIKU_TOP src bin network telnetd ;
 SubInclude HAIKU_TOP src bin network traceroute ;
diff --git a/src/bin/network/tcptester/Jamfile b/src/bin/network/tcptester/Jamfile
deleted file mode 100644
index d95ea65880..0000000000
--- a/src/bin/network/tcptester/Jamfile
+++ /dev/null
@@ -1,17 +0,0 @@
-SubDir HAIKU_TOP src bin network tcptester ;
-
-BinCommand tcptester :
-	tcptester.cpp
-	: libnetwork.so
-;
-
-# Installation -- in the test directory for the time being
-HaikuInstall install-networking
-	: [ FDirName $(HAIKU_TEST_DIR) kits net ]
-	: tcptester ;
-
-HaikuInstall install-userland-networking
-	: [ FDirName $(HAIKU_TEST_DIR) kits net userland ]
-	: tcptester
-	: installed-userland-networking
-;
diff --git a/src/tests/kits/net/Jamfile b/src/tests/kits/net/Jamfile
index d6dbde6a17..ea7239b0ae 100644
--- a/src/tests/kits/net/Jamfile
+++ b/src/tests/kits/net/Jamfile
@@ -65,3 +65,4 @@ SubInclude HAIKU_TOP src tests kits net DialUpPreflet ;
 SubInclude HAIKU_TOP src tests kits net netperf ;
 # SubInclude HAIKU_TOP src tests kits net new_stack ;
 SubInclude HAIKU_TOP src tests kits net preflet ;
+SubInclude HAIKU_TOP src tests kits net tcptester ;
diff --git a/src/tests/kits/net/tcptester/Jamfile b/src/tests/kits/net/tcptester/Jamfile
new file mode 100644
index 0000000000..6ae38099da
--- /dev/null
+++ b/src/tests/kits/net/tcptester/Jamfile
@@ -0,0 +1,6 @@
+SubDir HAIKU_TOP src tests kits net tcptester ;
+
+BinCommand tcptester :
+	tcptester.cpp
+	: libnetwork.so
+;
diff --git a/src/bin/network/tcptester/tcptester.cpp b/src/tests/kits/net/tcptester/tcptester.cpp
similarity index 100%
rename from src/bin/network/tcptester/tcptester.cpp
rename to src/tests/kits/net/tcptester/tcptester.cpp