diff --git a/s3tests_boto3/functional/test_s3.py b/s3tests_boto3/functional/test_s3.py
index 68029a0..96bdc4b 100644
--- a/s3tests_boto3/functional/test_s3.py
+++ b/s3tests_boto3/functional/test_s3.py
@@ -2035,12 +2035,20 @@ def test_multi_object_delete_key_limit():
     bucket_name = _create_objects(keys=key_names)
     client = get_client()
 
+    paginator = client.get_paginator('list_objects')
+    pages = paginator.paginate(Bucket=bucket_name)
+    numKeys = 0
+    for page in pages:
+        numKeys += len(page['Contents'])
+    
     response = client.list_objects(Bucket=bucket_name)
-    eq(len(response['Contents']), 1001)
+    eq(numKeys, 1001)
 
     objs_dict = _make_objs_dict(key_names=key_names)
     e = assert_raises(ClientError,client.delete_objects,Bucket=bucket_name,Delete=objs_dict)
-    eq(e.response['Error']['Code'], 400)
+
+    status, error_code = _get_status_and_error_code(e.response)
+    eq(status, 400)
 
 @attr(resource='object')
 @attr(method='put')