diff --git a/src/tests/servers/net/net_server/add-ons/Jamfile b/src/tests/servers/net/net_server/add-ons/Jamfile
new file mode 100644
index 0000000000..5678031ba7
--- /dev/null
+++ b/src/tests/servers/net/net_server/add-ons/Jamfile
@@ -0,0 +1,6 @@
+SubDir OBOS_TOP src tests servers net net_server add-ons ;
+
+SubInclude OBOS_TOP src tests servers net net_server add-ons core ;
+SubInclude OBOS_TOP src tests servers net net_server add-ons interfaces ;
+SubInclude OBOS_TOP src tests servers net net_server add-ons protocols ;
+
diff --git a/src/tests/servers/net/net_server/add-ons/core/Jamfile b/src/tests/servers/net/net_server/add-ons/core/Jamfile
new file mode 100644
index 0000000000..10b7fcf8e0
--- /dev/null
+++ b/src/tests/servers/net/net_server/add-ons/core/Jamfile
@@ -0,0 +1,26 @@
+SubDir OBOS_TOP src tests servers net net_server add-ons core ;
+
+UsePrivateHeaders net ;
+
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network core ] ;
+
+Addon core : net_server/network : 
+	cksum.c
+	core.c
+	if.c
+	ifq.c
+	in.c
+	inpcb.c
+	mbuf.c
+	misc.c
+	net_timer.c
+	nhash.c
+	pools.c
+	radix.c
+	route.c
+	sockbuf.c
+	socket.c
+;
+
+LinkSharedOSLibs core : root /system/servers/net_server ;
+
diff --git a/src/tests/servers/net/net_server/add-ons/interfaces/Jamfile b/src/tests/servers/net/net_server/add-ons/interfaces/Jamfile
new file mode 100644
index 0000000000..504664e5d6
--- /dev/null
+++ b/src/tests/servers/net/net_server/add-ons/interfaces/Jamfile
@@ -0,0 +1,5 @@
+SubDir OBOS_TOP src tests servers net net_server add-ons interfaces ;
+
+SubInclude OBOS_TOP src tests servers net net_server add-ons interfaces ethernet ;
+SubInclude OBOS_TOP src tests servers net net_server add-ons interfaces loopback ;
+
diff --git a/src/tests/servers/net/net_server/add-ons/interfaces/ethernet/Jamfile b/src/tests/servers/net/net_server/add-ons/interfaces/ethernet/Jamfile
new file mode 100644
index 0000000000..dbf63b228f
--- /dev/null
+++ b/src/tests/servers/net/net_server/add-ons/interfaces/ethernet/Jamfile
@@ -0,0 +1,12 @@
+SubDir OBOS_TOP src tests servers net net_server add-ons interfaces ethernet ;
+
+UsePrivateHeaders net ;
+
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network interfaces ethernet ] ;
+
+Addon ethernet : net_server/network/interfaces : 
+	ethernet.c
+;
+
+LinkSharedOSLibs ethernet : root /system/servers/net_server ;
+
diff --git a/src/tests/servers/net/net_server/add-ons/interfaces/loopback/Jamfile b/src/tests/servers/net/net_server/add-ons/interfaces/loopback/Jamfile
new file mode 100644
index 0000000000..0dfe0b39f4
--- /dev/null
+++ b/src/tests/servers/net/net_server/add-ons/interfaces/loopback/Jamfile
@@ -0,0 +1,12 @@
+SubDir OBOS_TOP src tests servers net net_server add-ons interfaces loopback ;
+
+UsePrivateHeaders net ;
+
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network interfaces loopback ] ;
+
+Addon loopback : net_server/network/interfaces : 
+	loopback.c
+;
+
+LinkSharedOSLibs loopback : root /system/servers/net_server ;
+
diff --git a/src/tests/servers/net/net_server/add-ons/protocols/Jamfile b/src/tests/servers/net/net_server/add-ons/protocols/Jamfile
new file mode 100644
index 0000000000..a3bbf22b55
--- /dev/null
+++ b/src/tests/servers/net/net_server/add-ons/protocols/Jamfile
@@ -0,0 +1,8 @@
+SubDir OBOS_TOP src tests servers net net_server add-ons protocols ;
+
+SubInclude OBOS_TOP src tests servers net net_server add-ons protocols raw ;
+SubInclude OBOS_TOP src tests servers net net_server add-ons protocols ipv4 ;
+SubInclude OBOS_TOP src tests servers net net_server add-ons protocols icmp ;
+SubInclude OBOS_TOP src tests servers net net_server add-ons protocols udp ;
+SubInclude OBOS_TOP src tests servers net net_server add-ons protocols tcp ;
+
diff --git a/src/tests/servers/net/net_server/add-ons/protocols/icmp/Jamfile b/src/tests/servers/net/net_server/add-ons/protocols/icmp/Jamfile
new file mode 100644
index 0000000000..7988059ba9
--- /dev/null
+++ b/src/tests/servers/net/net_server/add-ons/protocols/icmp/Jamfile
@@ -0,0 +1,12 @@
+SubDir OBOS_TOP src tests servers net net_server add-ons protocols icmp ;
+
+UsePrivateHeaders net ;
+
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network protocols icmp ] ;
+
+Addon icmp : net_server/network/protocols : 
+	icmp.c
+;
+
+LinkSharedOSLibs icmp : root /system/servers/net_server ;
+
diff --git a/src/tests/servers/net/net_server/add-ons/protocols/ipv4/Jamfile b/src/tests/servers/net/net_server/add-ons/protocols/ipv4/Jamfile
new file mode 100644
index 0000000000..19848bfeaa
--- /dev/null
+++ b/src/tests/servers/net/net_server/add-ons/protocols/ipv4/Jamfile
@@ -0,0 +1,12 @@
+SubDir OBOS_TOP src tests servers net net_server add-ons protocols ipv4 ;
+
+UsePrivateHeaders net ;
+
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network protocols ipv4 ] ;
+
+Addon ipv4 : net_server/network/protocols : 
+	ipv4.c
+;
+
+LinkSharedOSLibs ipv4 : root /system/servers/net_server ;
+
diff --git a/src/tests/servers/net/net_server/add-ons/protocols/raw/Jamfile b/src/tests/servers/net/net_server/add-ons/protocols/raw/Jamfile
new file mode 100644
index 0000000000..7464bf49b7
--- /dev/null
+++ b/src/tests/servers/net/net_server/add-ons/protocols/raw/Jamfile
@@ -0,0 +1,12 @@
+SubDir OBOS_TOP src tests servers net net_server add-ons protocols raw ;
+
+UsePrivateHeaders net ;
+
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network protocols raw ] ;
+
+Addon raw : net_server/network/protocols : 
+	raw.c
+;
+
+LinkSharedOSLibs raw : root /system/servers/net_server ;
+
diff --git a/src/tests/servers/net/net_server/add-ons/protocols/tcp/Jamfile b/src/tests/servers/net/net_server/add-ons/protocols/tcp/Jamfile
new file mode 100644
index 0000000000..917b6852a6
--- /dev/null
+++ b/src/tests/servers/net/net_server/add-ons/protocols/tcp/Jamfile
@@ -0,0 +1,17 @@
+SubDir OBOS_TOP src tests servers net net_server add-ons protocols tcp ;
+
+UsePrivateHeaders net ;
+
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network protocols tcp ] ;
+
+Addon tcp : net_server/network/protocols : 
+	arc4random.c
+	tcp.c
+	tcp_debug.c
+	tcp_input.c
+	tcp_output.c
+	tcp_timer.c
+;
+
+LinkSharedOSLibs tcp : root /system/servers/net_server ;
+
diff --git a/src/tests/servers/net/net_server/add-ons/protocols/udp/Jamfile b/src/tests/servers/net/net_server/add-ons/protocols/udp/Jamfile
new file mode 100644
index 0000000000..714810e2ea
--- /dev/null
+++ b/src/tests/servers/net/net_server/add-ons/protocols/udp/Jamfile
@@ -0,0 +1,12 @@
+SubDir OBOS_TOP src tests servers net net_server add-ons protocols udp ;
+
+UsePrivateHeaders net ;
+
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network protocols udp ] ;
+
+Addon udp : net_server/network/protocols : 
+	udp.c
+;
+
+LinkSharedOSLibs udp : root /system/servers/net_server ;
+