diff --git a/.pylintrc b/.pylintrc
index f0f5b9c4d..cae643118 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -175,7 +175,6 @@ disable=print-statement,
         E1120,
         R0904,
         R0916,
-        R1707,
         R1722,
         W0104,
         W0105,
diff --git a/esrally/metrics.py b/esrally/metrics.py
index c360a3950..c5f0a3b3a 100644
--- a/esrally/metrics.py
+++ b/esrally/metrics.py
@@ -317,7 +317,7 @@ def extract_user_tags_from_string(user_tags):
 
 
 class SampleType(IntEnum):
-    Warmup = 0,
+    Warmup = 0
     Normal = 1
 
 
diff --git a/esrally/track/params.py b/esrally/track/params.py
index 3e273f350..e9996c446 100644
--- a/esrally/track/params.py
+++ b/esrally/track/params.py
@@ -425,8 +425,8 @@ class IndexIdConflict(Enum):
 
     Note that this assumes that each document in the benchmark corpus has an id between [1, size_of(corpus)]
     """
-    NoConflicts = 0,
-    SequentialConflicts = 1,
+    NoConflicts = 0
+    SequentialConflicts = 1
     RandomConflicts = 2