diff --git a/s3tests/functional/test_s3.py b/s3tests/functional/test_s3.py
index 1fa0d40..7f1e22e 100644
--- a/s3tests/functional/test_s3.py
+++ b/s3tests/functional/test_s3.py
@@ -235,6 +235,14 @@ def test_bucket_list_delimiter_prefix():
 
     marker = validate_bucket_list(bucket, prefix, delim, '', 2, False, ['boo/bar'], ['boo/baz/'], None)
 
+@attr(resource='bucket')
+@attr(method='get')
+@attr(operation='list')
+@attr(assertion='prefix and delimiter handling when object ends with delimiter')
+def test_bucket_list_delimiter_prefix_ends_with_delimiter():
+    bucket = _create_keys(keys=['asdf/'])
+    validate_bucket_list(bucket, 'asdf/', '/', '', 1000, False, ['asdf/'], [], None)
+
 @attr(resource='bucket')
 @attr(method='get')
 @attr(operation='list')