diff --git a/rostests/winetests/comctl32/mru.c b/rostests/winetests/comctl32/mru.c
index df3ef8951cb..8ef1617503d 100644
--- a/rostests/winetests/comctl32/mru.c
+++ b/rostests/winetests/comctl32/mru.c
@@ -418,10 +418,6 @@ START_TEST(mru)
 {
     hComctl32 = GetModuleHandleA("comctl32.dll");
 
-    /* The registry usage here crashes the system because of broken Cm -- remove this when Cm gets fixed */
-    skip("ROS-HACK: Skipping mru tests -- Cm is broken\n");
-    return;
-
     delete_reg_entries();
     if (!create_reg_entries())
         return;
diff --git a/rostests/winetests/msi/install.c b/rostests/winetests/msi/install.c
index 49cb0deffa6..8fa729a0833 100644
--- a/rostests/winetests/msi/install.c
+++ b/rostests/winetests/msi/install.c
@@ -4561,9 +4561,6 @@ START_TEST(install)
 {
     DWORD len;
     char temp_path[MAX_PATH], prev_path[MAX_PATH];
-    
-    skip("ROS-HACK: Skipping install tests -- Cm sucks\n");
-    return;
 
     init_functionpointers();
 
diff --git a/rostests/winetests/msi/msi.c b/rostests/winetests/msi/msi.c
index 1096d19045d..143c2bdeefe 100644
--- a/rostests/winetests/msi/msi.c
+++ b/rostests/winetests/msi/msi.c
@@ -6903,8 +6903,6 @@ static void test_MsiGetUserInfo(void)
 
 START_TEST(msi)
 {
-    skip("ROS-HACK: Skipping msi tests -- Cm sucks\n");
-    return;
 
     init_functionpointers();
 
diff --git a/rostests/winetests/msi/roshack.diff b/rostests/winetests/msi/roshack.diff
deleted file mode 100644
index 54b5dc250a2..00000000000
--- a/rostests/winetests/msi/roshack.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: install.c
-===================================================================
---- install.c	(revision 38229)
-+++ install.c	(working copy)
-@@ -4561,6 +4561,9 @@
- {
-     DWORD len;
-     char temp_path[MAX_PATH], prev_path[MAX_PATH];
-+    
-+    skip("ROS-HACK: Skipping install tests -- Cm sucks\n");
-+    return;
- 
-     init_functionpointers();
- 
-Index: msi.c
-===================================================================
---- msi.c	(revision 38229)
-+++ msi.c	(working copy)
-@@ -6903,6 +6903,9 @@
- 
- START_TEST(msi)
- {
-+    skip("ROS-HACK: Skipping msi tests -- Cm sucks\n");
-+    return;
-+
-     init_functionpointers();
- 
-     test_usefeature();
diff --git a/rostests/winetests/shell32/roshack.diff b/rostests/winetests/shell32/roshack.diff
index 4e194dbd721..edd2b1bb41f 100644
--- a/rostests/winetests/shell32/roshack.diff
+++ b/rostests/winetests/shell32/roshack.diff
@@ -19,7 +19,7 @@ Index: systray.c
      RECT rc;
      HMODULE huser32, hshell32;
  
-+    skip("Skipping systray tests\n");
++    skip("ROS-HACK: Skipping systray tests\n");
 +    return;
 +
      hshell32 = GetModuleHandleA("shell32.dll");
diff --git a/rostests/winetests/shell32/systray.c b/rostests/winetests/shell32/systray.c
index 4eb1a5d4714..8ec73e52dca 100644
--- a/rostests/winetests/shell32/systray.c
+++ b/rostests/winetests/shell32/systray.c
@@ -138,7 +138,7 @@ START_TEST(systray)
     RECT rc;
     HMODULE huser32, hshell32;
 
-    skip("Skipping systray tests\n");
+    skip("ROS-HACK: Skipping systray tests\n");
     return;
 
     hshell32 = GetModuleHandleA("shell32.dll");