diff --git a/Lib/test/output/test_StringIO b/Lib/test/output/test_StringIO
new file mode 100644
index 0000000..505023a
--- /dev/null
+++ b/Lib/test/output/test_StringIO
@@ -0,0 +1,9 @@
+test_StringIO
+abcdefghij
+klmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
+
+2
+abcdefghij
+klmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
+
+2
diff --git a/Lib/test/test_StringIO.py b/Lib/test/test_StringIO.py
new file mode 100644
index 0000000..6e321e9
--- /dev/null
+++ b/Lib/test/test_StringIO.py
@@ -0,0 +1,15 @@
+# Tests StringIO and cStringIO
+
+import string
+
+def do_test(module):
+    s = (string.letters+'\n')*5
+    f = module.StringIO(s)
+    print f.read(10)
+    print f.readline()
+    print len(f.readlines(60))
+
+# Don't bother testing cStringIO without
+import StringIO, cStringIO
+do_test(StringIO)
+do_test(cStringIO)