diff --git a/rosapps/directory.xml b/rosapps/directory.xml
index 074682fb3fd..c99f7262123 100644
--- a/rosapps/directory.xml
+++ b/rosapps/directory.xml
@@ -45,6 +45,9 @@
 <directory name="templates">
 	<xi:include href="templates/directory.xml" />
 </directory>
+<directory name="tests">
+	<xi:include href="tests/directory.xml" />
+</directory>
 <!--
 <directory name="welcome">
 	<xi:include href="welcome/welcome.xml" />
diff --git a/rosapps/tests/Makefile b/rosapps/tests/Makefile
deleted file mode 100644
index 9c9be422d98..00000000000
--- a/rosapps/tests/Makefile
+++ /dev/null
@@ -1,132 +0,0 @@
-#
-# ReactOS test applications makefile
-#
-
-PATH_TO_TOP = ../../reactos
-
-include $(PATH_TO_TOP)/rules.mak
-
-# Broken tests 
-# dnsapi iptest lan regdump subclass
-
-TEST_APPS = \
-accelerator \
-alive \
-alphablend \
-apc \
-apc2 \
-args \
-atomtest \
-bench \
-bitblt \
-button \
-button2 \
-capclock \
-carets \
-combo \
-consume \
-copymove \
-count \
-create-links \
-dibtest \
-dirdlg \
-diskspeed \
-dnsquery \
-edit \
-enhmetafile \
-enumfonts \
-enumwnd \
-enumws \
-event \
-eventpair \
-fiber \
-global_mem \
-gradient \
-guithreadinfo \
-hello \
-hivetest \
-icontest \
-isotest \
-lineclip \
-linetest \
-lpc \
-map_dup_inherit \
-mdi \
-mktime \
-moztest \
-mstest \
-multithrdwin \
-multiwin \
-mutex \
-nameserverlist \
-noexecute \
-nptest \
-oskittcp \
-p_dup_handle \
-palbitblt \
-patblt \
-polytest \
-popupmenu \
-primitives \
-pteb \
-regqueryvalue \
-regtest \
-sectest \
-sertest \
-shaptest \
-shm \
-statst \
-statst2 \
-stretchblt \
-suspend \
-tcpsvr \
-terminate \
-thread \
-thread_msg \
-threadwait \
-tmrqueue \
-tokentest \
-txtscale \
-vmtest \
-winhello \
-wm_erasebkgnd \
-wm_paint \
-zwcontinue
-
-# Deactivated tests:
-# dump_shared_data
-# miditest
-
-all: $(TEST_APPS)
-
-depends: 
-
-implib: $(TEST_APPS:%=%_implib)
-
-clean: 	$(TEST_APPS:%=%_clean)
-
-install: $(TEST_APPS:%=%_install)
-
-.PHONY: all depends implib clean install
-
-#
-# Test Applications
-#
-$(TEST_APPS): %:
-	$(MAKE) -C $*
-
-$(TEST_APPS:%=%_implib): %_implib:
-	$(MAKE) -C $* implib
-
-$(TEST_APPS:%=%_clean): %_clean:
-	$(MAKE) -C $* clean
-
-$(TEST_APPS:%=%_install): %_install:
-	$(MAKE) -C $* install
-
-.PHONY: $(TEST_APPS) $(TEST_APPS:%=%_implib) $(TEST_APPS:%=%_clean) $(TEST_APPS:%=%_install)
-
-etags:
-	find . -name "*.[ch]" -print | etags --language=c -
-
-# EOF
diff --git a/rosapps/tests/alphablend/alphablend.xml b/rosapps/tests/alphablend/alphablend.xml
new file mode 100644
index 00000000000..17b0e78a5ce
--- /dev/null
+++ b/rosapps/tests/alphablend/alphablend.xml
@@ -0,0 +1,10 @@
+<module name="alphablend" type="win32gui" installbase="system32" installname="alphablend.exe">
+	<define name="_WIN32_IE">0x0501</define>
+	<define name="_WIN32_WINNT">0x0501</define>
+	<define name="__USE_W32API" />
+
+	<library>kernel32</library>
+	<library>gdi32</library>
+
+	<file>alphablend.c</file>
+</module>
\ No newline at end of file
diff --git a/rosapps/tests/alphablend/makefile b/rosapps/tests/alphablend/makefile
deleted file mode 100644
index c2bf775c1aa..00000000000
--- a/rosapps/tests/alphablend/makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-
-PATH_TO_TOP = ../../../reactos
-
-TARGET_NORC = yes
-
-TARGET_TYPE = program
-
-TARGET_APPTYPE = windows
-
-TARGET_NAME = alphablend
-
-TARGET_SDKLIBS = kernel32.a gdi32.a
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-TARGET_CFLAGS = -Wall -Werror -D__USE_W32API
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
-
-# EOF
diff --git a/rosapps/tests/directory.xml b/rosapps/tests/directory.xml
index 38eb1655b86..2e68a7ceeca 100644
--- a/rosapps/tests/directory.xml
+++ b/rosapps/tests/directory.xml
@@ -1,271 +1,3 @@
-<directory name="accelerator">
-	<xi:include href="accelerator/accelerator.xml" />
-</directory>
-<directory name="alive">
-	<xi:include href="alive/alive.xml" />
-</directory>
 <directory name="alphablend">
 	<xi:include href="alphablend/alphablend.xml" />
-</directory>
-<directory name="apc">
-	<xi:include href="apc/apc.xml" />
-</directory>
-<directory name="apc2">
-	<xi:include href="apc2/apc2.xml" />
-</directory>
-<directory name="args">
-	<xi:include href="args/args.xml" />
-</directory>
-<directory name="atomtest">
-	<xi:include href="atomtest/atomtest.xml" />
-</directory>
-<directory name="bench">
-	<xi:include href="bench/bench.xml" />
-</directory>
-<directory name="bitblt">
-	<xi:include href="bitblt/bitblt.xml" />
-</directory>
-<directory name="button">
-	<xi:include href="button/button.xml" />
-</directory>
-<directory name="button2">
-	<xi:include href="button2/button2.xml" />
-</directory>
-<directory name="capclock">
-	<xi:include href="capclock/capclock.xml" />
-</directory>
-<directory name="carets">
-	<xi:include href="carets/carets.xml" />
-</directory>
-<directory name="combo">
-	<xi:include href="combo/combo.xml" />
-</directory>
-<directory name="consume">
-	<xi:include href="consume/consume.xml" />
-</directory>
-<directory name="copymove">
-	<xi:include href="copymove/copymove.xml" />
-</directory>
-<directory name="count">
-	<xi:include href="count/count.xml" />
-</directory>
-<directory name="create-links">
-	<xi:include href="create-links/create-links.xml" />
-</directory>
-<directory name="dibtest">
-	<xi:include href="dibtest/dibtest.xml" />
-</directory>
-<directory name="dirdlg">
-	<xi:include href="dirdlg/dirdlg.xml" />
-</directory>
-<directory name="diskspeed">
-	<xi:include href="diskspeed/diskspeed.xml" />
-</directory>
-<directory name="dnsapi">
-	<xi:include href="dnsapi/dnsapi.xml" />
-</directory>
-<directory name="dnsquery">
-	<xi:include href="dnsquery/dnsquery.xml" />
-</directory>
-<directory name="dump_shared_data">
-	<xi:include href="dump_shared_data/dump_shared_data.xml" />
-</directory>
-<directory name="edit">
-	<xi:include href="edit/edit.xml" />
-</directory>
-<directory name="enhmetafile">
-	<xi:include href="enhmetafile/enhmetafile.xml" />
-</directory>
-<directory name="enumfonts">
-	<xi:include href="enumfonts/enumfonts.xml" />
-</directory>
-<directory name="enumwnd">
-	<xi:include href="enumwnd/enumwnd.xml" />
-</directory>
-<directory name="enumws">
-	<xi:include href="enumws/enumws.xml" />
-</directory>
-<directory name="event">
-	<xi:include href="event/event.xml" />
-</directory>
-<directory name="eventpair">
-	<xi:include href="eventpair/eventpair.xml" />
-</directory>
-<directory name="fiber">
-	<xi:include href="fiber/fiber.xml" />
-</directory>
-<directory name="gethostbyname">
-	<xi:include href="gethostbyname/gethostbyname.xml" />
-</directory>
-<directory name="global_mem">
-	<xi:include href="global_mem/global_mem.xml" />
-</directory>
-<directory name="gradient">
-	<xi:include href="gradient/gradient.xml" />
-</directory>
-<directory name="guithreadinfo">
-	<xi:include href="guithreadinfo/guithreadinfo.xml" />
-</directory>
-<directory name="hello">
-	<xi:include href="hello/hello.xml" />
-</directory>
-<directory name="hivetest">
-	<xi:include href="hivetest/hivetest.xml" />
-</directory>
-<directory name="icontest">
-	<xi:include href="icontest/icontest.xml" />
-</directory>
-<directory name="iptest">
-	<xi:include href="iptest/iptest.xml" />
-</directory>
-<directory name="isotest">
-	<xi:include href="isotest/isotest.xml" />
-</directory>
-<directory name="lan">
-	<xi:include href="lan/lan.xml" />
-</directory>
-<directory name="lineclip">
-	<xi:include href="lineclip/lineclip.xml" />
-</directory>
-<directory name="linetest">
-	<xi:include href="linetest/linetest.xml" />
-</directory>
-<directory name="lpc">
-	<xi:include href="lpc/lpc.xml" />
-</directory>
-<directory name="map_dup_inherit">
-	<xi:include href="map_dup_inherit/map_dup_inherit.xml" />
-</directory>
-<directory name="mdi">
-	<xi:include href="mdi/mdi.xml" />
-</directory>
-<directory name="miditest">
-	<xi:include href="miditest/miditest.xml" />
-</directory>
-<directory name="mktime">
-	<xi:include href="mktime/mktime.xml" />
-</directory>
-<directory name="moztest">
-	<xi:include href="moztest/moztest.xml" />
-</directory>
-<directory name="mstest">
-	<xi:include href="mstest/mstest.xml" />
-</directory>
-<directory name="multithrdwin">
-	<xi:include href="multithrdwin/multithrdwin.xml" />
-</directory>
-<directory name="multiwin">
-	<xi:include href="multiwin/multiwin.xml" />
-</directory>
-<directory name="mutex">
-	<xi:include href="mutex/mutex.xml" />
-</directory>
-<directory name="nameserverlist">
-	<xi:include href="nameserverlist/nameserverlist.xml" />
-</directory>
-<directory name="noexecute">
-	<xi:include href="noexecute/noexecute.xml" />
-</directory>
-<directory name="nptest">
-	<xi:include href="nptest/nptest.xml" />
-</directory>
-<directory name="oskittcp">
-	<xi:include href="oskittcp/oskittcp.xml" />
-</directory>
-<directory name="palbitblt">
-	<xi:include href="palbitblt/palbitblt.xml" />
-</directory>
-<directory name="patblt">
-	<xi:include href="patblt/patblt.xml" />
-</directory>
-<directory name="p_dup_handle">
-	<xi:include href="p_dup_handle/p_dup_handle.xml" />
-</directory>
-<directory name="polytest">
-	<xi:include href="polytest.xml" />
-</directory>
-<directory name="popupmenu">
-	<xi:include href="popupmenu/popupmenu.xml" />
-</directory>
-<directory name="primitives">
-	<xi:include href="primitives/primitives.xml" />
-</directory>
-<directory name="pteb">
-	<xi:include href="pteb/pteb.xml" />
-</directory>
-<directory name="regdump">
-	<xi:include href="regdump/regdump.xml" />
-</directory>
-<directory name="regqueryvalue">
-	<xi:include href="regqueryvalue/regqueryvalue.xml" />
-</directory>
-<directory name="regtest">
-	<xi:include href="regtest/regtest.xml" />
-</directory>
-<directory name="sectest">
-	<xi:include href="sectest/sectest.xml" />
-</directory>
-<directory name="sertest">
-	<xi:include href="sertest/sertest.xml" />
-</directory>
-<directory name="shaptest">
-	<xi:include href="shaptest/shaptest.xml" />
-</directory>
-<directory name="shm">
-	<xi:include href="shm/shm.xml" />
-</directory>
-<directory name="statst">
-	<xi:include href="statst/statst.xml" />
-</directory>
-<directory name="statst2">
-	<xi:include href="statst2/statst2.xml" />
-</directory>
-<directory name="stretchblt">
-	<xi:include href="stretchblt/stretchblt.xml" />
-</directory>
-<directory name="subclass">
-	<xi:include href="subclass/subclass.xml" />
-</directory>
-<directory name="suspend">
-	<xi:include href="suspend/suspend.xml" />
-</directory>
-<directory name="tcpsvr">
-	<xi:include href="tcpsvr/tcpsvr.xml" />
-</directory>
-<directory name="terminate">
-	<xi:include href="terminate/terminate.xml" />
-</directory>
-<directory name="thread">
-	<xi:include href="thread/thread.xml" />
-</directory>
-<directory name="thread_msg">
-	<xi:include href="thread_msg/thread_msg.xml" />
-</directory>
-<directory name="threadwait">
-	<xi:include href="threadwait/threadwait.xml" />
-</directory>
-<directory name="tmrqueue">
-	<xi:include href="tmrqueue/tmrqueue.xml" />
-</directory>
-<directory name="tokentest">
-	<xi:include href="tokentest/tokentest.xml" />
-</directory>
-<directory name="txtscale">
-	<xi:include href="txtscale/txtscale.xml" />
-</directory>
-<directory name="vmtest">
-	<xi:include href="vmtest/vmtest.xml" />
-</directory>
-<directory name="winhello">
-	<xi:include href="winhello/winhello.xml" />
-</directory>
-<directory name="wm_erasebkgnd">
-	<xi:include href="wm_erasebkgnd/wm_erasebkgnd.xml" />
-</directory>
-<directory name="wm_paint">
-	<xi:include href="wm_paint/wm_paint.xml" />
-</directory>
-<directory name="zwcontinue">
-	<xi:include href="zwcontinue/zwcontinue.xml" />
-</directory>
-
+</directory>
\ No newline at end of file