diff --git a/watcher/tests/api/v1/test_audits.py b/watcher/tests/api/v1/test_audits.py
index 505923593..c7506d044 100644
--- a/watcher/tests/api/v1/test_audits.py
+++ b/watcher/tests/api/v1/test_audits.py
@@ -701,8 +701,10 @@ class TestPost(api_base.FunctionalTest):
         response = self.post_json('/audits', audit_dict, expect_errors=True)
         self.assertEqual('application/json', response.content_type)
         self.assertEqual(HTTPStatus.INTERNAL_SERVER_ERROR, response.status_int)
-        expected_error_msg = ('Exactly 5 or 6 columns has to be '
-                              'specified for iterator expression.')
+        # NOTE(dviroel): this error message check was shortened to try avoid
+        # future breakages. See bug #2089866 for more details.
+        expected_error_msg = ('columns has to be specified for iterator '
+                              'expression.')
         self.assertTrue(response.json['error_message'])
         self.assertIn(expected_error_msg, response.json['error_message'])