diff --git a/test/unittest/CMakeLists.txt b/test/unittest/CMakeLists.txt
index 326e6de..3c49651 100644
--- a/test/unittest/CMakeLists.txt
+++ b/test/unittest/CMakeLists.txt
@@ -6,6 +6,7 @@ set(UNITTEST_SOURCES
     filestreamtest.cpp
     jsoncheckertest.cpp
     namespacetest.cpp
+    prettywritertest.cpp
     readertest.cpp
     stringbuffertest.cpp
     strtodtest.cpp
diff --git a/test/unittest/prettywritertest.cpp b/test/unittest/prettywritertest.cpp
new file mode 100644
index 0000000..c37f76e
--- /dev/null
+++ b/test/unittest/prettywritertest.cpp
@@ -0,0 +1,73 @@
+// Copyright (C) 2011 Milo Yip
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+#include "unittest.h"
+#include "rapidjson/reader.h"
+#include "rapidjson/prettywriter.h"
+#include "rapidjson/stringbuffer.h"
+
+using namespace rapidjson;
+
+static const char kJson[] = "{\"hello\":\"world\",\"t\":true,\"f\":false,\"n\":null,\"i\":123,\"pi\":3.1416,\"a\":[1,2,3]}";
+
+TEST(PrettyWriter, Basic) {
+    StringBuffer buffer;
+    PrettyWriter<StringBuffer> writer(buffer);
+    Reader reader;
+    reader.Parse(StringStream(kJson), writer);
+    EXPECT_STREQ(
+        "{\n"
+        "    \"hello\": \"world\",\n"
+        "    \"t\": true,\n"
+        "    \"f\": false,\n"
+        "    \"n\": null,\n"
+        "    \"i\": 123,\n"
+        "    \"pi\": 3.1416,\n"
+        "    \"a\": [\n"
+        "        1,\n"
+        "        2,\n"
+        "        3\n"
+        "    ]\n"
+        "}",
+        buffer.GetString());
+}
+
+TEST(PrettyWriter, SetIndent) {
+    StringBuffer buffer;
+    PrettyWriter<StringBuffer> writer(buffer);
+    writer.SetIndent('\t', 1);
+    Reader reader;
+    reader.Parse(StringStream(kJson), writer);
+    EXPECT_STREQ(
+        "{\n"
+        "\t\"hello\": \"world\",\n"
+        "\t\"t\": true,\n"
+        "\t\"f\": false,\n"
+        "\t\"n\": null,\n"
+        "\t\"i\": 123,\n"
+        "\t\"pi\": 3.1416,\n"
+        "\t\"a\": [\n"
+        "\t\t1,\n"
+        "\t\t2,\n"
+        "\t\t3\n"
+        "\t]\n"
+        "}",
+        buffer.GetString());
+}