diff --git a/community/neo4j/src/main/java/org/neo4j/dmbs/database/DefaultDatabaseManager.java b/community/neo4j/src/main/java/org/neo4j/dmbs/database/DefaultDatabaseManager.java
index b4ada58b20536..377fff09d079a 100644
--- a/community/neo4j/src/main/java/org/neo4j/dmbs/database/DefaultDatabaseManager.java
+++ b/community/neo4j/src/main/java/org/neo4j/dmbs/database/DefaultDatabaseManager.java
@@ -39,16 +39,16 @@ public final class DefaultDatabaseManager extends LifecycleAdapter implements Da
     private final PlatformModule platform;
     private final EditionModule edition;
     private final Procedures procedures;
-    private final Logger msgLog;
+    private final Logger log;
     private final GraphDatabaseFacade graphDatabaseFacade;
 
     public DefaultDatabaseManager( PlatformModule platform, EditionModule edition, Procedures procedures,
-            Logger msgLog, GraphDatabaseFacade graphDatabaseFacade )
+            Logger log, GraphDatabaseFacade graphDatabaseFacade )
     {
         this.platform = platform;
         this.edition = edition;
         this.procedures = procedures;
-        this.msgLog = msgLog;
+        this.log = log;
         this.graphDatabaseFacade = graphDatabaseFacade;
     }
 
@@ -59,12 +59,12 @@ public Optional<GraphDatabaseFacade> getDatabaseFacade( String name )
     }
 
     @Override
-    public GraphDatabaseFacade createDatabase( String name )
+    public GraphDatabaseFacade createDatabase( String databaseName )
     {
         checkState( database == null, "Database is already created, fail to create another one." );
-
-        DataSourceModule dataSource = new DataSourceModule( name, platform, edition, procedures, graphDatabaseFacade );
-        ClassicCoreSPI spi = new ClassicCoreSPI( platform, dataSource, msgLog, dataSource.getCoreAPIAvailabilityGuard(), edition.threadToTransactionBridge );
+        log.log( "Creating '%s' database.", databaseName );
+        DataSourceModule dataSource = new DataSourceModule( databaseName, platform, edition, procedures, graphDatabaseFacade );
+        ClassicCoreSPI spi = new ClassicCoreSPI( platform, dataSource, log, dataSource.getCoreAPIAvailabilityGuard(), edition.threadToTransactionBridge );
         graphDatabaseFacade.init( spi, edition.threadToTransactionBridge, platform.config, dataSource.neoStoreDataSource.getTokenHolders() );
         platform.dataSourceManager.register( dataSource.neoStoreDataSource );
         database = graphDatabaseFacade;
@@ -87,6 +87,7 @@ private void shutdownDatabase()
     {
         if ( database != null )
         {
+            log.log( "Shutdown '%s' database.", database.databaseLayout().getDatabaseName() );
             database.shutdown();
         }
     }
diff --git a/enterprise/kernel/src/test/java/org/neo4j/test/TestEnterpriseGraphDatabaseFactory.java b/enterprise/kernel/src/test/java/org/neo4j/test/TestEnterpriseGraphDatabaseFactory.java
index 4fe3024f81d5e..fca1daea0a033 100644
--- a/enterprise/kernel/src/test/java/org/neo4j/test/TestEnterpriseGraphDatabaseFactory.java
+++ b/enterprise/kernel/src/test/java/org/neo4j/test/TestEnterpriseGraphDatabaseFactory.java
@@ -84,7 +84,7 @@ protected LogService createLogService( LogProvider userLogProvider )
                                     LogProvider logProvider = ((TestGraphDatabaseFactoryState) state).getInternalLogProvider();
                                     if ( logProvider != null )
                                     {
-                                        return new SimpleLogService( logProvider, logProvider );
+                                        return new SimpleLogService( logProvider );
                                     }
                                 }
                                 return super.createLogService( userLogProvider );