diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NeoStoreFileListingTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NeoStoreFileListingTest.java
index 1fbaeb6d86918..b28177785d45c 100644
--- a/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NeoStoreFileListingTest.java
+++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/state/NeoStoreFileListingTest.java
@@ -155,9 +155,7 @@ public void shouldListMetaDataStoreLast() throws Exception
     {
         assertTrue( neoStoreDataSource.listStoreFiles( false ).stream()
                 .reduce( ( a, b ) -> b )
-                .map( toStoreType )
-                .filter( Optional::isPresent )
-                .map( Optional::get )
+                .flatMap( toStoreType )
                 .filter( StoreType.META_DATA::equals )
                 .isPresent() );
     }
@@ -167,9 +165,7 @@ public void shouldListMetaDataStoreLastWithTxLogs() throws Exception
     {
         assertTrue( neoStoreDataSource.listStoreFiles( true ).stream()
                 .reduce( ( a, b ) -> b )
-                .map( toStoreType )
-                .filter( Optional::isPresent )
-                .map( Optional::get )
+                .flatMap( toStoreType )
                 .filter( StoreType.META_DATA::equals )
                 .isPresent() );
     }
diff --git a/pom.xml b/pom.xml
index a869c4e2f1414..ad0a883779ac1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
     <lucene.version>5.5.0</lucene.version>
     <bouncycastle.version>1.53</bouncycastle.version>
     <generate-config-docs-phase>prepare-package</generate-config-docs-phase>
-    <test.runner.jvm.settings.additional></test.runner.jvm.settings.additional>
+    <test.runner.jvm.settings.additional/>
     <test.runner.jvm.settings>-Xmx2G -XX:+UseG1GC -XX:-OmitStackTraceInFastThrow -XX:+HeapDumpOnOutOfMemoryError
       -XX:HeapDumpPath=target/test-data -Dorg.neo4j.unsafe.impl.internal.dragons.UnsafeUtil.DIRTY_MEMORY=true
       -Dorg.neo4j.unsafe.impl.internal.dragons.UnsafeUtil.CHECK_NATIVE_ACCESS=true
@@ -686,6 +686,77 @@
       </properties>
     </profile>
 
+    <profile>
+      <id>testCoverage</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <property>
+          <name>testCoverage</name>
+        </property>
+      </activation>
+      <properties>
+        <test.runner.jvm.settings.additional>@{argLine}</test.runner.jvm.settings.additional>
+      </properties>
+        <build>
+            <plugins>
+                <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <version>0.7.9</version>
+                    <executions>
+                        <execution>
+                            <id>default-prepare-agent</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>default-prepare-agent-integration</id>
+                            <goals>
+                                <goal>prepare-agent-integration</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>merge</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>merge</goal>
+                            </goals>
+                            <configuration>
+                                <destFile>${project.build.directory}/jacoco-aggregated.exec</destFile>
+                                <fileSets>
+                                    <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
+                                        <directory>${project.build.directory}</directory>
+                                        <includes>
+                                            <include>*.exec</include>
+                                        </includes>
+                                    </fileSet>
+                                </fileSets>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>default-report</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                          <configuration>
+                            <dataFile>${project.build.directory}/jacoco-aggregated.exec</dataFile>
+                          </configuration>
+                        </execution>
+                        <execution>
+                            <id>report-aggregate</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>report-aggregate</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </build>
+    </profile>
+
     <!--
      Git information extraction profiles.
      Activate by adding the required Git information to the environment, e.g. on *nix: