diff --git a/rostests/CMakeLists.txt b/rostests/CMakeLists.txt
index 8ce0db3ba37..91c76f36b2e 100644
--- a/rostests/CMakeLists.txt
+++ b/rostests/CMakeLists.txt
@@ -3,7 +3,7 @@ add_subdirectory(apitests)
 #add_subdirectory(dibtests)
 #add_subdirectory(dxtest)
 #add_subdirectory(regtests)
-#add_subdirectory(rosautotest)
+add_subdirectory(rosautotest)
 #add_subdirectory(tests)
 #add_subdirectory(win32)
 add_subdirectory(winetests)
diff --git a/rostests/rosautotest/CMakeLists.txt b/rostests/rosautotest/CMakeLists.txt
new file mode 100644
index 00000000000..4daee7ce75d
--- /dev/null
+++ b/rostests/rosautotest/CMakeLists.txt
@@ -0,0 +1,27 @@
+
+set_unicode()
+set_cpp()
+
+list(APPEND SOURCE
+    CConfiguration.cpp
+    CFatalException.cpp
+    CInvalidParameterException.cpp
+    CJournaledTestList.cpp
+    CProcess.cpp
+    CSimpleException.cpp
+    CTest.cpp
+    CTestInfo.cpp
+    CTestList.cpp
+    CVirtualTestList.cpp
+    CWebService.cpp
+    CWineTest.cpp
+    main.cpp
+    shutdown.cpp
+    tools.cpp)
+
+add_executable(rosautotest ${SOURCE})
+
+target_link_libraries(rosautotest wine)
+
+set_module_type(rosautotest win32cui)
+add_importlibs(rosautotest advapi32 shell32 user32 wininet msvcrt kernel32 ntdll)
diff --git a/rostests/winetests/oleaut32/CMakeLists.txt b/rostests/winetests/oleaut32/CMakeLists.txt
index 8174f11ef98..5ec06a92ba3 100644
--- a/rostests/winetests/oleaut32/CMakeLists.txt
+++ b/rostests/winetests/oleaut32/CMakeLists.txt
@@ -5,10 +5,10 @@ add_definitions(
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-ADD_TYPELIB(oleaut32_typelibs test_reg.idl test_tlb.idl tmarshal.idl)
+add_typelib(oleaut32_typelibs test_reg.idl test_tlb.idl tmarshal.idl)
 add_dependencies(oleaut32_typelibs stdole2)
 
-ADD_INTERFACE_DEFINITIONS(oleaut32_idlheaders test_reg.idl tmarshal.idl)
+add_interface_definitions(oleaut32_idlheaders test_reg.idl tmarshal.idl)
 add_idl_interface(tmarshal.idl)
 
 list(APPEND SOURCE