diff --git a/test/.gitignore b/test/.gitignore
index 4195acc81..35d467bbe 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -24,6 +24,7 @@ uri.t
 utf8.t
 util.t
 view.t
+width.t
 
 json_test
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3e009d749..c9a4bfb4e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories (${CMAKE_SOURCE_DIR}
 set (test_SRCS autocomplete.t color.t config.t date.t directory.t dom.t
                duration.t file.t i18n.t json.t list.t nibbler.t path.t rx.t
                t.t t2.t taskmod.t tdb2.t text.t uri.t utf8.t util.t view.t
-               json_test)
+               width.t json_test)
 
 message ("-- Configuring run_all")
 set (TESTBLOB "*.t")
diff --git a/test/width.t.cpp b/test/width.t.cpp
new file mode 100644
index 000000000..f6923026f
--- /dev/null
+++ b/test/width.t.cpp
@@ -0,0 +1,58 @@
+////////////////////////////////////////////////////////////////////////////////
+// taskwarrior - a command line task list manager.
+//
+// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+//
+// 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.
+//
+// http://www.opensource.org/licenses/mit-license.php
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <iostream>
+#include <text.h>
+#include <test.h>
+
+////////////////////////////////////////////////////////////////////////////////
+int main (int argc, char** argv)
+{
+  UnitTest t (16);
+
+  t.is (mk_wcwidth ('a'),    1, "U+0061 --> 1");
+
+  t.is (mk_wcwidth (0x5149), 2, "U+5149 --> 2");
+  t.is (mk_wcwidth (0x9a8c), 2, "U+9a8c --> 2");
+  t.is (mk_wcwidth (0x4e70), 2, "U+4e70 --> 2");
+  t.is (mk_wcwidth (0x94b1), 2, "U+94b1 --> 2");
+  t.is (mk_wcwidth (0x5305), 2, "U+5305 --> 2");
+  t.is (mk_wcwidth (0x91cd), 2, "U+91cd --> 2");
+  t.is (mk_wcwidth (0x65b0), 2, "U+65b0 --> 2");
+  t.is (mk_wcwidth (0x8bbe), 2, "U+8bbe --> 2");
+  t.is (mk_wcwidth (0x8ba1), 2, "U+8ba1 --> 2");
+  t.is (mk_wcwidth (0x5411), 2, "U+5411 --> 2");
+  t.is (mk_wcwidth (0x4e0a), 2, "U+4e0a --> 2");
+  t.is (mk_wcwidth (0x4e0b), 2, "U+4e0b --> 2");
+  t.is (mk_wcwidth (0x7bad), 2, "U+7bad --> 2");
+  t.is (mk_wcwidth (0x5934), 2, "U+5934 --> 2");
+  t.is (mk_wcwidth (0xff0c), 2, "U+ff0c --> 2"); // comma
+
+  return 0;
+}
+
+////////////////////////////////////////////////////////////////////////////////