diff --git a/build.gradle b/build.gradle
index 2fd3844f83..780fad1c04 100644
--- a/build.gradle
+++ b/build.gradle
@@ -187,6 +187,10 @@ subprojects {
         }
     }
 
+    tasks.withType(Test) {
+        maxParallelForks = 2
+    }
+
     checkstyle {
         toolVersion '10.3.4'
         maxWarnings getIntProperty('maxCheckstyleWarnings', Integer.MAX_VALUE)
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
index 91465ba4ee..291a13965b 100644
--- a/config/checkstyle/suppressions.xml
+++ b/config/checkstyle/suppressions.xml
@@ -39,7 +39,7 @@
 
     <!-- Build dirs -->
     <suppress checks="[a-zA-Z0-9]*"
-              files="[/\\]build[/\\]generated[/\\]java[/\\]" />
+              files="[/\\]build[/\\]generated[/\\]" />
 
     <!-- Classes repackaged from external libraries -->
     <suppress checks="[a-zA-Z0-9]*"
diff --git a/gradle.properties b/gradle.properties
index 0ebd6040d8..d77cf222d5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,2 @@
-org.gradle.jvmargs=-Xmx512m -XX:MaxPermSize=1024m
\ No newline at end of file
+org.gradle.jvmargs=-Xmx512m -XX:MaxPermSize=1024m
+org.gradle.parallel=true
diff --git a/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/HermesSenderTest.groovy b/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/HermesSenderTest.groovy
index adb02d929a..59ec778b29 100644
--- a/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/HermesSenderTest.groovy
+++ b/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/HermesSenderTest.groovy
@@ -22,13 +22,14 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalTo
 import static com.github.tomakehurst.wiremock.client.WireMock.post
 import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig
 import static pl.allegro.tech.hermes.client.HermesMessage.hermesMessage
 
 class HermesSenderTest extends Specification {
 
     @ClassRule
     @Shared
-    WireMockClassRule service = new WireMockClassRule(14523)
+    WireMockClassRule service = new WireMockClassRule(wireMockConfig().dynamicPort().dynamicHttpsPort())
 
     void setup() {
         WireMock.reset()
diff --git a/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/ReactiveHermesSenderTest.groovy b/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/ReactiveHermesSenderTest.groovy
index ababc27180..7b8a709ab3 100644
--- a/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/ReactiveHermesSenderTest.groovy
+++ b/hermes-client/src/test/groovy/pl/allegro/tech/hermes/client/ReactiveHermesSenderTest.groovy
@@ -15,13 +15,14 @@ import static com.github.tomakehurst.wiremock.client.WireMock.equalTo
 import static com.github.tomakehurst.wiremock.client.WireMock.post
 import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig
 import static pl.allegro.tech.hermes.client.HermesMessage.hermesMessage
 
 class ReactiveHermesSenderTest extends Specification {
 
     @ClassRule
     @Shared
-    WireMockClassRule service = new WireMockClassRule(14523)
+    WireMockClassRule service = new WireMockClassRule(wireMockConfig().dynamicPort().dynamicHttpsPort())
 
     void setup() {
         WireMock.reset()
diff --git a/hermes-common/src/test/groovy/pl/allegro/tech/hermes/test/IntegrationTest.groovy b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/test/IntegrationTest.groovy
index 958d5a429d..46eafacfd6 100644
--- a/hermes-common/src/test/groovy/pl/allegro/tech/hermes/test/IntegrationTest.groovy
+++ b/hermes-common/src/test/groovy/pl/allegro/tech/hermes/test/IntegrationTest.groovy
@@ -20,7 +20,7 @@ abstract class IntegrationTest extends Specification {
 
     @ClassRule
     @Shared
-    ZookeeperResource zookeeperResource = new ZookeeperResource(42182, true, { starter ->
+    ZookeeperResource zookeeperResource = new ZookeeperResource(-1, true, { starter ->
         starter.curator().create().creatingParentsIfNeeded().forPath("/hermes/groups")
     } as Consumer)
 
diff --git a/hermes-consumers/build.gradle b/hermes-consumers/build.gradle
index c34ef1eac4..b7bb0f539a 100644
--- a/hermes-consumers/build.gradle
+++ b/hermes-consumers/build.gradle
@@ -48,28 +48,37 @@ dependencies {
     sbeClasspath group: 'uk.co.real-logic', name: 'sbe-all', version: '1.12.8'
 }
 
-def generatedPath = "${buildDir}/generated/java/"
+def generatedPathMaxRate = "${buildDir}/generated/maxrate/java/"
+def generatedPathWorkload = "${buildDir}/generated/workload/java/"
 
 task generateMaxRateSbeStubs(type: JavaExec) {
+    def input = 'src/main/resources/sbe/max-rate.xml'
+    inputs.file input
+    outputs.dir generatedPathMaxRate
+    outputs.cacheIf { true }
     description = "Generate SBE stubs for max-rate"
     classpath configurations.sbeClasspath
     main = 'uk.co.real_logic.sbe.SbeTool'
     systemProperties(
-            'sbe.output.dir': generatedPath,
+            'sbe.output.dir': generatedPathMaxRate,
             'sbe.xinclude.aware': 'true'
     )
-    args = ['src/main/resources/sbe/max-rate.xml']
+    args = [input]
 }
 
 task generateWorkloadSbeStubs(type: JavaExec) {
+    def input = 'src/main/resources/sbe/workload.xml'
+    inputs.file input
+    outputs.dir generatedPathWorkload
+    outputs.cacheIf { true }
     description = "Generate SBE stubs for workload"
     classpath configurations.sbeClasspath
     main = 'uk.co.real_logic.sbe.SbeTool'
     systemProperties(
-            'sbe.output.dir': generatedPath,
+            'sbe.output.dir': generatedPathWorkload,
             'sbe.xinclude.aware': 'true'
     )
-    args = ['src/main/resources/sbe/workload.xml']
+    args = [input]
 }
 
 task generateSbeStubs(type: DefaultTask) {
@@ -79,7 +88,7 @@ task generateSbeStubs(type: DefaultTask) {
 
 sourceSets {
     main {
-        java.srcDir generatedPath
+        java.srcDirs([generatedPathMaxRate, generatedPathWorkload])
     }
 }
 
diff --git a/hermes-management/build.gradle b/hermes-management/build.gradle
index 3527f6fe75..221bb6cdc0 100644
--- a/hermes-management/build.gradle
+++ b/hermes-management/build.gradle
@@ -43,22 +43,29 @@ dependencies {
     testCompile group: 'org.testcontainers', name: 'kafka', version: versions.testcontainers
 }
 
+def consoleDir = "${buildDir}/generated/console"
+
 task buildHermesConsole(type: Exec) {
-    workingDir '../hermes-console'
+    def dir = '../hermes-console'
+    workingDir dir
+    outputs.dir(dir + "/dist")
+    inputs.dir(dir + "/static")
     commandLine './package.sh'
 }
 
-task attachHermesConsole(type: Copy, dependsOn: 'buildHermesConsole') {
-    from '../hermes-console/dist/static'
-    into(sourceSets.main.output.resourcesDir.path + '/static')
-}
-
-tasks.register('prepareIndexTemplate') {
+task attachHermesConsole(type: Copy) {
+    def targetDir = consoleDir
+    from tasks.named('buildHermesConsole')
+    into targetDir
+    include("static/**")
     doLast {
-        def indexPath = sourceSets.main.output.resourcesDir.path + '/static/index.html'
-        ant.move file: indexPath,
-                tofile: indexPath + '.ftl'
+        ant.move file: targetDir + '/static/index.html',
+            tofile: targetDir + '/static/index.html.ftl'
     }
 }
 
-jar.dependsOn(attachHermesConsole, 'prepareIndexTemplate')
+sourceSets {
+    main {
+        resources.srcDir consoleDir
+    }
+}
diff --git a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperBaseTest.java b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperBaseTest.java
index 648fb90aaa..feb5760c47 100644
--- a/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperBaseTest.java
+++ b/hermes-test-helper/src/main/java/pl/allegro/tech/hermes/test/helper/zookeeper/ZookeeperBaseTest.java
@@ -22,7 +22,7 @@ protected ZookeeperBaseTest() {
 
     @BeforeClass
     public static void beforeZookeeperClass() throws Exception {
-        zookeeperServer = new TestingServer(45678);
+        zookeeperServer = new TestingServer();
         zookeeperClient = CuratorFrameworkFactory.builder()
                 .connectString(zookeeperServer.getConnectString())
                 .retryPolicy(new ExponentialBackoffRetry(1000, 3))