diff --git a/src/tests/Jamfile b/src/tests/Jamfile
index bbd3e7b851..d779982069 100644
--- a/src/tests/Jamfile
+++ b/src/tests/Jamfile
@@ -18,3 +18,4 @@ UnitTest UnitTester
 
 SubInclude OBOS_TOP src tests add-ons ;
 SubInclude OBOS_TOP src tests kits ;
+SubInclude OBOS_TOP src tests servers ;
diff --git a/src/tests/servers/Jamfile b/src/tests/servers/Jamfile
new file mode 100644
index 0000000000..26eb6c6e31
--- /dev/null
+++ b/src/tests/servers/Jamfile
@@ -0,0 +1,4 @@
+SubDir OBOS_TOP src tests servers ;
+
+SubInclude OBOS_TOP src tests servers input ;
+SubInclude OBOS_TOP src tests servers registrar ;
diff --git a/src/tests/servers/input/Jamfile b/src/tests/servers/input/Jamfile
new file mode 100644
index 0000000000..324e9cf457
--- /dev/null
+++ b/src/tests/servers/input/Jamfile
@@ -0,0 +1,4 @@
+SubDir OBOS_TOP src tests servers input ;
+
+SubInclude OBOS_TOP src tests servers input msgspy ;
+SubInclude OBOS_TOP src tests servers input portspy ;
diff --git a/src/tests/servers/input/msgspy/Jamfile b/src/tests/servers/input/msgspy/Jamfile
new file mode 100644
index 0000000000..52ed40f00c
--- /dev/null
+++ b/src/tests/servers/input/msgspy/Jamfile
@@ -0,0 +1,5 @@
+SubDir OBOS_TOP src tests servers input msgspy ;
+
+Addon MsgSpy : input_server filters : MsgSpy.cpp ;
+LinkSharedOSLibs MsgSpy : be /system/servers/input_server ;
+
diff --git a/src/tests/servers/input/portspy/Jamfile b/src/tests/servers/input/portspy/Jamfile
new file mode 100644
index 0000000000..77ac0e00ba
--- /dev/null
+++ b/src/tests/servers/input/portspy/Jamfile
@@ -0,0 +1,7 @@
+SubDir OBOS_TOP src tests servers input portspy ;
+
+SimpleTest PortSpy
+	: PortSpy.cpp
+	: 
+;
+