diff --git a/src/tests/Jamfile b/src/tests/Jamfile
index 4fa235b655..f0d91e0d66 100644
--- a/src/tests/Jamfile
+++ b/src/tests/Jamfile
@@ -1,3 +1,3 @@
-SubDir OBOS_TOP sources tests ;
+SubDir OBOS_TOP src tests ;
 
-SubInclude OBOS_TOP sources tests kits ;
\ No newline at end of file
+SubInclude OBOS_TOP src tests kits ;
diff --git a/src/tests/kits/Jamfile b/src/tests/kits/Jamfile
index 8c06dcf5bf..905bbc8ad1 100644
--- a/src/tests/kits/Jamfile
+++ b/src/tests/kits/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP sources test kits ;
+SubDir OBOS_TOP src tests kits ;
 
-SubInclude OBOS_TOP sources tests kits app ;
+SubInclude OBOS_TOP src tests kits app ;
 
diff --git a/src/tests/kits/app/Jamfile b/src/tests/kits/app/Jamfile
index 3dc3c85560..0faff4e465 100644
--- a/src/tests/kits/app/Jamfile
+++ b/src/tests/kits/app/Jamfile
@@ -1,6 +1,6 @@
-SubDir OBOS_TOP sources test kits app ;
+SubDir OBOS_TOP src tests kits app ;
 
-SubInclude OBOS_TOP sources tests kits app BHandler ;
-#SubInclude OBOS_TOP sources tests kits app BLooper ;
-#SubInclude OBOS_TOP sources tests kits app BMessageQueue ;
-SubInclude OBOS_TOP sources tests kits app BMessenger ;
+SubInclude OBOS_TOP src tests kits app bhandler ;
+#SubInclude OBOS_TOP src tests kits app blooper ;
+#SubInclude OBOS_TOP src tests kits app bmessageQueue ;
+SubInclude OBOS_TOP src tests kits app bmessenger ;
diff --git a/src/tests/kits/app/bhandler/Jamfile b/src/tests/kits/app/bhandler/Jamfile
index e94d84c8f8..8946628925 100644
--- a/src/tests/kits/app/bhandler/Jamfile
+++ b/src/tests/kits/app/bhandler/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP sources tests kits app BHandler ;
+SubDir OBOS_TOP src tests kits app bhandler ;
 
 CommonUnitTest BHandlerTester
 	: main.cpp
diff --git a/src/tests/kits/app/blooper/Jamfile b/src/tests/kits/app/blooper/Jamfile
index 3583eecc2e..712acb8f81 100644
--- a/src/tests/kits/app/blooper/Jamfile
+++ b/src/tests/kits/app/blooper/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP sources tests kits app BLooper ;
+SubDir OBOS_TOP src tests kits app blooper ;
 
 UsePublicHeaders app support ;
 
diff --git a/src/tests/kits/app/bmessagequeue/Jamfile b/src/tests/kits/app/bmessagequeue/Jamfile
index 062cb83ec2..e20960a8f0 100644
--- a/src/tests/kits/app/bmessagequeue/Jamfile
+++ b/src/tests/kits/app/bmessagequeue/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP sources tests kits app BMessageQueue ;
+SubDir OBOS_TOP src tests kits app bmessagequeue ;
 
 UsePublicHeaders app support ;
 
diff --git a/src/tests/kits/app/bmessenger/Jamfile b/src/tests/kits/app/bmessenger/Jamfile
index 48582d7cb2..1d4fb87f8e 100644
--- a/src/tests/kits/app/bmessenger/Jamfile
+++ b/src/tests/kits/app/bmessenger/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP sources tests kits app BMessenger ;
+SubDir OBOS_TOP src tests kits app bmessenger ;
 
 CommonUnitTest BMessengerTester
 	: main.cpp
diff --git a/src/tools/Jamfile b/src/tools/Jamfile
index 49c29a8b2c..e4526c7734 100644
--- a/src/tools/Jamfile
+++ b/src/tools/Jamfile
@@ -1,2 +1,5 @@
-SubInclude OBOS_TOP sources os tools key ;
-SubInclude OBOS_TOP sources os tools jam ;
+SubDir OBOS_TOP src tools ;
+
+SubInclude OBOS_TOP src tools cppunit ;
+SubInclude OBOS_TOP src tools key ;
+SubInclude OBOS_TOP src tools jam ;
diff --git a/src/tools/cppunit/Jamfile b/src/tools/cppunit/Jamfile
index d625b87f1f..93a21595db 100644
--- a/src/tools/cppunit/Jamfile
+++ b/src/tools/cppunit/Jamfile
@@ -1,4 +1,4 @@
-SubDir OBOS_TOP sources tools cppunit ;
+SubDir OBOS_TOP src tools cppunit ;
 
 rule CppUnitLibrary
 {