diff --git a/src/tests/Jamfile b/src/tests/Jamfile
index ab42bf514b..a896bd1752 100644
--- a/src/tests/Jamfile
+++ b/src/tests/Jamfile
@@ -27,7 +27,7 @@ if $(TARGET_PLATFORM) = libbe_test {
 SubInclude HAIKU_TOP src tests add-ons ;
 SubInclude HAIKU_TOP src tests apps ;
 SubInclude HAIKU_TOP src tests bin ;
-SubInclude HAIKU_TOP src tests kernel ;
+SubInclude HAIKU_TOP src tests system ;
 SubInclude HAIKU_TOP src tests kits ;
 SubInclude HAIKU_TOP src tests misc ;
 SubInclude HAIKU_TOP src tests servers ;
diff --git a/src/tests/kernel/Jamfile b/src/tests/kernel/Jamfile
deleted file mode 100644
index b8f2db85a4..0000000000
--- a/src/tests/kernel/Jamfile
+++ /dev/null
@@ -1,7 +0,0 @@
-SubDir HAIKU_TOP src tests kernel ;
-
-SubInclude HAIKU_TOP src tests kernel boot ;
-SubInclude HAIKU_TOP src tests kernel consoled ;
-SubInclude HAIKU_TOP src tests kernel core ;
-SubInclude HAIKU_TOP src tests kernel libroot ;
-SubInclude HAIKU_TOP src tests kernel benchmarks ;
diff --git a/src/tests/kernel/boot/Jamfile b/src/tests/kernel/boot/Jamfile
deleted file mode 100644
index be0985c7a3..0000000000
--- a/src/tests/kernel/boot/Jamfile
+++ /dev/null
@@ -1,4 +0,0 @@
-SubDir HAIKU_TOP src tests kernel boot ;
-
-SubInclude HAIKU_TOP src tests kernel boot heap ;
-SubInclude HAIKU_TOP src tests kernel boot loader ;
diff --git a/src/tests/kernel/boot/loader/file_systems/Jamfile b/src/tests/kernel/boot/loader/file_systems/Jamfile
deleted file mode 100644
index 1a2b18b41a..0000000000
--- a/src/tests/kernel/boot/loader/file_systems/Jamfile
+++ /dev/null
@@ -1,5 +0,0 @@
-SubDir HAIKU_TOP src tests kernel boot loader file_systems ;
-
-SubInclude HAIKU_TOP src tests kernel boot loader file_systems amiga_ffs ;
-SubInclude HAIKU_TOP src tests kernel boot loader file_systems bfs ;
-SubInclude HAIKU_TOP src tests kernel boot loader file_systems tarfs ;
diff --git a/src/tests/kernel/libroot/Jamfile b/src/tests/kernel/libroot/Jamfile
deleted file mode 100644
index 56e97945f2..0000000000
--- a/src/tests/kernel/libroot/Jamfile
+++ /dev/null
@@ -1,4 +0,0 @@
-SubDir HAIKU_TOP src tests kernel libroot ;
-
-SubInclude HAIKU_TOP src tests kernel libroot os ;
-SubInclude HAIKU_TOP src tests kernel libroot posix ;
diff --git a/src/tests/kernel/libroot/posix/bonnie/Jamfile b/src/tests/kernel/libroot/posix/bonnie/Jamfile
deleted file mode 100644
index b07bcff521..0000000000
--- a/src/tests/kernel/libroot/posix/bonnie/Jamfile
+++ /dev/null
@@ -1,6 +0,0 @@
-SubDir HAIKU_TOP src tests kernel libroot posix bonnie ;
-
-SimpleTest bonnie :
-	Bonnie.c
-;
-
diff --git a/src/tests/system/Jamfile b/src/tests/system/Jamfile
new file mode 100644
index 0000000000..a22ecbd509
--- /dev/null
+++ b/src/tests/system/Jamfile
@@ -0,0 +1,7 @@
+SubDir HAIKU_TOP src tests system ;
+
+SubInclude HAIKU_TOP src tests system boot ;
+SubInclude HAIKU_TOP src tests system consoled ;
+SubInclude HAIKU_TOP src tests system kernel ;
+SubInclude HAIKU_TOP src tests system libroot ;
+SubInclude HAIKU_TOP src tests system benchmarks ;
diff --git a/src/tests/kernel/benchmarks/Jamfile b/src/tests/system/benchmarks/Jamfile
similarity index 82%
rename from src/tests/kernel/benchmarks/Jamfile
rename to src/tests/system/benchmarks/Jamfile
index 96a162e492..ce5f0e8c33 100644
--- a/src/tests/kernel/benchmarks/Jamfile
+++ b/src/tests/system/benchmarks/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tests kernel benchmarks ;
+SubDir HAIKU_TOP src tests system benchmarks ;
 
 SimpleTest memspeedTest :
 	memspeed.c
diff --git a/src/tests/kernel/benchmarks/ctxbench.c b/src/tests/system/benchmarks/ctxbench.c
similarity index 100%
rename from src/tests/kernel/benchmarks/ctxbench.c
rename to src/tests/system/benchmarks/ctxbench.c
diff --git a/src/tests/kernel/benchmarks/execbench.c b/src/tests/system/benchmarks/execbench.c
similarity index 100%
rename from src/tests/kernel/benchmarks/execbench.c
rename to src/tests/system/benchmarks/execbench.c
diff --git a/src/tests/kernel/benchmarks/forkbench.c b/src/tests/system/benchmarks/forkbench.c
similarity index 100%
rename from src/tests/kernel/benchmarks/forkbench.c
rename to src/tests/system/benchmarks/forkbench.c
diff --git a/src/tests/kernel/benchmarks/memspeed.c b/src/tests/system/benchmarks/memspeed.c
similarity index 100%
rename from src/tests/kernel/benchmarks/memspeed.c
rename to src/tests/system/benchmarks/memspeed.c
diff --git a/src/tests/kernel/benchmarks/syscallbench.c b/src/tests/system/benchmarks/syscallbench.c
similarity index 100%
rename from src/tests/kernel/benchmarks/syscallbench.c
rename to src/tests/system/benchmarks/syscallbench.c
diff --git a/src/tests/system/boot/Jamfile b/src/tests/system/boot/Jamfile
new file mode 100644
index 0000000000..5141c3b2cb
--- /dev/null
+++ b/src/tests/system/boot/Jamfile
@@ -0,0 +1,4 @@
+SubDir HAIKU_TOP src tests system boot ;
+
+SubInclude HAIKU_TOP src tests system boot heap ;
+SubInclude HAIKU_TOP src tests system boot loader ;
diff --git a/src/tests/kernel/boot/heap/Jamfile b/src/tests/system/boot/heap/Jamfile
similarity index 94%
rename from src/tests/kernel/boot/heap/Jamfile
rename to src/tests/system/boot/heap/Jamfile
index 6ee7017928..0afd392de7 100644
--- a/src/tests/kernel/boot/heap/Jamfile
+++ b/src/tests/system/boot/heap/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tests kernel boot heap ;
+SubDir HAIKU_TOP src tests system boot heap ;
 
 UsePublicHeaders support ;
 UsePrivateHeaders kernel ;
diff --git a/src/tests/kernel/boot/heap/heapTest.cpp b/src/tests/system/boot/heap/heapTest.cpp
similarity index 100%
rename from src/tests/kernel/boot/heap/heapTest.cpp
rename to src/tests/system/boot/heap/heapTest.cpp
diff --git a/src/tests/kernel/boot/loader/Handle.cpp b/src/tests/system/boot/loader/Handle.cpp
similarity index 100%
rename from src/tests/kernel/boot/loader/Handle.cpp
rename to src/tests/system/boot/loader/Handle.cpp
diff --git a/src/tests/kernel/boot/loader/Handle.h b/src/tests/system/boot/loader/Handle.h
similarity index 100%
rename from src/tests/kernel/boot/loader/Handle.h
rename to src/tests/system/boot/loader/Handle.h
diff --git a/src/tests/kernel/boot/loader/Jamfile b/src/tests/system/boot/loader/Jamfile
similarity index 96%
rename from src/tests/kernel/boot/loader/Jamfile
rename to src/tests/system/boot/loader/Jamfile
index 597020d741..58b1f3b67f 100644
--- a/src/tests/kernel/boot/loader/Jamfile
+++ b/src/tests/system/boot/loader/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tests kernel boot loader ;
+SubDir HAIKU_TOP src tests system boot loader ;
 
 UsePrivateHeaders [ FDirName kernel ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
@@ -130,4 +130,4 @@ SEARCH on [ FGristFiles intel.cpp PartitionMap.cpp PartitionMapParser.cpp ]
 	= [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ] ;
 
 
-SubInclude HAIKU_TOP src tests kernel boot loader file_systems ;
+SubInclude HAIKU_TOP src tests system boot loader file_systems ;
diff --git a/src/tests/system/boot/loader/file_systems/Jamfile b/src/tests/system/boot/loader/file_systems/Jamfile
new file mode 100644
index 0000000000..de88b435e6
--- /dev/null
+++ b/src/tests/system/boot/loader/file_systems/Jamfile
@@ -0,0 +1,5 @@
+SubDir HAIKU_TOP src tests system boot loader file_systems ;
+
+SubInclude HAIKU_TOP src tests system boot loader file_systems amiga_ffs ;
+SubInclude HAIKU_TOP src tests system boot loader file_systems bfs ;
+SubInclude HAIKU_TOP src tests system boot loader file_systems tarfs ;
diff --git a/src/tests/kernel/boot/loader/file_systems/amiga_ffs/Jamfile b/src/tests/system/boot/loader/file_systems/amiga_ffs/Jamfile
similarity index 84%
rename from src/tests/kernel/boot/loader/file_systems/amiga_ffs/Jamfile
rename to src/tests/system/boot/loader/file_systems/amiga_ffs/Jamfile
index 16dedce272..887e9676ab 100644
--- a/src/tests/kernel/boot/loader/file_systems/amiga_ffs/Jamfile
+++ b/src/tests/system/boot/loader/file_systems/amiga_ffs/Jamfile
@@ -1,9 +1,9 @@
-SubDir HAIKU_TOP src tests kernel boot loader file_systems amiga_ffs ;
+SubDir HAIKU_TOP src tests system boot loader file_systems amiga_ffs ;
 
 UsePrivateHeaders [ FDirName kernel ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName storage ] ;
-SubDirHdrs $(HAIKU_TOP) src tests kernel boot loader ;
+SubDirHdrs $(HAIKU_TOP) src tests system boot loader ;
 
 ObjectDefines 
 	amiga_ffs.cpp
diff --git a/src/tests/kernel/boot/loader/file_systems/bfs/Jamfile b/src/tests/system/boot/loader/file_systems/bfs/Jamfile
similarity index 85%
rename from src/tests/kernel/boot/loader/file_systems/bfs/Jamfile
rename to src/tests/system/boot/loader/file_systems/bfs/Jamfile
index 8f99c377c2..9e46214131 100644
--- a/src/tests/kernel/boot/loader/file_systems/bfs/Jamfile
+++ b/src/tests/system/boot/loader/file_systems/bfs/Jamfile
@@ -1,9 +1,9 @@
-SubDir HAIKU_TOP src tests kernel boot loader file_systems bfs ;
+SubDir HAIKU_TOP src tests system boot loader file_systems bfs ;
 
 UsePrivateHeaders [ FDirName kernel ] ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders [ FDirName storage ] ;
-SubDirHdrs $(HAIKU_TOP) src tests kernel boot loader ;
+SubDirHdrs $(HAIKU_TOP) src tests system boot loader ;
 SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ;
 
 ObjectDefines
diff --git a/src/tests/kernel/boot/loader/file_systems/tarfs/Jamfile b/src/tests/system/boot/loader/file_systems/tarfs/Jamfile
similarity index 83%
rename from src/tests/kernel/boot/loader/file_systems/tarfs/Jamfile
rename to src/tests/system/boot/loader/file_systems/tarfs/Jamfile
index 2d5ab42b0b..7843e859ea 100644
--- a/src/tests/kernel/boot/loader/file_systems/tarfs/Jamfile
+++ b/src/tests/system/boot/loader/file_systems/tarfs/Jamfile
@@ -1,8 +1,8 @@
-SubDir HAIKU_TOP src tests kernel boot loader file_systems tarfs ;
+SubDir HAIKU_TOP src tests system boot loader file_systems tarfs ;
 
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
 UsePrivateHeaders kernel shared storage ;
-SubDirHdrs $(HAIKU_TOP) src tests kernel boot loader ;
+SubDirHdrs $(HAIKU_TOP) src tests system boot loader ;
 SubDirSysHdrs $(HAIKU_TOP) headers libs zlib ;
 
 ObjectDefines 
diff --git a/src/tests/kernel/boot/loader/platform_debug.cpp b/src/tests/system/boot/loader/platform_debug.cpp
similarity index 100%
rename from src/tests/kernel/boot/loader/platform_debug.cpp
rename to src/tests/system/boot/loader/platform_debug.cpp
diff --git a/src/tests/kernel/boot/loader/platform_devices.cpp b/src/tests/system/boot/loader/platform_devices.cpp
similarity index 100%
rename from src/tests/kernel/boot/loader/platform_devices.cpp
rename to src/tests/system/boot/loader/platform_devices.cpp
diff --git a/src/tests/kernel/boot/loader/platform_heap.cpp b/src/tests/system/boot/loader/platform_heap.cpp
similarity index 100%
rename from src/tests/kernel/boot/loader/platform_heap.cpp
rename to src/tests/system/boot/loader/platform_heap.cpp
diff --git a/src/tests/kernel/boot/loader/platform_kernel_args.h b/src/tests/system/boot/loader/platform_kernel_args.h
similarity index 100%
rename from src/tests/kernel/boot/loader/platform_kernel_args.h
rename to src/tests/system/boot/loader/platform_kernel_args.h
diff --git a/src/tests/kernel/boot/loader/platform_menu.cpp b/src/tests/system/boot/loader/platform_menu.cpp
similarity index 100%
rename from src/tests/kernel/boot/loader/platform_menu.cpp
rename to src/tests/system/boot/loader/platform_menu.cpp
diff --git a/src/tests/kernel/boot/loader/platform_misc.cpp b/src/tests/system/boot/loader/platform_misc.cpp
similarity index 100%
rename from src/tests/kernel/boot/loader/platform_misc.cpp
rename to src/tests/system/boot/loader/platform_misc.cpp
diff --git a/src/tests/kernel/boot/loader/platform_mmu.cpp b/src/tests/system/boot/loader/platform_mmu.cpp
similarity index 100%
rename from src/tests/kernel/boot/loader/platform_mmu.cpp
rename to src/tests/system/boot/loader/platform_mmu.cpp
diff --git a/src/tests/kernel/boot/loader/platform_stage2_args.h b/src/tests/system/boot/loader/platform_stage2_args.h
similarity index 100%
rename from src/tests/kernel/boot/loader/platform_stage2_args.h
rename to src/tests/system/boot/loader/platform_stage2_args.h
diff --git a/src/tests/kernel/boot/loader/platform_start.cpp b/src/tests/system/boot/loader/platform_start.cpp
similarity index 100%
rename from src/tests/kernel/boot/loader/platform_start.cpp
rename to src/tests/system/boot/loader/platform_start.cpp
diff --git a/src/tests/kernel/consoled/Jamfile b/src/tests/system/consoled/Jamfile
similarity index 76%
rename from src/tests/kernel/consoled/Jamfile
rename to src/tests/system/consoled/Jamfile
index 6c2de6736d..429fb38824 100644
--- a/src/tests/kernel/consoled/Jamfile
+++ b/src/tests/system/consoled/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tests kernel consoled ;
+SubDir HAIKU_TOP src tests system consoled ;
 
 UsePrivateHeaders kernel ;
 UseHeaders [ FDirName $(HAIKU_TOP) src apps terminal ] ;
diff --git a/src/tests/kernel/consoled/consoled.cpp b/src/tests/system/consoled/consoled.cpp
similarity index 100%
rename from src/tests/kernel/consoled/consoled.cpp
rename to src/tests/system/consoled/consoled.cpp
diff --git a/src/tests/kernel/core/Jamfile b/src/tests/system/kernel/Jamfile
similarity index 53%
rename from src/tests/kernel/core/Jamfile
rename to src/tests/system/kernel/Jamfile
index 970ecf7352..298deca031 100644
--- a/src/tests/kernel/core/Jamfile
+++ b/src/tests/system/kernel/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tests kernel core ;
+SubDir HAIKU_TOP src tests system kernel ;
 
 UsePrivateHeaders kernel ;
 
@@ -16,6 +16,6 @@ SimpleTest syscall_time :
 	syscall_time.cpp
 	: $(LIBROOT) ;
 
-SubInclude HAIKU_TOP src tests kernel core cache ;
-#SubInclude HAIKU_TOP src tests kernel core disk_device_manager ;
-SubInclude HAIKU_TOP src tests kernel core util ;
+SubInclude HAIKU_TOP src tests system kernel cache ;
+#SubInclude HAIKU_TOP src tests system kernel disk_device_manager ;
+SubInclude HAIKU_TOP src tests system kernel util ;
diff --git a/src/tests/kernel/core/cache/BlockMapTest.cpp b/src/tests/system/kernel/cache/BlockMapTest.cpp
similarity index 100%
rename from src/tests/kernel/core/cache/BlockMapTest.cpp
rename to src/tests/system/kernel/cache/BlockMapTest.cpp
diff --git a/src/tests/kernel/core/cache/Jamfile b/src/tests/system/kernel/cache/Jamfile
similarity index 91%
rename from src/tests/kernel/core/cache/Jamfile
rename to src/tests/system/kernel/cache/Jamfile
index 4b9681a6bc..70ccdd04ef 100644
--- a/src/tests/kernel/core/cache/Jamfile
+++ b/src/tests/system/kernel/cache/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tests kernel core cache ;
+SubDir HAIKU_TOP src tests system kernel cache ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system kernel cache ] ;
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system kernel util ] ;
diff --git a/src/tests/kernel/core/cache/cache_control.cpp b/src/tests/system/kernel/cache/cache_control.cpp
similarity index 100%
rename from src/tests/kernel/core/cache/cache_control.cpp
rename to src/tests/system/kernel/cache/cache_control.cpp
diff --git a/src/tests/kernel/core/disk_device_manager/DiskDeviceManagerTest.cpp b/src/tests/system/kernel/disk_device_manager/DiskDeviceManagerTest.cpp
similarity index 100%
rename from src/tests/kernel/core/disk_device_manager/DiskDeviceManagerTest.cpp
rename to src/tests/system/kernel/disk_device_manager/DiskDeviceManagerTest.cpp
diff --git a/src/tests/kernel/core/disk_device_manager/Jamfile b/src/tests/system/kernel/disk_device_manager/Jamfile
similarity index 97%
rename from src/tests/kernel/core/disk_device_manager/Jamfile
rename to src/tests/system/kernel/disk_device_manager/Jamfile
index 0c23ae926c..c25c21da12 100644
--- a/src/tests/kernel/core/disk_device_manager/Jamfile
+++ b/src/tests/system/kernel/disk_device_manager/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tests kernel core disk_device_manager ;
+SubDir HAIKU_TOP src tests system kernel disk_device_manager ;
 
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system kernel disk_device_manager jobs ] ;
 SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src system kernel disk_device_manager ] ;
diff --git a/src/tests/kernel/core/syscall_time.cpp b/src/tests/system/kernel/syscall_time.cpp
similarity index 100%
rename from src/tests/kernel/core/syscall_time.cpp
rename to src/tests/system/kernel/syscall_time.cpp
diff --git a/src/tests/kernel/core/transfer_area_test.cpp b/src/tests/system/kernel/transfer_area_test.cpp
similarity index 100%
rename from src/tests/kernel/core/transfer_area_test.cpp
rename to src/tests/system/kernel/transfer_area_test.cpp
diff --git a/src/tests/kernel/core/util/AVLTreeMapTest.cpp b/src/tests/system/kernel/util/AVLTreeMapTest.cpp
similarity index 100%
rename from src/tests/kernel/core/util/AVLTreeMapTest.cpp
rename to src/tests/system/kernel/util/AVLTreeMapTest.cpp
diff --git a/src/tests/kernel/core/util/AVLTreeMapTest.h b/src/tests/system/kernel/util/AVLTreeMapTest.h
similarity index 100%
rename from src/tests/kernel/core/util/AVLTreeMapTest.h
rename to src/tests/system/kernel/util/AVLTreeMapTest.h
diff --git a/src/tests/kernel/core/util/DoublyLinkedListTest.cpp b/src/tests/system/kernel/util/DoublyLinkedListTest.cpp
similarity index 100%
rename from src/tests/kernel/core/util/DoublyLinkedListTest.cpp
rename to src/tests/system/kernel/util/DoublyLinkedListTest.cpp
diff --git a/src/tests/kernel/core/util/DoublyLinkedListTest.h b/src/tests/system/kernel/util/DoublyLinkedListTest.h
similarity index 100%
rename from src/tests/kernel/core/util/DoublyLinkedListTest.h
rename to src/tests/system/kernel/util/DoublyLinkedListTest.h
diff --git a/src/tests/kernel/core/util/Jamfile b/src/tests/system/kernel/util/Jamfile
similarity index 92%
rename from src/tests/kernel/core/util/Jamfile
rename to src/tests/system/kernel/util/Jamfile
index eb567875b8..4c18a532c3 100644
--- a/src/tests/kernel/core/util/Jamfile
+++ b/src/tests/system/kernel/util/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tests kernel core util ;
+SubDir HAIKU_TOP src tests system kernel util ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 AddSubDirSupportedPlatforms libbe_test ;
diff --git a/src/tests/kernel/core/util/KernelUtilsTestAddon.cpp b/src/tests/system/kernel/util/KernelUtilsTestAddon.cpp
similarity index 100%
rename from src/tests/kernel/core/util/KernelUtilsTestAddon.cpp
rename to src/tests/system/kernel/util/KernelUtilsTestAddon.cpp
diff --git a/src/tests/kernel/core/util/OrderedMapTest.h b/src/tests/system/kernel/util/OrderedMapTest.h
similarity index 100%
rename from src/tests/kernel/core/util/OrderedMapTest.h
rename to src/tests/system/kernel/util/OrderedMapTest.h
diff --git a/src/tests/kernel/core/util/SinglyLinkedListTest.cpp b/src/tests/system/kernel/util/SinglyLinkedListTest.cpp
similarity index 100%
rename from src/tests/kernel/core/util/SinglyLinkedListTest.cpp
rename to src/tests/system/kernel/util/SinglyLinkedListTest.cpp
diff --git a/src/tests/kernel/core/util/SinglyLinkedListTest.h b/src/tests/system/kernel/util/SinglyLinkedListTest.h
similarity index 100%
rename from src/tests/kernel/core/util/SinglyLinkedListTest.h
rename to src/tests/system/kernel/util/SinglyLinkedListTest.h
diff --git a/src/tests/kernel/core/util/VectorMapTest.cpp b/src/tests/system/kernel/util/VectorMapTest.cpp
similarity index 100%
rename from src/tests/kernel/core/util/VectorMapTest.cpp
rename to src/tests/system/kernel/util/VectorMapTest.cpp
diff --git a/src/tests/kernel/core/util/VectorMapTest.h b/src/tests/system/kernel/util/VectorMapTest.h
similarity index 100%
rename from src/tests/kernel/core/util/VectorMapTest.h
rename to src/tests/system/kernel/util/VectorMapTest.h
diff --git a/src/tests/kernel/core/util/VectorSetTest.cpp b/src/tests/system/kernel/util/VectorSetTest.cpp
similarity index 100%
rename from src/tests/kernel/core/util/VectorSetTest.cpp
rename to src/tests/system/kernel/util/VectorSetTest.cpp
diff --git a/src/tests/kernel/core/util/VectorSetTest.h b/src/tests/system/kernel/util/VectorSetTest.h
similarity index 100%
rename from src/tests/kernel/core/util/VectorSetTest.h
rename to src/tests/system/kernel/util/VectorSetTest.h
diff --git a/src/tests/kernel/core/util/VectorTest.cpp b/src/tests/system/kernel/util/VectorTest.cpp
similarity index 100%
rename from src/tests/kernel/core/util/VectorTest.cpp
rename to src/tests/system/kernel/util/VectorTest.cpp
diff --git a/src/tests/kernel/core/util/VectorTest.h b/src/tests/system/kernel/util/VectorTest.h
similarity index 100%
rename from src/tests/kernel/core/util/VectorTest.h
rename to src/tests/system/kernel/util/VectorTest.h
diff --git a/src/tests/system/libroot/Jamfile b/src/tests/system/libroot/Jamfile
new file mode 100644
index 0000000000..2cfc5fe9a7
--- /dev/null
+++ b/src/tests/system/libroot/Jamfile
@@ -0,0 +1,4 @@
+SubDir HAIKU_TOP src tests system libroot ;
+
+SubInclude HAIKU_TOP src tests system libroot os ;
+SubInclude HAIKU_TOP src tests system libroot posix ;
diff --git a/src/tests/kernel/libroot/os/DriverSettingsTest.cpp b/src/tests/system/libroot/os/DriverSettingsTest.cpp
similarity index 100%
rename from src/tests/kernel/libroot/os/DriverSettingsTest.cpp
rename to src/tests/system/libroot/os/DriverSettingsTest.cpp
diff --git a/src/tests/kernel/libroot/os/FindDirectoryTest.cpp b/src/tests/system/libroot/os/FindDirectoryTest.cpp
similarity index 100%
rename from src/tests/kernel/libroot/os/FindDirectoryTest.cpp
rename to src/tests/system/libroot/os/FindDirectoryTest.cpp
diff --git a/src/tests/kernel/libroot/os/Jamfile b/src/tests/system/libroot/os/Jamfile
similarity index 82%
rename from src/tests/kernel/libroot/os/Jamfile
rename to src/tests/system/libroot/os/Jamfile
index bc1531f6a8..99d842c683 100644
--- a/src/tests/kernel/libroot/os/Jamfile
+++ b/src/tests/system/libroot/os/Jamfile
@@ -1,4 +1,6 @@
-SubDir HAIKU_TOP src tests kernel libroot os ;
+SubDir HAIKU_TOP src tests system libroot os ;
+
+SetSubDirSupportedPlatforms libbe_test ;
 
 #SubDirCcFlags -fcheck-memory-usage -O0 -D_NO_INLINE_ASM ;
 
diff --git a/src/tests/kernel/libroot/os/ParseDateTest.cpp b/src/tests/system/libroot/os/ParseDateTest.cpp
similarity index 100%
rename from src/tests/kernel/libroot/os/ParseDateTest.cpp
rename to src/tests/system/libroot/os/ParseDateTest.cpp
diff --git a/src/tests/kernel/libroot/posix/Jamfile b/src/tests/system/libroot/posix/Jamfile
similarity index 59%
rename from src/tests/kernel/libroot/posix/Jamfile
rename to src/tests/system/libroot/posix/Jamfile
index e57f08c929..7ad7a2b269 100644
--- a/src/tests/kernel/libroot/posix/Jamfile
+++ b/src/tests/system/libroot/posix/Jamfile
@@ -1,5 +1,6 @@
-SubDir HAIKU_TOP src tests kernel libroot posix ;
+SubDir HAIKU_TOP src tests system libroot posix ;
 
+SetSubDirSupportedPlatforms libbe_test ;
 UsePrivateHeaders syslog_daemon ;
 
 SimpleTest SyslogTest
@@ -19,5 +20,5 @@ SEARCH on [ FGristFiles
 		syslog.cpp
 	] = [ FDirName $(HAIKU_TOP) src system libroot posix ] ;
 
-SubInclude HAIKU_TOP src tests kernel libroot posix bonnie ;
-SubInclude HAIKU_TOP src tests kernel libroot posix math ;
+SubInclude HAIKU_TOP src tests system libroot posix bonnie ;
+SubInclude HAIKU_TOP src tests system libroot posix math ;
diff --git a/src/tests/kernel/libroot/posix/SyslogTest.cpp b/src/tests/system/libroot/posix/SyslogTest.cpp
similarity index 100%
rename from src/tests/kernel/libroot/posix/SyslogTest.cpp
rename to src/tests/system/libroot/posix/SyslogTest.cpp
diff --git a/src/tests/kernel/libroot/posix/bonnie/Bonnie.c b/src/tests/system/libroot/posix/bonnie/Bonnie.c
similarity index 100%
rename from src/tests/kernel/libroot/posix/bonnie/Bonnie.c
rename to src/tests/system/libroot/posix/bonnie/Bonnie.c
diff --git a/src/tests/system/libroot/posix/bonnie/Jamfile b/src/tests/system/libroot/posix/bonnie/Jamfile
new file mode 100644
index 0000000000..e7310aa0b8
--- /dev/null
+++ b/src/tests/system/libroot/posix/bonnie/Jamfile
@@ -0,0 +1,6 @@
+SubDir HAIKU_TOP src tests system libroot posix bonnie ;
+
+SimpleTest bonnie :
+	Bonnie.c
+;
+
diff --git a/src/tests/kernel/libroot/posix/bonnie/bonnie.1 b/src/tests/system/libroot/posix/bonnie/bonnie.1
similarity index 100%
rename from src/tests/kernel/libroot/posix/bonnie/bonnie.1
rename to src/tests/system/libroot/posix/bonnie/bonnie.1
diff --git a/src/tests/kernel/libroot/posix/flock_test.cpp b/src/tests/system/libroot/posix/flock_test.cpp
similarity index 100%
rename from src/tests/kernel/libroot/posix/flock_test.cpp
rename to src/tests/system/libroot/posix/flock_test.cpp
diff --git a/src/tests/kernel/libroot/posix/math/Jamfile b/src/tests/system/libroot/posix/math/Jamfile
similarity index 91%
rename from src/tests/kernel/libroot/posix/math/Jamfile
rename to src/tests/system/libroot/posix/math/Jamfile
index 7a481d9007..47297cd474 100644
--- a/src/tests/kernel/libroot/posix/math/Jamfile
+++ b/src/tests/system/libroot/posix/math/Jamfile
@@ -1,4 +1,4 @@
-SubDir HAIKU_TOP src tests kernel libroot posix math ;
+SubDir HAIKU_TOP src tests system libroot posix math ;
 
 UsePrivateHeaders libroot ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) src system libroot posix glibc ] ;
diff --git a/src/tests/kernel/libroot/posix/math/math_test.cpp b/src/tests/system/libroot/posix/math/math_test.cpp
similarity index 100%
rename from src/tests/kernel/libroot/posix/math/math_test.cpp
rename to src/tests/system/libroot/posix/math/math_test.cpp
diff --git a/src/tests/kernel/libroot/posix/setjmp_test.c b/src/tests/system/libroot/posix/setjmp_test.c
similarity index 100%
rename from src/tests/kernel/libroot/posix/setjmp_test.c
rename to src/tests/system/libroot/posix/setjmp_test.c
diff --git a/src/tests/kernel/vm2/Jamfile b/src/tests/system/vm2/Jamfile
similarity index 100%
rename from src/tests/kernel/vm2/Jamfile
rename to src/tests/system/vm2/Jamfile
diff --git a/src/tests/kernel/vm2/createAreaFails.C b/src/tests/system/vm2/createAreaFails.C
similarity index 100%
rename from src/tests/kernel/vm2/createAreaFails.C
rename to src/tests/system/vm2/createAreaFails.C
diff --git a/src/tests/kernel/vm2/createAreaTestsGood.C b/src/tests/system/vm2/createAreaTestsGood.C
similarity index 100%
rename from src/tests/kernel/vm2/createAreaTestsGood.C
rename to src/tests/system/vm2/createAreaTestsGood.C
diff --git a/src/tests/kernel/vm2/freeAreaFails.C b/src/tests/system/vm2/freeAreaFails.C
similarity index 100%
rename from src/tests/kernel/vm2/freeAreaFails.C
rename to src/tests/system/vm2/freeAreaFails.C
diff --git a/src/tests/kernel/vm2/getAreaByAddress.C b/src/tests/system/vm2/getAreaByAddress.C
similarity index 100%
rename from src/tests/kernel/vm2/getAreaByAddress.C
rename to src/tests/system/vm2/getAreaByAddress.C
diff --git a/src/tests/kernel/vm2/getAreaByName.C b/src/tests/system/vm2/getAreaByName.C
similarity index 100%
rename from src/tests/kernel/vm2/getAreaByName.C
rename to src/tests/system/vm2/getAreaByName.C
diff --git a/src/tests/kernel/vm2/getAreaInfoFails.C b/src/tests/system/vm2/getAreaInfoFails.C
similarity index 100%
rename from src/tests/kernel/vm2/getAreaInfoFails.C
rename to src/tests/system/vm2/getAreaInfoFails.C
diff --git a/src/tests/kernel/vm2/hashTest.C b/src/tests/system/vm2/hashTest.C
similarity index 100%
rename from src/tests/kernel/vm2/hashTest.C
rename to src/tests/system/vm2/hashTest.C
diff --git a/src/tests/kernel/vm2/mmapTest1.C b/src/tests/system/vm2/mmapTest1.C
similarity index 100%
rename from src/tests/kernel/vm2/mmapTest1.C
rename to src/tests/system/vm2/mmapTest1.C
diff --git a/src/tests/kernel/vm2/mmapTest2.C b/src/tests/system/vm2/mmapTest2.C
similarity index 100%
rename from src/tests/kernel/vm2/mmapTest2.C
rename to src/tests/system/vm2/mmapTest2.C
diff --git a/src/tests/kernel/vm2/mmapTest3.C b/src/tests/system/vm2/mmapTest3.C
similarity index 100%
rename from src/tests/kernel/vm2/mmapTest3.C
rename to src/tests/system/vm2/mmapTest3.C
diff --git a/src/tests/kernel/vm2/olTest.C b/src/tests/system/vm2/olTest.C
similarity index 100%
rename from src/tests/kernel/vm2/olTest.C
rename to src/tests/system/vm2/olTest.C
diff --git a/src/tests/kernel/vm2/pageManTest.C b/src/tests/system/vm2/pageManTest.C
similarity index 100%
rename from src/tests/kernel/vm2/pageManTest.C
rename to src/tests/system/vm2/pageManTest.C
diff --git a/src/tests/kernel/vm2/resizeArea.C b/src/tests/system/vm2/resizeArea.C
similarity index 100%
rename from src/tests/kernel/vm2/resizeArea.C
rename to src/tests/system/vm2/resizeArea.C
diff --git a/src/tests/kernel/vm2/simpleTest.C b/src/tests/system/vm2/simpleTest.C
similarity index 100%
rename from src/tests/kernel/vm2/simpleTest.C
rename to src/tests/system/vm2/simpleTest.C
diff --git a/src/tests/kernel/vm2/test.C b/src/tests/system/vm2/test.C
similarity index 100%
rename from src/tests/kernel/vm2/test.C
rename to src/tests/system/vm2/test.C
diff --git a/src/tests/kernel/vm2/testSetup.C b/src/tests/system/vm2/testSetup.C
similarity index 100%
rename from src/tests/kernel/vm2/testSetup.C
rename to src/tests/system/vm2/testSetup.C
diff --git a/src/tests/kernel/vm2/testsToDo b/src/tests/system/vm2/testsToDo
similarity index 100%
rename from src/tests/kernel/vm2/testsToDo
rename to src/tests/system/vm2/testsToDo