diff --git a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/EagerResult.java b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/EagerResult.java
index 672c8e5811577..811d390d5798c 100644
--- a/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/EagerResult.java
+++ b/community/cypher/cypher/src/main/java/org/neo4j/cypher/internal/javacompat/EagerResult.java
@@ -232,7 +232,7 @@ private class EagerQueryResult implements QueryResult
 
         EagerQueryResult()
         {
-            fields = originalResult.columns().toArray( new String[originalResult.columns().size()] );
+            fields = originalResult.columns().toArray( new String[0] );
         }
 
         @Override
diff --git a/integrationtests/src/test/java/org/neo4j/bolt/BoltSnapshotQueryExecutionIT.java b/integrationtests/src/test/java/org/neo4j/bolt/BoltSnapshotQueryExecutionIT.java
index 4d3f6d02a409e..c56d584549fa5 100644
--- a/integrationtests/src/test/java/org/neo4j/bolt/BoltSnapshotQueryExecutionIT.java
+++ b/integrationtests/src/test/java/org/neo4j/bolt/BoltSnapshotQueryExecutionIT.java
@@ -74,28 +74,22 @@ public void tearDown()
     @Test
     public void executeQueryWithSnapshotEngine()
     {
-        db = new EnterpriseGraphDatabaseFactory()
-                .newEmbeddedDatabaseBuilder( testDirectory.directory("withSnapshotEngine") )
-                .setConfig( new BoltConnector( "bolt" ).type, "BOLT" )
-                .setConfig( new BoltConnector( "bolt" ).enabled, "true" )
-                .setConfig( new BoltConnector( "bolt" ).listen_address, "localhost:0" )
-                .setConfig( GraphDatabaseSettings.snapshot_query, Settings.TRUE )
-                .newGraphDatabase();
-        initDatabase();
-        connectDirver();
-        verifyQueryExecution();
+        executeQuery( "withSnapshotEngine", Settings.TRUE );
     }
 
     @Test
     public void executeQueryWithoutSnapshotEngine()
     {
-        db = new EnterpriseGraphDatabaseFactory()
-                .newEmbeddedDatabaseBuilder( testDirectory.directory( "withoutSnapshotEngine" ) )
+        executeQuery( "withoutSnapshotEngine", Settings.FALSE );
+    }
+
+    private void executeQuery( String directory, String useSnapshotEngineSettingValue )
+    {
+        db = new EnterpriseGraphDatabaseFactory().newEmbeddedDatabaseBuilder( testDirectory.directory( directory ) )
                 .setConfig( new BoltConnector( "bolt" ).type, "BOLT" )
                 .setConfig( new BoltConnector( "bolt" ).enabled, "true" )
                 .setConfig( new BoltConnector( "bolt" ).listen_address, "localhost:0" )
-                .setConfig( GraphDatabaseSettings.snapshot_query, Settings.FALSE )
-                .newGraphDatabase();
+                .setConfig( GraphDatabaseSettings.snapshot_query, useSnapshotEngineSettingValue ).newGraphDatabase();
         initDatabase();
         connectDirver();
         verifyQueryExecution();