diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h
index 430630e2d28..53fe6079a30 100644
--- a/base/setup/lib/muifonts.h
+++ b/base/setup/lib/muifonts.h
@@ -17,8 +17,8 @@ MUI_SUBFONT LatinFonts[] =
     { L"Fixedsys",               L"Fixedsys Excelsior 3.01-L2" },
     { L"Helv",                   L"MS Sans Serif" },
     { L"Helvetica",              L"Arial" },
-    { L"MS Sans Serif",          L"Tahoma" },
-    { L"MS Shell Dlg",           L"Tahoma" },
+    { L"MS Sans Serif",          L"Microsoft Sans Serif" },
+    { L"MS Shell Dlg",           L"Microsoft Sans Serif" },
     { L"MS Shell Dlg 2",         L"Tahoma" },
     { L"Segoe UI Symbol",        L"Arial" },
     { L"System",                 L"FreeSans" },
diff --git a/media/inf/font.inf b/media/inf/font.inf
index 817e394fe79..63071ee9a99 100644
--- a/media/inf/font.inf
+++ b/media/inf/font.inf
@@ -28,8 +28,8 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"MS Sans Serif"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Microsoft Sans Serif"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Microsoft Sans Serif"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console"
diff --git a/modules/rostests/winetests/gdi32/font.c b/modules/rostests/winetests/gdi32/font.c
index da0027c9cfa..7fe58bafdaa 100644
--- a/modules/rostests/winetests/gdi32/font.c
+++ b/modules/rostests/winetests/gdi32/font.c
@@ -919,6 +919,11 @@ static void test_bitmap_font_metrics(void)
 
     trace("system language id %04x\n", system_lang_id);
 
+#ifdef __REACTOS__
+    skip("ReactOS does not support bitmap (raster) fonts at this time\n");
+    return;
+#endif
+
     expected_cs = GetACP();
     if (!TranslateCharsetInfo(ULongToPtr(expected_cs), &csi, TCI_SRCCODEPAGE))
     {