diff --git a/Lib/test/test_gzip.py b/Lib/test/test_gzip.py
index 3ea2ba9bc39..2366d0268d1 100644
--- a/Lib/test/test_gzip.py
+++ b/Lib/test/test_gzip.py
@@ -16,15 +16,39 @@
 /* See http://www.winimage.com/zLibDll for Windows */
 """
 
-f = gzip.GzipFile(filename, 'wb') ; f.write(data1) ; f.close()
+f = gzip.GzipFile(filename, 'wb') ; f.write(data1 * 50) ; f.close()
 
 f = gzip.GzipFile(filename, 'rb') ; d = f.read() ; f.close()
-assert d == data1
+assert d == data1*50
 
 # Append to the previous file
-f = gzip.GzipFile(filename, 'ab') ; f.write(data2) ; f.close()
+f = gzip.GzipFile(filename, 'ab') ; f.write(data2 * 15) ; f.close()
 
 f = gzip.GzipFile(filename, 'rb') ; d = f.read() ; f.close()
-assert d == data1+data2
+assert d == (data1*50) + (data2*15)
+
+# Try .readline() with varying line lengths
+
+f = gzip.GzipFile(filename, 'rb')
+line_length = 0
+while 1:
+    L = f.readline( line_length )
+    if L == "" and line_length != 0: break
+    assert len(L) <= line_length
+    line_length = (line_length + 1) % 50
+f.close()
+
+# Try .readlines() 
+
+f = gzip.GzipFile(filename, 'rb')
+L = f.readlines()
+f.close()
+
+f = gzip.GzipFile(filename, 'rb')
+while 1:
+    L = f.readlines(150)
+    if L == []: break    
+f.close()
+
 
 os.unlink( filename )