diff --git a/drivers/kmtest/CMakeLists.txt b/drivers/kmtest/CMakeLists.txt
index cfd7515f1a1..3eae4fa9e08 100644
--- a/drivers/kmtest/CMakeLists.txt
+++ b/drivers/kmtest/CMakeLists.txt
@@ -13,14 +13,13 @@ list(APPEND KMTEST_SOURCE
     ntos_fsrtl.c
     kmtest.rc)
 
-add_library(kmtest SHARED ${KMTEST_SOURCE})
+add_library(kmtest_old SHARED ${KMTEST_SOURCE})
 
-set_module_type(kmtest kernelmodedriver)
-target_link_libraries(kmtest ${PSEH_LIB})
-add_importlibs(kmtest ntoskrnl hal)
+set_module_type(kmtest_old kernelmodedriver)
+target_link_libraries(kmtest_old ${PSEH_LIB})
+add_importlibs(kmtest_old ntoskrnl hal)
 
-add_minicd_target(kmtest reactos kmtest.sys)
-add_livecd_target(kmtest reactos/system32/drivers)
+add_cd_file(TARGET kmtest_old DESTINATION reactos/system32/drivers FOR all)
 
 
 add_library(kmtestassist SHARED kmtestassist.c)
@@ -28,5 +27,4 @@ add_library(kmtestassist SHARED kmtestassist.c)
 set_module_type(kmtestassist kernelmodedriver)
 add_importlibs(kmtestassist ntoskrnl hal)
 
-add_minicd_target(kmtestassist reactos kmtestassist.sys)
-add_livecd_target(kmtestassist reactos/system32/drivers)
+add_cd_file(TARGET kmtestassist DESTINATION reactos/system32/drivers FOR all)
diff --git a/drivers/kmtest/kmtest.rbuild b/drivers/kmtest/kmtest.rbuild
index a569a76905e..1ef7e3d405b 100644
--- a/drivers/kmtest/kmtest.rbuild
+++ b/drivers/kmtest/kmtest.rbuild
@@ -1,4 +1,4 @@
-<module name="kmtest" type="kernelmodedriver" installbase="system32/drivers" installname="kmtest.sys">
+<module name="kmtest_old" type="kernelmodedriver" installbase="system32/drivers" installname="kmtest_old.sys">
 	<bootstrap base="$(CDOUTPUT)" />
 	<include base="ReactOS">include/reactos/drivers</include>
 	<library>ntoskrnl</library>
diff --git a/win32/kmtloader/CMakeLists.txt b/win32/kmtloader/CMakeLists.txt
index a42458b131d..4eec43d938d 100644
--- a/win32/kmtloader/CMakeLists.txt
+++ b/win32/kmtloader/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_executable(kmtloader kmtloader.c)
 set_module_type(kmtloader win32cui)
 add_importlibs(kmtloader msvcrt kernel32 advapi32)
-add_cab_target(kmtloader 7)
+add_cd_file(TARGET kmtloader DESTINATION reactos/bin FOR all)