diff --git a/src/tests/add-ons/kernel/network/Jamfile b/src/tests/add-ons/kernel/network/Jamfile
index c9462e6ccb..96fb1ab4fe 100644
--- a/src/tests/add-ons/kernel/network/Jamfile
+++ b/src/tests/add-ons/kernel/network/Jamfile
@@ -26,7 +26,10 @@ Depends userland_network_modules :
 	# interfaces modules
 	<userland>loopback
 	<userland>ethernet
-	# <userland>ppp
+	<userland>ppp
+
+	# ppp modules
+	<userland>pppoe
 
 	# protocols modules
 	<userland>raw
@@ -38,4 +41,5 @@ Depends userland_network_modules :
 
 SubInclude OBOS_TOP src tests add-ons kernel network core ;
 SubInclude OBOS_TOP src tests add-ons kernel network interfaces ;
+SubInclude OBOS_TOP src tests add-ons kernel network ppp ;
 SubInclude OBOS_TOP src tests add-ons kernel network protocols ;
diff --git a/src/tests/add-ons/kernel/network/interfaces/Jamfile b/src/tests/add-ons/kernel/network/interfaces/Jamfile
index ed6316444c..a4d6dd462a 100644
--- a/src/tests/add-ons/kernel/network/interfaces/Jamfile
+++ b/src/tests/add-ons/kernel/network/interfaces/Jamfile
@@ -2,6 +2,6 @@ SubDir OBOS_TOP src tests add-ons kernel network interfaces ;
 
 SubInclude OBOS_TOP src tests add-ons kernel network interfaces ethernet ;
 SubInclude OBOS_TOP src tests add-ons kernel network interfaces loopback ;
-# SubInclude OBOS_TOP src tests add-ons kernel network interfaces ppp ;
+SubInclude OBOS_TOP src tests add-ons kernel network interfaces ppp ;
 
 
diff --git a/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile b/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile
index 273717c6f6..795aff1828 100644
--- a/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile
+++ b/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile
@@ -1,21 +1,14 @@
 SubDir OBOS_TOP src tests add-ons kernel network interfaces ppp ;
 
 UsePrivateHeaders net ;
-UsePrivateHeaders [ FDirName kernel ] ;
-UsePrivateHeaders [ FDirName kernel util ] ;
 UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ;
 
-# for kernel_cpp.cpp/h and BLocker
-SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core util ] ;
-SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src kernel core disk_device_manager ] ;
-
 SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network interfaces ppp ] ;
 
+
 Addon <userland>ppp : userland network interfaces : 
-	kernel_cpp.cpp
 	ppp.cpp
 	PPPManager.cpp
 ;
 
-LinkSharedOSLibs <userland>ppp : libkernelppp.a <installed>net_stack_tester ;
-
+LinkSharedOSLibs <userland>ppp : libuserlandppp.a <installed>net_stack_tester be ;
diff --git a/src/tests/add-ons/kernel/network/ppp/Jamfile b/src/tests/add-ons/kernel/network/ppp/Jamfile
new file mode 100644
index 0000000000..b0fed737de
--- /dev/null
+++ b/src/tests/add-ons/kernel/network/ppp/Jamfile
@@ -0,0 +1,4 @@
+SubDir OBOS_TOP src tests add-ons kernel network ppp ;
+
+SubInclude OBOS_TOP src tests add-ons kernel network ppp pppoe ;
+SubInclude OBOS_TOP src tests add-ons kernel network ppp shared ;
diff --git a/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile b/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile
new file mode 100644
index 0000000000..b375149bb7
--- /dev/null
+++ b/src/tests/add-ons/kernel/network/ppp/pppoe/Jamfile
@@ -0,0 +1,16 @@
+SubDir OBOS_TOP src tests add-ons kernel network ppp pppoe ;
+
+UsePrivateHeaders net ;
+UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ;
+UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp ] ;
+
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network ppp pppoe ] ;
+
+
+Addon <userland>pppoe : userland network ppp shared : 
+	pppoe.cpp
+	PPPoEDevice.cpp
+	DiscoveryPacket.cpp
+;
+
+LinkSharedOSLibs <userland>pppoe : libuserlandppp.a <installed>net_stack_tester be ;
diff --git a/src/tests/add-ons/kernel/network/ppp/shared/Jamfile b/src/tests/add-ons/kernel/network/ppp/shared/Jamfile
new file mode 100644
index 0000000000..b00ec0a394
--- /dev/null
+++ b/src/tests/add-ons/kernel/network/ppp/shared/Jamfile
@@ -0,0 +1,3 @@
+SubDir OBOS_TOP src tests add-ons kernel network ppp shared ;
+
+SubInclude OBOS_TOP src tests add-ons kernel network ppp shared libkernelppp ;
diff --git a/src/tests/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile b/src/tests/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile
new file mode 100644
index 0000000000..2e176ca08e
--- /dev/null
+++ b/src/tests/add-ons/kernel/network/ppp/shared/libkernelppp/Jamfile
@@ -0,0 +1,27 @@
+SubDir OBOS_TOP src tests add-ons kernel network ppp shared libkernelppp ;
+
+UsePrivateHeaders net ;
+UseHeaders [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp headers ] ;
+
+SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src add-ons kernel network ppp shared libkernelppp ] ;
+
+
+StaticLibrary userlandppp :
+	KPPPConfigurePacket.cpp
+	KPPPDevice.cpp
+	KPPPInterface.cpp
+	KPPPLayer.cpp
+	KPPPLCP.cpp
+	KPPPLCPExtension.cpp
+	KPPPOptionHandler.cpp
+	KPPPProtocol.cpp
+	KPPPReportManager.cpp
+	KPPPStateMachine.cpp
+	KPPPUtils.cpp
+	settings_tools.cpp
+	
+	# integrated modules
+	_KPPPMRUHandler.cpp
+	_KPPPAuthenticationHandler.cpp
+	_KPPPPFCHandler.cpp
+;
diff --git a/src/tests/add-ons/kernel/network/userland_modules.cpp b/src/tests/add-ons/kernel/network/userland_modules.cpp
index d811326ea8..52647678c8 100644
--- a/src/tests/add-ons/kernel/network/userland_modules.cpp
+++ b/src/tests/add-ons/kernel/network/userland_modules.cpp
@@ -394,7 +394,7 @@ _EXPORT void kprintf(const char *fmt, ...)
 }
 
 
-_EXPORT status_t load_driver_symbols(char *driver_name)
+_EXPORT status_t load_driver_symbols(const char *driver_name)
 {
 	// Userland debugger will extract symbols itself...
 	return B_OK;