diff --git a/build-resources/src/main/resources/checkstyle/checkstyle.xml b/build-resources/src/main/resources/checkstyle/checkstyle.xml
index 161e8036e31..a4922188a7f 100644
--- a/build-resources/src/main/resources/checkstyle/checkstyle.xml
+++ b/build-resources/src/main/resources/checkstyle/checkstyle.xml
@@ -41,6 +41,11 @@
     <property name="message" value="Two or more consecutive empty lines"/>
   </module>
 
+  <module name="LineLength">
+    <property name="max" value="160"/>
+    <property name="ignorePattern" value="a href|href|http://|https://"/>
+  </module>
+
   <module name="TreeWalker">
 
     <module name="PackageDeclaration"/>
@@ -88,10 +93,6 @@
     <module name="AvoidStarImport"/>
     <module name="GenericWhitespace"/>
     <module name="ExplicitInitialization"/>
-    <module name="LineLength">
-      <property name="max" value="160"/>
-      <property name="ignorePattern" value="a href|href|http://|https://"/>
-    </module>
 
     <module name="IllegalImport">
       <property name="illegalPkgs" value="junit.framework"/>
diff --git a/community/collections/src/test/java/org/neo4j/helpers/collection/TestCommonIterators.java b/community/collections/src/test/java/org/neo4j/helpers/collection/TestCommonIterators.java
index 63a335cb082..a1ec51a4e56 100644
--- a/community/collections/src/test/java/org/neo4j/helpers/collection/TestCommonIterators.java
+++ b/community/collections/src/test/java/org/neo4j/helpers/collection/TestCommonIterators.java
@@ -87,7 +87,9 @@ public void testCachingIterator()
             fail( "Should throw exception" );
         }
         catch ( NoSuchElementException e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
 
         try
         {
@@ -95,7 +97,9 @@ public void testCachingIterator()
             fail( "Should throw exception" );
         }
         catch ( NoSuchElementException e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
 
         // Next and previous
         assertEquals( 0, caching.position() );
@@ -130,7 +134,9 @@ public void testCachingIterator()
             fail( "Shouldn't be able to set a lower value than 0" );
         }
         catch ( IllegalArgumentException e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
         assertEquals( (Integer) 0, caching.current() );
         assertEquals( 0, caching.position( 3 ) );
         try
@@ -139,7 +145,9 @@ public void testCachingIterator()
             fail( "Shouldn't be able to call current() after a call to position(int)" );
         }
         catch ( NoSuchElementException e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
         assertTrue( caching.hasNext() );
         assertEquals( (Integer) 3, caching.next() );
         assertEquals( (Integer) 3, caching.current() );
@@ -158,7 +166,9 @@ public void testCachingIterator()
             fail( "Shouldn't be able to set a position which is too big" );
         }
         catch ( NoSuchElementException e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
         assertEquals( 3, caching.position( 8 ) );
         assertTrue( caching.hasPrevious() );
         assertFalse( caching.hasNext() );
@@ -168,7 +178,9 @@ public void testCachingIterator()
             fail( "Shouldn't be able to go beyond last item" );
         }
         catch ( NoSuchElementException e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
         assertEquals( 8, caching.position() );
         assertEquals( (Integer) 7, caching.previous() );
         assertEquals( (Integer) 6, caching.previous() );
@@ -228,7 +240,9 @@ public void testFirstElement()
             fail( "Should fail" );
         }
         catch ( NoSuchElementException e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
 
         // first Iterator
         assertEquals( object, Iterators.first( Arrays.asList( object, object2 ).iterator() ) );
@@ -239,7 +253,9 @@ public void testFirstElement()
             fail( "Should fail" );
         }
         catch ( NoSuchElementException e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
 
         // firstOrNull Iterable
         assertEquals( object, Iterables.firstOrNull( Arrays.asList( object, object2 ) ) );
@@ -267,7 +283,9 @@ public void testLastElement()
             fail( "Should fail" );
         }
         catch ( NoSuchElementException e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
 
         // last Iterator
         assertEquals( object2, Iterators.last( Arrays.asList( object, object2 ).iterator() ) );
@@ -278,7 +296,9 @@ public void testLastElement()
             fail( "Should fail" );
         }
         catch ( NoSuchElementException e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
 
         // lastOrNull Iterable
         assertEquals( object2, Iterables.lastOrNull( Arrays.asList( object, object2 ) ) );
@@ -305,14 +325,18 @@ public void testSingleElement()
             fail( "Should fail" );
         }
         catch ( Exception e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
         try
         {
             Iterables.single( Arrays.asList( object, object2 ) );
             fail( "Should fail" );
         }
         catch ( Exception e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
 
         // single Iterator
         assertEquals( object, Iterators.single( Arrays.asList( object ).iterator() ) );
@@ -322,14 +346,18 @@ public void testSingleElement()
             fail( "Should fail" );
         }
         catch ( Exception e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
         try
         {
             Iterators.single( Arrays.asList( object, object2 ).iterator() );
             fail( "Should fail" );
         }
         catch ( Exception e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
 
         // singleOrNull Iterable
         assertEquals( object, Iterables.singleOrNull( Arrays.asList( object ) ) );
@@ -340,7 +368,9 @@ public void testSingleElement()
             fail( "Should fail" );
         }
         catch ( Exception e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
 
         // singleOrNull Iterator
         assertEquals( object, Iterators.singleOrNull( Arrays.asList( object ).iterator() ) );
@@ -351,7 +381,9 @@ public void testSingleElement()
             fail( "Should fail" );
         }
         catch ( Exception e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
     }
 
     @Test
diff --git a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/TestLuceneIndex.java b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/TestLuceneIndex.java
index c4568ddd2b8..7a16ec92872 100644
--- a/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/TestLuceneIndex.java
+++ b/community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/explicit/TestLuceneIndex.java
@@ -1262,14 +1262,18 @@ public void makeSureConfigurationCanBeModified()
             fail( "Shouldn't be able to modify provider" );
         }
         catch ( IllegalArgumentException e )
-        { /* Good*/ }
+        {
+            /* Good*/
+        }
         try
         {
             graphDb.index().removeConfiguration( index, IndexManager.PROVIDER );
             fail( "Shouldn't be able to modify provider" );
         }
         catch ( IllegalArgumentException e )
-        { /* Good*/ }
+        {
+            /* Good*/
+        }
 
         String key = "my-key";
         String value = "my-value";
@@ -1295,7 +1299,9 @@ public void makeSureSlightDifferencesInIndexConfigCanBeSupplied()
             fail( "Shouldn't be able to get index with these kinds of differences in config" );
         }
         catch ( IllegalArgumentException e )
-        { /* */ }
+        {
+            /* */
+        }
         nodeIndex( name, MapUtil.stringMap( new HashMap<>( config ), "whatever", "something" ) );
     }
 
diff --git a/enterprise/com/src/test/java/org/neo4j/com/CommunicationIT.java b/enterprise/com/src/test/java/org/neo4j/com/CommunicationIT.java
index 98c6070757e..7d89869b426 100644
--- a/enterprise/com/src/test/java/org/neo4j/com/CommunicationIT.java
+++ b/enterprise/com/src/test/java/org/neo4j/com/CommunicationIT.java
@@ -224,7 +224,9 @@ public void applicationProtocolVersionsMustMatch()
             fail( "Shouldn't be able to communicate with different application protocol versions" );
         }
         catch ( IllegalProtocolVersionException e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
     }
 
     @Test
@@ -243,7 +245,9 @@ public void applicationProtocolVersionsMustMatchMultiJvm()
             fail( "Shouldn't be able to communicate with different application protocol versions" );
         }
         catch ( IllegalProtocolVersionException e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
 
         server.shutdown();
     }
@@ -261,7 +265,9 @@ public void internalProtocolVersionsMustMatch()
             fail( "Shouldn't be able to communicate with different application protocol versions" );
         }
         catch ( IllegalProtocolVersionException e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
     }
 
     @Test
@@ -279,7 +285,9 @@ public void internalProtocolVersionsMustMatchMultiJvm()
             fail( "Shouldn't be able to communicate with different application protocol versions" );
         }
         catch ( IllegalProtocolVersionException e )
-        { /* Good */ }
+        {
+            /* Good */
+        }
 
         server.shutdown();
     }
diff --git a/pom.xml b/pom.xml
index 8dad42a3b4a..be383182e35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -743,7 +743,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>8.8</version>
+                        <version>8.29</version>
                     </dependency>
                 </dependencies>
                 <executions>