diff --git a/rally/plugins/openstack/cleanup/resources.py b/rally/plugins/openstack/cleanup/resources.py
index 647c8564..2f5dac0c 100644
--- a/rally/plugins/openstack/cleanup/resources.py
+++ b/rally/plugins/openstack/cleanup/resources.py
@@ -154,8 +154,7 @@ _nova_order = get_order(200)
 class NovaServer(base.ResourceManager):
     def list(self):
         """List all servers."""
-        # FIX(boris-42): Use limit=-1 when it's fixed
-        return self._manager().list()
+        return self._manager().list(limit=-1)
 
     def delete(self):
         if getattr(self.raw_resource, "OS-EXT-STS:locked", False):
diff --git a/tests/unit/plugins/openstack/cleanup/test_resources.py b/tests/unit/plugins/openstack/cleanup/test_resources.py
index 29e2ac51..4a934186 100644
--- a/tests/unit/plugins/openstack/cleanup/test_resources.py
+++ b/tests/unit/plugins/openstack/cleanup/test_resources.py
@@ -84,7 +84,7 @@ class NovaServerTestCase(test.TestCase):
 
         server.list()
 
-        server._manager.return_value.list.assert_called_once_with()
+        server._manager.return_value.list.assert_called_once_with(limit=-1)
 
     def test_delete(self):
         server = resources.NovaServer()