diff --git a/dlls/gdiplus/tests/Makefile.in b/dlls/gdiplus/tests/Makefile.in
index 8f0904c2b76..28b29590b16 100644
--- a/dlls/gdiplus/tests/Makefile.in
+++ b/dlls/gdiplus/tests/Makefile.in
@@ -12,7 +12,8 @@ CTESTS = \
 	graphicspath.c \
 	image.c \
 	matrix.c \
-	pen.c
+	pen.c \
+	stringformat.c
 
 @MAKE_TEST_RULES@
 
diff --git a/dlls/gdiplus/tests/stringformat.c b/dlls/gdiplus/tests/stringformat.c
new file mode 100644
index 00000000000..65bec8385e9
--- /dev/null
+++ b/dlls/gdiplus/tests/stringformat.c
@@ -0,0 +1,68 @@
+/*
+ * Unit test suite for string format
+ *
+ * Copyright (C) 2007 Google (Evan Stade)
+ *
+ * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "windows.h"
+#include "gdiplus.h"
+#include "wine/test.h"
+
+#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got)
+
+static void test_constructor(void)
+{
+    GpStringFormat *format;
+    GpStatus stat;
+    INT n;
+    StringAlignment align, valign;
+    StringTrimming trimming;
+
+    stat = GdipCreateStringFormat(0, 0, &format);
+    expect(Ok, stat);
+
+    GdipGetStringFormatAlign(format, &align);
+    GdipGetStringFormatLineAlign(format, &valign);
+    GdipGetStringFormatHotkeyPrefix(format, &n);
+    GdipGetStringFormatTrimming(format, &trimming);
+
+    expect(HotkeyPrefixNone, n);
+    expect(StringAlignmentNear, align);
+    expect(StringAlignmentNear, align);
+    todo_wine
+        expect(StringTrimmingCharacter, trimming);
+
+    stat = GdipDeleteStringFormat(format);
+    expect(Ok, stat);
+}
+
+START_TEST(stringformat)
+{
+    struct GdiplusStartupInput gdiplusStartupInput;
+    ULONG_PTR gdiplusToken;
+
+    gdiplusStartupInput.GdiplusVersion              = 1;
+    gdiplusStartupInput.DebugEventCallback          = NULL;
+    gdiplusStartupInput.SuppressBackgroundThread    = 0;
+    gdiplusStartupInput.SuppressExternalCodecs      = 0;
+
+    GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL);
+
+    test_constructor();
+
+    GdiplusShutdown(gdiplusToken);
+}