diff --git a/rosapps/tests/README.txt b/rosapps/tests/README.txt
index 8dbc5d61b2d..86aa8cae584 100644
--- a/rosapps/tests/README.txt
+++ b/rosapps/tests/README.txt
@@ -1,3 +1,4 @@
-This folder contains tests that are not merged in to the new regression system.
+This folder contains tests that are not merged in to 
+the new regression testing system.
 
 Please DO NOT add new tests here.
\ No newline at end of file
diff --git a/rosapps/tests/bench/bench.xml b/rosapps/tests/bench/bench.xml
index 3343a3666e9..54787086152 100644
--- a/rosapps/tests/bench/bench.xml
+++ b/rosapps/tests/bench/bench.xml
@@ -1,8 +1,8 @@
-<module name="bench" type="win32gui" installbase="bin" installname="bench.exe">
+<module name="bench-thread" type="win32gui" installbase="bin" installname="bench-thread.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>bench.c</file>
+	<file>bench-thread.c</file>
 </module>
diff --git a/rosapps/tests/button/button.xml b/rosapps/tests/button/button.xml
index e695ae0fd50..f34c86c6e00 100644
--- a/rosapps/tests/button/button.xml
+++ b/rosapps/tests/button/button.xml
@@ -4,5 +4,5 @@
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>button.c</file>
+	<file>buttontst.c</file>
 </module>
diff --git a/rosapps/tests/button2/button2.xml b/rosapps/tests/button2/button2.xml
index 6724db5c437..bdba5c72854 100644
--- a/rosapps/tests/button2/button2.xml
+++ b/rosapps/tests/button2/button2.xml
@@ -1,8 +1,8 @@
-<module name="button2" type="win32gui" installbase="bin" installname="button2.exe">
+<module name="buttontst2" type="win32gui" installbase="bin" installname="buttontst2.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>button2.c</file>
+	<file>buttontst2.c</file>
 </module>
diff --git a/rosapps/tests/directory.xml b/rosapps/tests/directory.xml
index 4fe353f0f67..ecf9260b575 100644
--- a/rosapps/tests/directory.xml
+++ b/rosapps/tests/directory.xml
@@ -130,9 +130,9 @@
 <directory name="linetest">
 	<xi:include href="linetest/linetest.xml" />
 </directory>
-<directory name="lpctst">
-	<xi:include href="lpctst/lpctst.xml" />
-</directory>
+
+<!-- fixme: lpctst -->
+
 <directory name="map_dup_inherit">
 	<xi:include href="map_dup_inherit/map_dup_inherit.xml" />
 </directory>
@@ -148,9 +148,9 @@
 <directory name="moztest">
 	<xi:include href="moztest/moztest.xml" />
 </directory>
-<directory name="mstest">
-	<xi:include href="mstest/mstest.xml" />
-</directory>
+
+<!--  fixme: mstest -->
+
 <directory name="multithrdwin">
 	<xi:include href="multithrdwin/multithrdwin.xml" />
 </directory>
@@ -166,9 +166,9 @@
 <directory name="noexecute">
 	<xi:include href="noexecute/noexecute.xml" />
 </directory>
-<directory name="nptest">
-	<xi:include href="nptest/nptest.xml" />
-</directory>
+
+<!-- fixme: nptest -->
+
 <directory name="oskittcp">
 	<xi:include href="oskittcp/oskittcp.xml" />
 </directory>
@@ -211,9 +211,9 @@
 <directory name="shaptest">
 	<xi:include href="shaptest/shaptest.xml" />
 </directory>
-<directory name="shm">
-	<xi:include href="shm/shm.xml" />
-</directory>
+
+<!-- fixme: shm -->
+
 <directory name="statst">
 	<xi:include href="statst/statst.xml" />
 </directory>
@@ -253,8 +253,7 @@
 <directory name="txtscale">
 	<xi:include href="txtscale/txtscale.xml" />
 </directory>
-
-<directory name="vmtest/vmtest">
+<directory name="vmtest">
 	<xi:include href="vmtest/vmtest.xml" />
 </directory>
 <directory name="wclickat">
diff --git a/rosapps/tests/dnsapi/dnsapi.xml b/rosapps/tests/dnsapi/dnsapi.xml
index d016ff74a78..f1fb12175fe 100644
--- a/rosapps/tests/dnsapi/dnsapi.xml
+++ b/rosapps/tests/dnsapi/dnsapi.xml
@@ -4,5 +4,5 @@
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>dnsapitst.c</file>
+	<file>dnsapi.c</file>
 </module>
diff --git a/rosapps/tests/edit/edit.xml b/rosapps/tests/edit/edit.xml
index 00cd7bcae23..e34d53cb3fd 100644
--- a/rosapps/tests/edit/edit.xml
+++ b/rosapps/tests/edit/edit.xml
@@ -4,5 +4,6 @@
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>edit.c</file>
+	<file>edittest.c</file>
+	<file>utils.c</file>
 </module>
diff --git a/rosapps/tests/enumfonts/enumfonts.xml b/rosapps/tests/enumfonts/enumfonts.xml
index 78a1e8f2e04..2c51aeedcb1 100644
--- a/rosapps/tests/enumfonts/enumfonts.xml
+++ b/rosapps/tests/enumfonts/enumfonts.xml
@@ -4,5 +4,5 @@
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>enumfonts.c</file>
+	<file>enumfonts.cpp</file>
 </module>
diff --git a/rosapps/tests/iptest/iptest.xml b/rosapps/tests/iptest/iptest.xml
index c013f186f4c..f7e9aae8983 100644
--- a/rosapps/tests/iptest/iptest.xml
+++ b/rosapps/tests/iptest/iptest.xml
@@ -4,5 +4,5 @@
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>iptest.c</file>
+	<file>iptest.cpp</file>
 </module>
diff --git a/rosapps/tests/lantst/lantest.xml b/rosapps/tests/lantst/lantest.xml
index 640fcc9c7cc..41c63e0ba82 100644
--- a/rosapps/tests/lantst/lantest.xml
+++ b/rosapps/tests/lantst/lantest.xml
@@ -4,5 +4,5 @@
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>lantest.c</file>
+	<file>lantest.cpp</file>
 </module>
diff --git a/rosapps/tests/map_dup_inherit/map_dup_inherit.xml b/rosapps/tests/map_dup_inherit/map_dup_inherit.xml
index 82b3972353d..e6fed0a5d17 100644
--- a/rosapps/tests/map_dup_inherit/map_dup_inherit.xml
+++ b/rosapps/tests/map_dup_inherit/map_dup_inherit.xml
@@ -4,5 +4,5 @@
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>map_dup_inherit</file>
+	<file>map_dup_inherit.c</file>
 </module>
diff --git a/rosapps/tests/oskittcp/oskittcp.xml b/rosapps/tests/oskittcp/oskittcp.xml
index c92215189cd..60c3fc614f8 100644
--- a/rosapps/tests/oskittcp/oskittcp.xml
+++ b/rosapps/tests/oskittcp/oskittcp.xml
@@ -1,8 +1,8 @@
-<module name="oskittcp" type="win32gui" installbase="bin" installname="oskittcp.exe">
+<module name="oskittcptst" type="win32gui" installbase="bin" installname="tcptest.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>oskittcp.c</file>
+	<file>tcptest.cpp</file>
 </module>
diff --git a/rosapps/tests/palbitblt/palbitblt.xml b/rosapps/tests/palbitblt/palbitblt.xml
index b67155396d2..041cc88fefd 100644
--- a/rosapps/tests/palbitblt/palbitblt.xml
+++ b/rosapps/tests/palbitblt/palbitblt.xml
@@ -4,5 +4,5 @@
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>palbitblt.c</file>
+	<file>pal.c</file>
 </module>
diff --git a/rosapps/tests/patblt/patblt.xml b/rosapps/tests/patblt/patblt.xml
index ff9cf87950b..e817a7004da 100644
--- a/rosapps/tests/patblt/patblt.xml
+++ b/rosapps/tests/patblt/patblt.xml
@@ -4,5 +4,5 @@
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>patblt.c</file>
+	<file>patblt.cpp</file>
 </module>
diff --git a/rosapps/tests/polytest/polytest.xml b/rosapps/tests/polytest/polytest.xml
index 13b814c5d46..79079c27639 100644
--- a/rosapps/tests/polytest/polytest.xml
+++ b/rosapps/tests/polytest/polytest.xml
@@ -4,5 +4,5 @@
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>polytest.c</file>
+	<file>polytest.cpp</file>
 </module>
diff --git a/rosapps/tests/primitives/primitives.xml b/rosapps/tests/primitives/primitives.xml
index 23127e4e0d1..51832638bba 100644
--- a/rosapps/tests/primitives/primitives.xml
+++ b/rosapps/tests/primitives/primitives.xml
@@ -4,5 +4,6 @@
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>primitives.c</file>
+	<file>primitives.cpp</file>
+	<file>mk_font.cpp</file>
 </module>
diff --git a/rosapps/tests/stretchblt/stretchblt.xml b/rosapps/tests/stretchblt/stretchblt.xml
index 50c3056ed5c..b5c21a021c4 100644
--- a/rosapps/tests/stretchblt/stretchblt.xml
+++ b/rosapps/tests/stretchblt/stretchblt.xml
@@ -4,5 +4,5 @@
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>stretchblt.c</file>
+	<file>stretchblt.cpp</file>
 </module>
diff --git a/rosapps/tests/tmrqueue/tmrqueue.xml b/rosapps/tests/tmrqueue/tmrqueue.xml
index 51a140c3dee..35dec3e59cf 100644
--- a/rosapps/tests/tmrqueue/tmrqueue.xml
+++ b/rosapps/tests/tmrqueue/tmrqueue.xml
@@ -1,8 +1,8 @@
-<module name="tnrqueue" type="win32gui" installbase="bin" installname="tnrqueue.exe">
+<module name="tmrqueue" type="win32gui" installbase="bin" installname="tmrqueue.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>tnrqueue.c</file>
+	<file>tmrqueue.c</file>
 </module>
diff --git a/rosapps/tests/txtscale/txtscale.xml b/rosapps/tests/txtscale/txtscale.xml
index 5a2e1de24ae..32aa9830944 100644
--- a/rosapps/tests/txtscale/txtscale.xml
+++ b/rosapps/tests/txtscale/txtscale.xml
@@ -4,5 +4,6 @@
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>txtscale.c</file>
+	<file>txtscale.cpp</file>
+	<file>mk_font.cpp</file>
 </module>
diff --git a/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml b/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml
index 011db48e689..5b6afeb852d 100644
--- a/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml
+++ b/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.xml
@@ -4,5 +4,5 @@
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
-	<file>wm_erasebkgnd.c</file>
+	<file>wm_erasebkgnd.cpp</file>
 </module>