diff --git a/src/kernel/vm2/tests/Jamfile b/src/tests/kernel/vm2/Jamfile
similarity index 100%
rename from src/kernel/vm2/tests/Jamfile
rename to src/tests/kernel/vm2/Jamfile
diff --git a/src/kernel/vm2/tests/createAreaFails.C b/src/tests/kernel/vm2/createAreaFails.C
similarity index 100%
rename from src/kernel/vm2/tests/createAreaFails.C
rename to src/tests/kernel/vm2/createAreaFails.C
diff --git a/src/kernel/vm2/tests/createAreaTestsGood.C b/src/tests/kernel/vm2/createAreaTestsGood.C
similarity index 100%
rename from src/kernel/vm2/tests/createAreaTestsGood.C
rename to src/tests/kernel/vm2/createAreaTestsGood.C
diff --git a/src/kernel/vm2/tests/freeAreaFails.C b/src/tests/kernel/vm2/freeAreaFails.C
similarity index 100%
rename from src/kernel/vm2/tests/freeAreaFails.C
rename to src/tests/kernel/vm2/freeAreaFails.C
diff --git a/src/kernel/vm2/tests/getAreaByAddress.C b/src/tests/kernel/vm2/getAreaByAddress.C
similarity index 100%
rename from src/kernel/vm2/tests/getAreaByAddress.C
rename to src/tests/kernel/vm2/getAreaByAddress.C
diff --git a/src/kernel/vm2/tests/getAreaByName.C b/src/tests/kernel/vm2/getAreaByName.C
similarity index 100%
rename from src/kernel/vm2/tests/getAreaByName.C
rename to src/tests/kernel/vm2/getAreaByName.C
diff --git a/src/kernel/vm2/tests/getAreaInfoFails.C b/src/tests/kernel/vm2/getAreaInfoFails.C
similarity index 100%
rename from src/kernel/vm2/tests/getAreaInfoFails.C
rename to src/tests/kernel/vm2/getAreaInfoFails.C
diff --git a/src/kernel/vm2/tests/hashTest.C b/src/tests/kernel/vm2/hashTest.C
similarity index 100%
rename from src/kernel/vm2/tests/hashTest.C
rename to src/tests/kernel/vm2/hashTest.C
diff --git a/src/kernel/vm2/tests/mmapTest1.C b/src/tests/kernel/vm2/mmapTest1.C
similarity index 100%
rename from src/kernel/vm2/tests/mmapTest1.C
rename to src/tests/kernel/vm2/mmapTest1.C
diff --git a/src/kernel/vm2/tests/mmapTest2.C b/src/tests/kernel/vm2/mmapTest2.C
similarity index 100%
rename from src/kernel/vm2/tests/mmapTest2.C
rename to src/tests/kernel/vm2/mmapTest2.C
diff --git a/src/kernel/vm2/tests/mmapTest3.C b/src/tests/kernel/vm2/mmapTest3.C
similarity index 100%
rename from src/kernel/vm2/tests/mmapTest3.C
rename to src/tests/kernel/vm2/mmapTest3.C
diff --git a/src/kernel/vm2/tests/olTest.C b/src/tests/kernel/vm2/olTest.C
similarity index 100%
rename from src/kernel/vm2/tests/olTest.C
rename to src/tests/kernel/vm2/olTest.C
diff --git a/src/kernel/vm2/tests/pageManTest.C b/src/tests/kernel/vm2/pageManTest.C
similarity index 100%
rename from src/kernel/vm2/tests/pageManTest.C
rename to src/tests/kernel/vm2/pageManTest.C
diff --git a/src/kernel/vm2/tests/resizeArea.C b/src/tests/kernel/vm2/resizeArea.C
similarity index 100%
rename from src/kernel/vm2/tests/resizeArea.C
rename to src/tests/kernel/vm2/resizeArea.C
diff --git a/src/kernel/vm2/tests/simpleTest.C b/src/tests/kernel/vm2/simpleTest.C
similarity index 100%
rename from src/kernel/vm2/tests/simpleTest.C
rename to src/tests/kernel/vm2/simpleTest.C
diff --git a/src/kernel/vm2/tests/test.C b/src/tests/kernel/vm2/test.C
similarity index 100%
rename from src/kernel/vm2/tests/test.C
rename to src/tests/kernel/vm2/test.C
diff --git a/src/kernel/vm2/tests/testSetup.C b/src/tests/kernel/vm2/testSetup.C
similarity index 100%
rename from src/kernel/vm2/tests/testSetup.C
rename to src/tests/kernel/vm2/testSetup.C
diff --git a/src/kernel/vm2/tests/testsToDo b/src/tests/kernel/vm2/testsToDo
similarity index 100%
rename from src/kernel/vm2/tests/testsToDo
rename to src/tests/kernel/vm2/testsToDo