diff --git a/tests/test_event_processor.py b/tests/test_event_processor.py
index af5723a0..3ef99fd8 100644
--- a/tests/test_event_processor.py
+++ b/tests/test_event_processor.py
@@ -40,12 +40,7 @@ def __eq__(self, other):
     if other is None:
       return False
 
-    return (self._experiment_id == other._experiment_id and
-                 self._variation_id == other._variation_id and
-                 self._event_name == other._event_name and
-                 self._visitor_id == other._visitor_id and
-                 self._attributes == other._attributes and
-                 self._tags == other._tags)
+    return self.__dict__ == other.__dict__
 
 
 class TestEventDispatcher(object):
diff --git a/tox.ini b/tox.ini
index 0d134f28..2c9c6f1c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,6 @@
 # E121 - continuation line indentation is not a multiple of four
 # E127 - continuation line over-indented for visual indent
 # E722 - do not use bare 'except'
-# W504 - line break after binary operator
-ignore = E111,E114,E121,E127,E722,W504
+ignore = E111,E114,E121,E127,E722
 exclude = optimizely/lib/pymmh3.py,*virtualenv*
 max-line-length = 120