diff --git a/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile b/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile
index 39985189d4..a4810b0fc6 100644
--- a/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile
+++ b/src/tests/add-ons/kernel/network/interfaces/ppp/Jamfile
@@ -11,6 +11,4 @@ Addon <userland>ppp : userland network interfaces :
 	PPPManager.cpp
 ;
 
-SEARCH on [ FGristFiles driver_settings.c ] = [ FDirName $(OBOS_TOP) src kernel libroot os ] ;
-
 LinkSharedOSLibs <userland>ppp : <userland>libkernelppp.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
index b0fed737de..9d49130197 100644
--- a/src/tests/add-ons/kernel/network/ppp/Jamfile
+++ b/src/tests/add-ons/kernel/network/ppp/Jamfile
@@ -1,4 +1,6 @@
 SubDir OBOS_TOP src tests add-ons kernel network ppp ;
 
+SubInclude OBOS_TOP src tests add-ons kernel network ppp ipcp ;
+SubInclude OBOS_TOP src tests add-ons kernel network ppp pap ;
 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/ipcp/Jamfile b/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile
new file mode 100644
index 0000000000..0ff17d9196
--- /dev/null
+++ b/src/tests/add-ons/kernel/network/ppp/ipcp/Jamfile
@@ -0,0 +1,15 @@
+SubDir OBOS_TOP src tests add-ons kernel network ppp ipcp ;
+
+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 ipcp ] ;
+
+
+Addon <userland>ipcp : userland network ppp : 
+	ipcp.cpp
+	Protocol.cpp
+;
+
+LinkSharedOSLibs <userland>ipcp : <userland>libkernelppp.a <installed>net_stack_tester be net ;
diff --git a/src/tests/add-ons/kernel/network/ppp/pap/Jamfile b/src/tests/add-ons/kernel/network/ppp/pap/Jamfile
new file mode 100644
index 0000000000..75f195246b
--- /dev/null
+++ b/src/tests/add-ons/kernel/network/ppp/pap/Jamfile
@@ -0,0 +1,15 @@
+SubDir OBOS_TOP src tests add-ons kernel network ppp pap ;
+
+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 pap ] ;
+
+
+Addon <userland>pap : userland network ppp : 
+	pap.cpp
+	Protocol.cpp
+;
+
+LinkSharedOSLibs <userland>pap : <userland>libkernelppp.a <installed>net_stack_tester be ;