diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py
index 57c6087..0040e43 100644
--- a/s3tests/functional/test_s3.py
+++ b/s3tests/functional/test_s3.py
@@ -997,6 +997,18 @@ def test_multi_object_delete():
         eq(len(result.errors), 0)
         eq(len(bucket.get_all_keys()), 0)
 
+@attr(resource='object')
+@attr(method='put')
+@attr(operation='write zero-byte key')
+@attr(assertion='correct content length')
+def test_object_head_zero_bytes():
+    bucket = get_new_bucket()
+    key = bucket.new_key('foo')
+    key.set_contents_from_string('')
+
+    key2 = bucket.get_key('foo')
+    eq(key2.content_length, '0')
+
 @attr(resource='object')
 @attr(method='put')
 @attr(operation='write key')