diff --git a/dlls/user/tests/.cvsignore b/dlls/user/tests/.cvsignore
index 8fc4c875ee..4a6e3c5ed2 100644
--- a/dlls/user/tests/.cvsignore
+++ b/dlls/user/tests/.cvsignore
@@ -11,5 +11,6 @@ resource.ok
 resource.res
 sysparams.ok
 testlist.c
+text.ok
 win.ok
 wsprintf.ok
diff --git a/dlls/user/tests/Makefile.in b/dlls/user/tests/Makefile.in
index eceb1cc74d..dfcc827fdd 100644
--- a/dlls/user/tests/Makefile.in
+++ b/dlls/user/tests/Makefile.in
@@ -16,6 +16,7 @@ CTESTS = \
 	msg.c \
 	resource.c \
 	sysparams.c \
+	text.c \
 	win.c \
 	wsprintf.c
 
diff --git a/dlls/user/tests/text.c b/dlls/user/tests/text.c
new file mode 100644
index 0000000000..fbc8246478
--- /dev/null
+++ b/dlls/user/tests/text.c
@@ -0,0 +1,114 @@
+/*
+ * DrawText tests
+ *
+ * Copyright (c) 2004 Zach Gorman
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ * USA
+ */
+
+#include <assert.h>
+
+#include "wine/test.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winerror.h"
+
+
+static void test_DrawTextCalcRect(void)
+{
+    HWND hwnd;
+    HDC hdc;
+    HFONT hFont, hOldFont;
+    LOGFONTA lf;
+    const char text[] = "Example text for testing DrawText in "
+      "MM_HIENGLISH mode";
+    INT len;
+    RECT rect = { 0, 0, 100, 0 };
+
+    /* Initialization */
+    hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP,
+                           0, 0, 200, 200, 0, 0, 0, NULL);
+    ok(hwnd != 0, "CreateWindowExA error %lu\n", GetLastError());
+    hdc = GetDC(hwnd);
+    ok(hdc != 0, "GetDC error %lu\n", GetLastError());
+    trace("hdc %p\n", hdc);
+    len = lstrlenA(text);
+
+    /* LOGFONT initialization */
+    memset(&lf, 0, sizeof(lf));
+    lf.lfCharSet = ANSI_CHARSET;
+    lf.lfClipPrecision = CLIP_DEFAULT_PRECIS;
+    lf.lfWeight = FW_DONTCARE;
+    lf.lfHeight = 0; /* mapping mode dependent */
+    lf.lfQuality = DEFAULT_QUALITY;
+    lstrcpyA(lf.lfFaceName, "Arial");
+
+    /* DrawText in MM_HIENGLISH with DT_CALCRECT */
+    SetMapMode(hdc, MM_HIENGLISH);
+    lf.lfHeight = 100 * 9 / 72; /* 9 point */
+    hFont = CreateFontIndirectA(&lf);
+    ok(hFont != 0, "CreateFontIndirectA error %lu\n",
+       GetLastError());
+    hOldFont = SelectObject(hdc, hFont);
+
+    ok(DrawTextA(hdc, text, len, &rect, DT_CALCRECT |
+       DT_EXTERNALLEADING | DT_WORDBREAK | DT_NOCLIP | DT_LEFT |
+       DT_NOPREFIX),"DrawTextA error %lu\n", GetLastError());
+
+    trace("MM_HIENGLISH rect.bottom %ld\n", rect.bottom);
+    todo_wine ok(rect.bottom < 0, "In MM_HIENGLISH, DrawText with "
+       "DT_CALCRECT should return a negative rectangle bottom. "
+       "(bot=%ld)\n", rect.bottom);
+
+    SelectObject(hdc, hOldFont);
+    ok(DeleteObject(hFont), "DeleteObject error %lu\n",
+       GetLastError());
+
+
+    /* DrawText in MM_TEXT with DT_CALCRECT */
+    SetMapMode(hdc, MM_TEXT);
+    lf.lfHeight = -MulDiv(9, GetDeviceCaps(hdc,
+       LOGPIXELSY), 72); /* 9 point */
+    hFont = CreateFontIndirectA(&lf);
+    ok(hFont != 0, "CreateFontIndirectA error %lu\n",
+       GetLastError());
+    hOldFont = SelectObject(hdc, hFont);
+
+    ok(DrawTextA(hdc, text, len, &rect, DT_CALCRECT |
+       DT_EXTERNALLEADING | DT_WORDBREAK | DT_NOCLIP | DT_LEFT |
+       DT_NOPREFIX),"DrawTextA error %lu\n", GetLastError());
+
+    trace("MM_TEXT rect.bottom %ld\n", rect.bottom);
+    ok(rect.bottom > 0, "In MM_TEXT, DrawText with DT_CALCRECT "
+       "should return a positive rectangle bottom. (bot=%ld)\n",
+       rect.bottom);
+
+    SelectObject(hdc, hOldFont);
+    ok(DeleteObject(hFont), "DeleteObject error %lu\n",
+       GetLastError());
+
+    /* Clean up */
+    ok(ReleaseDC(hwnd, hdc), "ReleaseDC error %lu\n",
+       GetLastError());
+    ok(DestroyWindow(hwnd), "DestroyWindow error %lu\n",
+       GetLastError());
+}
+
+START_TEST(text)
+{
+    test_DrawTextCalcRect();
+}